Merge pull request #79 from TheDancingCode/remove-gutil

Replace deprecated gutil
hparra · Mar 12, 2018 · 165949e · 165949e
2 parents 3b4fdf8 + 33e3fa7
commit 165949e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - 0.10
-  - 0.11
-  - 0.12
-  - iojs
+  - '8'
+  - '6'
+  - '4'
diff --git a/package.json b/package.json
@@ -27,16 +27,15 @@
   "devDependencies": {
     "gulp": ">=3.0.0",
     "gulp-sourcemaps": "^1.5.0",
-    "gulp-util": "^3.0.4",
     "jscs": "^1.12.0",
     "jshint": "^2.6.3",
     "map-stream": ">=0.0.4",
     "mocha": ">=1.15.0",
-    "should": ">=2.1.0"
+    "should": ">=2.1.0",
+    "vinyl": "^2.1.0"
   },
   "engines": {
-    "node": ">=0.10.0",
-    "npm": ">=1.2.10"
+    "node": ">=4"
   },
   "license": "MIT"
 }
diff --git a/test/path-parsing.spec.js b/test/path-parsing.spec.js
@@ -65,7 +65,7 @@ describe('gulp-rename path parsing', function () {
         var srcPattern = 'test/**/*.min.txt';
         var srcOptions = {base: process.cwd()};
         var obj = function (path) {
-          path.dirname.should.equal('test/fixtures');
+          path.dirname.should.equal(Path.join('test', 'fixtures'));
         };
         helper({pattern: srcPattern, options: srcOptions}, obj, null, done);
       });

diff --git a/test/rename-sourcemap.spec.js b/test/rename-sourcemap.spec.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var rename = require('../index');
-var gutil = require('gulp-util');
+var Vinyl = require('vinyl');
 var sourceMaps = require('gulp-sourcemaps');
 require('should');
 
@@ -22,7 +22,7 @@ describe('gulp-rename', function () {
         done();
       });
 
-      init.write(new gutil.File({
+      init.write(new Vinyl({
         base: 'fixtures',
         path: 'fixtures/fixture.css',
         contents: new Buffer('')

diff --git a/test/rename.spec.js b/test/rename.spec.js
@@ -186,6 +186,13 @@ describe('gulp-rename', function () {
       var file1;
       var file2;
 
+      function check() {
+        file1.path.should.equal(Path.resolve('test/fixtures/hello-1.txt'));
+        file2.path.should.equal(Path.resolve('test/fixtures/hello-2.txt'));
+
+        return done();
+      }
+
       pipe1
         .on('data', function (file) {
           file1 = file;
@@ -209,13 +216,6 @@ describe('gulp-rename', function () {
             return check();
           }
         });
-
-      function check() {
-        file1.path.should.equal(Path.resolve('test/fixtures/hello-1.txt'));
-        file2.path.should.equal(Path.resolve('test/fixtures/hello-2.txt'));
-
-        return done();
-      }
     });
   });