Skip to content

Commit

Permalink
cleanup testing and add jshint
Browse files Browse the repository at this point in the history
  • Loading branch information
nateps committed Mar 4, 2014
1 parent 8e36b33 commit 5be1a0d
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 100 deletions.
3 changes: 0 additions & 3 deletions .gitignore
@@ -1,6 +1,3 @@
.DS_Store
*.swp
node_modules
derby-standalone.js
test/browser-standalone.js

14 changes: 14 additions & 0 deletions .jshintrc
@@ -0,0 +1,14 @@
{
"node": true,
"laxcomma": true,
"eqnull": true,
"eqeqeq": true,
"indent": 2,
"newcap": true,
"quotmark": "single",
"undef": true,
"trailing": true,
"shadow": true,
"expr": true,
"boss": true
}
3 changes: 0 additions & 3 deletions .npmignore

This file was deleted.

12 changes: 6 additions & 6 deletions package.json
Expand Up @@ -12,7 +12,7 @@
"derby": "./bin/derby"
},
"scripts": {
"test": "mocha --recursive test --timeout 5000 --bail --colors --reporter spec --debug"
"test": "./node_modules/.bin/mocha test/*.mocha.js; ./node_modules/.bin/jshint lib/*.js test/*.js"
},
"dependencies": {
"derby-parsing": "~0.1.1",
Expand All @@ -27,11 +27,11 @@
"through": "~2.3.4"
},
"devDependencies": {
"expect.js": "*",
"mocha": "*"
"expect.js": "~0.3.1",
"express": "^3.4.8",
"jshint": "~2.4.4",
"mocha": "~1.17.1"
},
"optionalDependencies": {},
"engines": {
"node": ">=0.10.0"
}
"engines": {}
}
22 changes: 22 additions & 0 deletions test/.jshintrc
@@ -0,0 +1,22 @@
{
"node": true,
"laxcomma": true,
"eqnull": true,
"eqeqeq": true,
"indent": 2,
"newcap": true,
"quotmark": "single",
"undef": true,
"trailing": true,
"shadow": true,
"expr": true,
"boss": true,
"globals": {
"describe": false,
"it": false,
"before": false,
"after": false,
"beforeEach": false,
"afterEach": false
}
}
81 changes: 0 additions & 81 deletions test/binscript.js

This file was deleted.

3 changes: 1 addition & 2 deletions test/browser.js
@@ -1,2 +1 @@
require('./expression.mocha.js');
require('./templates.mocha.js');
require('derby-templates');
6 changes: 1 addition & 5 deletions test/mocha.opts
@@ -1,6 +1,2 @@
--colors
--reporter spec
--timeout 1200
--growl
--debug
--compilers coffee:coffee-script
--bail

0 comments on commit 5be1a0d

Please sign in to comment.