Merge aa3fc6b into bcf92fd

kombucha · Sep 17, 2014 · fcb284e · fcb284e
2 parents bcf92fd + aa3fc6b
commit fcb284e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -1,5 +1,6 @@
 {
     "node": true,
+    "browser": false
     "esnext": true,
     "bitwise": true,
     "camelcase": true,
@@ -13,8 +14,5 @@
     "regexp": true,
     "undef": true,
     "unused": true,
-    "strict": true,
-    "trailing": true,
-    "smarttabs": true,
-    "white": true
+    "strict": true
 }
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - '0.9'
   - '0.10'
 after_script:
   npm run coveralls
diff --git a/package.json b/package.json
@@ -23,15 +23,15 @@
   },
   "dependencies": {
     "through": "~2.3.4",
-    "gulp-util": "~2.2.0"
+    "gulp-util": "~3.0.1"
   },
   "devDependencies": {
     "event-stream": "*",
     "mocha": "*",
     "coveralls": "*",
     "mocha-lcov-reporter": "*",
     "istanbul": "*",
-    "should": "~2.1.0"
+    "should": "~4.0.4"
   },
   "engines": {
     "node": ">=0.8.0",

diff --git a/test/main.js b/test/main.js
@@ -35,9 +35,9 @@ describe("gulp-assets", function () {
         });
 
         stream.on("end", function () {
-            javascriptFiles.should.have.lengthOf(2)
-                .and.contain('test/fixtures/js/foo.js')
-                .and.contain('test/fixtures/js/bar.js');
+            javascriptFiles.should.have.lengthOf(2);
+            javascriptFiles.should.containEql('test/fixtures/js/foo.js');
+            javascriptFiles.should.containEql('test/fixtures/js/bar.js');
             done();
         });
 
@@ -66,9 +66,9 @@ describe("gulp-assets", function () {
         });
 
         stream.on("end", function () {
-            javascriptFiles.should.have.lengthOf(2)
-                .and.contain('test/fixtures/js/foo.js')
-                .and.contain('test/fixtures/js/bar.js');
+            javascriptFiles.should.have.lengthOf(2);
+            javascriptFiles.should.containEql('test/fixtures/js/foo.js');
+            javascriptFiles.should.containEql('test/fixtures/js/bar.js');
             done();
         });
 
@@ -100,9 +100,9 @@ describe("gulp-assets", function () {
         });
 
         stream.on("end", function () {
-            cssFiles.should.have.lengthOf(2)
-                .and.contain('test/fixtures/css/foo.css')
-                .and.contain('test/fixtures/css/bar.css');;
+            cssFiles.should.have.lengthOf(2);
+            cssFiles.should.containEql('test/fixtures/css/foo.css');
+            cssFiles.should.containEql('test/fixtures/css/bar.css');
             done();
         });
 
@@ -131,9 +131,9 @@ describe("gulp-assets", function () {
         });
 
         stream.on("end", function () {
-            cssFiles.should.have.lengthOf(2)
-                .and.contain('test/fixtures/css/foo.css')
-                .and.contain('test/fixtures/css/bar.css');;
+            cssFiles.should.have.lengthOf(2);
+            cssFiles.should.containEql('test/fixtures/css/foo.css');
+            cssFiles.should.containEql('test/fixtures/css/bar.css');
             done();
         });