Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tests in node v4+ #438

Merged
merged 3 commits into from
Oct 5, 2015
Merged
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 .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sudo: false
language: node_js
node_js:
- "0.10"
- "0.12"
- "4.0"
- "4.1"
after_script:
- npm run coveralls
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ validator.isWhitespace('foo bar');

### Tests

Tests require node v4.0+.

- `make test` - run the test suite.
- `make test V=1` - run the test suite with added verbosity.
- `make test TEST=pattern` - run tests that match a pattern.
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"istanbul": "latest",
"jshint": "latest",
"uglify-js": "latest",
"coveralls": "latest",
"contextify": "latest"
"coveralls": "latest"
},
"scripts": {
"test": "node ./node_modules/.bin/_mocha --reporter spec",
Expand Down
15 changes: 7 additions & 8 deletions test/validators.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
var validator = require('../validator')
, format = require('util').format
, contextify = require('contextify')
, assert = require('assert')
, path = require('path')
, fs = require('fs');
, fs = require('fs')
, vm = require('vm');

var validator_js = fs.readFileSync(path.join(__dirname, '../validator.js')).toString();

Expand Down Expand Up @@ -1187,17 +1187,16 @@ describe('Validators', function () {
}
};
window.define.amd = true;
var sandbox = contextify(window);
sandbox.run(validator_js);
sandbox.dispose();

var sandbox = vm.createContext(window);
vm.runInContext(validator_js, sandbox);
assert.equal(window.validator.trim(' foobar '), 'foobar');
});

it('should bind validator to the window if no module loaders are available', function () {
var window = {};
var sandbox = contextify(window);
sandbox.run(validator_js);
sandbox.dispose();
var sandbox = vm.createContext(window);
vm.runInContext(validator_js, sandbox);
assert.equal(window.validator.trim(' foobar '), 'foobar');
});

Expand Down