Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: test watch

test:
./node_modules/.bin/mocha --reporter list --compilers litcoffee:coffee-script
./node_modules/.bin/mocha --reporter list --compilers litcoffee:coffee-script/register

watch:
./node_modules/.bin/nodemon ./node_modules/.bin/mocha --reporter list --compilers litcoffee:coffee-script --growl --bail --debug
./node_modules/.bin/nodemon ./node_modules/.bin/mocha --reporter list --compilers litcoffee:coffee-script/register --growl --bail --debug
16 changes: 9 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,16 @@
"url": "https://github.com/wballard/flinger/issues"
},
"dependencies": {
"connect": ">2.0.0",
"uglify-js": "~2.3.6"
"connect": "^3.3.3",
"uglify-js": "^2.4.15"
},
"devDependencies": {
"mocha": "~1.12.0",
"coffee-script": "~1.6.3",
"zombie": "~2.0.0-alpha19",
"chai": "~1.7.2",
"nodemon": "~0.7.8"
"chai": "^1.10.0",
"coffee-script": "^1.8.0",
"cookie-parser": "^1.3.3",
"mocha": "^2.0.1",
"nodemon": "^1.2.1",
"serve-static": "^1.7.1",
"zombie": "^2.2.1"
}
}
16 changes: 7 additions & 9 deletions test/main.litcoffee
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,19 @@ Test connection and action over a streaming socket.
describe "Client library shim", ->
before (done) ->
app = connect()
.use(connect.cookieParser())
.use(connect.static(path.join(__dirname, 'client')))
.use(require('cookie-parser')())
.use(require('serve-static')(path.join(__dirname, 'client')))
.use(flinger())
.listen(9999)
done()
after (done) ->
done()
it "serves a browser client self test page", (done) ->
this.timeout(5000)
browser = new Browser()
browser.debug = true
browser.runScripts = true
browser.visit 'http://localhost:9999/index.html', ->
browser.success.should.be.ok
done()
, (err) ->
Browser.visit 'http://localhost:9999/index.html',
{debug: true, runScripts: true}, (err, browser) ->
if err
console.log 'ERRRRR', err
return done(err)
browser.success.should.be.ok
done()