chore(rebase): rebase on master

Author: stephanebachelier

test/test-config-writer.js

@@ -84,7 +84,7 @@ describe('ConfigWriter', function () {
     it('should detect missing sources when warnMissing=true', function () {
       var flow = new Flow({
         steps: {
-          js: ['concat', 'uglifyjs']
+          js: ['concat', 'uglify']
         }
       });
 
@@ -125,7 +125,7 @@ describe('ConfigWriter', function () {
     it('should search all root paths', function () {
       var flow = new Flow({
         steps: {
-          js: ['concat', 'uglifyjs']
+          js: ['concat', 'uglify']
         }
       });
 
@@ -160,7 +160,7 @@ describe('ConfigWriter', function () {
       it('should be invoked for each block', function () {
         var flow = new Flow({
           steps: {
-            js: ['concat', 'uglifyjs']
+            js: ['concat', 'uglify']
           }
         });
         var blocks = helpers.blocks();
@@ -189,7 +189,7 @@ describe('ConfigWriter', function () {
       it('should override normal search when it returns a string', function () {
         var flow = new Flow({
           steps: {
-            js: ['concat', 'uglifyjs']
+            js: ['concat', 'uglify']
           }
         });
 
@@ -221,7 +221,7 @@ describe('ConfigWriter', function () {
       it('should be prevented from returning non-existent paths', function () {
         var flow = new Flow({
           steps: {
-            js: ['concat', 'uglifyjs']
+            js: ['concat', 'uglify']
           }
         });
 
@@ -259,7 +259,7 @@ describe('ConfigWriter', function () {
       it('should cancel normal search when it returns `false`, and invoke normal search when it returns `null`', function () {
         var flow = new Flow({
           steps: {
-            js: ['concat', 'uglifyjs']
+            js: ['concat', 'uglify']
           }
         });