Skip to content

Commit

Permalink
Merge pull request #5 from e-conomic/v1.0.0
Browse files Browse the repository at this point in the history
v1.0.0
  • Loading branch information
eagleeye committed Mar 24, 2015
2 parents f7dee1e + 3a1913b commit dc9d2bc
Show file tree
Hide file tree
Showing 8 changed files with 80 additions and 10 deletions.
1 change: 1 addition & 0 deletions .jshintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
29 changes: 29 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"asi" : false,
"bitwise" : true,
"boss" : false,
"curly" : true,
"debug": false,
"devel": false,
"eqeqeq": true,
"evil": false,
"expr": true,
"forin": false,
"immed": true,
"latedef" : false,
"laxbreak": false,
"multistr": true,
"newcap": true,
"noarg": true,
"node" : true,
"noempty": false,
"nonew": true,
"onevar": false,
"plusplus": false,
"strict": false,
"sub": false,
"trailing" : true,
"undef": true,
"unused": "vars",
"browser": true
}
6 changes: 6 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.idea
node_modules
test
.gitignore
.jshintignore
.jshintrc
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ language: node_js
node_js:
- "iojs"
- "0.12"
- "0.11"
- "0.10"
2 changes: 0 additions & 2 deletions lib/chai-subset.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
var CircularJSON = require('circular-json');

module.exports = function(chai, utils) {
var Assertion = chai.Assertion;
var assertionPrototype = Assertion.prototype;
Expand Down
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chai-subset",
"version": "0.3.0",
"version": "1.0.0",
"description": "Object properties matcher for Chai",
"main": "lib/chai-subset.js",
"scripts": {
Expand All @@ -17,17 +17,18 @@
"plugin",
"containSubset"
],
"author": "Andrii Shumada",
"author": "Andrii Shumada <[email protected]>",
"contributors": [
"Robert Herhold <[email protected]>"
],
"license": "MIT",
"bugs": {
"url": "https://github.com/e-conomic/chai-subset/issues"
},
"homepage": "https://github.com/e-conomic/chai-subset",
"devDependencies": {
"mocha": "^1.20.1",
"chai": "1.x"
},
"dependencies": {
"circular-json": "^0.1.6"
"chai": "^2.1.2",
"mocha": "^2.2.1",
"mocha-jshint": "^1.0.0"
}
}
35 changes: 35 additions & 0 deletions test/.jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"predef": [
"describe",
"expect",
"it",
"before"
],

"asi" : false,
"bitwise" : true,
"boss" : false,
"curly" : true,
"debug": false,
"devel": false,
"eqeqeq": true,
"evil": false,
"expr": true,
"forin": false,
"immed": true,
"latedef" : false,
"laxbreak": false,
"multistr": true,
"newcap": true,
"noarg": true,
"node" : true,
"noempty": false,
"nonew": true,
"onevar": false,
"plusplus": false,
"strict": false,
"sub": false,
"trailing" : true,
"undef": true,
"unused": "vars"
}
1 change: 1 addition & 0 deletions test/jshint.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require('mocha-jshint')();

0 comments on commit dc9d2bc

Please sign in to comment.