Breaking: Throw when dest()/symlink() is called with invalid fold…

…er argument & unskip tests
gulpjs · Dec 5, 2017 · 462fee5 · 462fee5 · phated · Dec 5, 2017
1 parent 710122a
commit 462fee5
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 27 deletions.
diff --git a/lib/dest/index.js b/lib/dest/index.js
@@ -17,6 +17,11 @@ var folderConfig = {
 };
 
 function dest(outFolder, opt) {
+  if (!outFolder) {
+    throw new Error('Invalid dest() folder argument.' +
+      ' Please specify a non-empty string or a function.');
+  }
+
   var optResolver = createResolver(config, opt);
   var folderResolver = createResolver(folderConfig, { outFolder: outFolder });
 

diff --git a/lib/symlink/index.js b/lib/symlink/index.js
@@ -16,6 +16,11 @@ var folderConfig = {
 };
 
 function symlink(outFolder, opt) {
+  if (!outFolder) {
+    throw new Error('Invalid symlink() folder argument.' +
+      ' Please specify a non-empty string or a function.');
+  }
+
   var optResolver = createResolver(config, opt);
   var folderResolver = createResolver(folderConfig, { outFolder: outFolder });
 

diff --git a/test/dest.js b/test/dest.js
@@ -59,28 +59,22 @@ describe('.dest()', function() {
   beforeEach(clean);
   afterEach(clean);
 
-  // TODO: make this work correctly
-  it.skip('throws on invalid folder (empty)', function(done) {
-    var stream;
-    try {
-      stream = vfs.dest();
-    } catch (err) {
-      expect(err).toExist();
-      expect(stream).toNotExist();
-      done();
+  it('throws on no folder argument', function(done) {
+    function noFolder() {
+      vfs.dest();
     }
+
+    expect(noFolder).toThrow('Invalid dest() folder argument. Please specify a non-empty string or a function.');
+    done();
   });
 
-  // TODO: make this work correctly
-  it.skip('throws on invalid folder (empty string)', function(done) {
-    var stream;
-    try {
-      stream = vfs.dest('');
-    } catch (err) {
-      expect(err).toExist();
-      expect(stream).toNotExist();
-      done();
+  it('throws on empty string folder argument', function(done) {
+    function emptyFolder() {
+      vfs.dest('');
     }
+
+    expect(emptyFolder).toThrow('Invalid dest() folder argument. Please specify a non-empty string or a function.');
+    done();
   });
 
   it('accepts the sourcemap option as true', function(done) {

diff --git a/test/symlink.js b/test/symlink.js
@@ -40,16 +40,22 @@ describe('symlink stream', function() {
   beforeEach(clean);
   afterEach(clean);
 
-  // TODO: make this work correctly
-  it.skip('throws on invalid folder', function(done) {
-    var stream;
-    try {
-      stream = vfs.symlink();
-    } catch (err) {
-      expect(err).toExist();
-      expect(stream).toNotExist();
-      done();
+  it('throws on no folder argument', function(done) {
+    function noFolder() {
+      vfs.symlink();
     }
+
+    expect(noFolder).toThrow('Invalid symlink() folder argument. Please specify a non-empty string or a function.');
+    done();
+  });
+
+  it('throws on empty string folder argument', function(done) {
+    function emptyFolder() {
+      vfs.symlink('');
+    }
+
+    expect(emptyFolder).toThrow('Invalid symlink() folder argument. Please specify a non-empty string or a function.');
+    done();
   });
 
   it('passes through writes with cwd', function(done) {