remove necessity for specifying empty post in flow

Fix yeoman#249 and yeoman#442
stephanebachelier · Apr 13, 2015 · 234d796 · 234d796
1 parent d6ed1d2
commit 234d796
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/tasks/usemin.js b/tasks/usemin.js
@@ -16,12 +16,23 @@ var getFlowFromConfig = function (config, target) {
     post: {}
   });
   if (config.options && config.options.flow) {
+    var steps;
+    var post;
+
     if (config.options.flow[target]) {
-      flow.setSteps(config.options.flow[target].steps);
-      flow.setPost(config.options.flow[target].post);
+      steps = config.options.flow[target].steps;
+      post = config.options.flow[target].post;
     } else {
-      flow.setSteps(config.options.flow.steps);
-      flow.setPost(config.options.flow.post);
+      steps = config.options.flow.steps;
+      post = config.options.flow.post;
+    }
+
+    if (steps) {
+      flow.setSteps(steps);
+    }
+
+    if (post) {
+      flow.setPost(post);
     }
   }
   return flow;

diff --git a/test/test-usemin-prepare.js b/test/test-usemin-prepare.js
@@ -225,8 +225,7 @@ describe('useminPrepare', function () {
         flow: {
           steps: {
             js: ['uglify']
-          },
-          post: {}
+          }
         }
       }
     });
@@ -257,8 +256,7 @@ describe('useminPrepare', function () {
           html: {
             steps: {
               js: ['uglify']
-            },
-            post: {}
+            }
           }
         }
       }
@@ -302,8 +300,7 @@ describe('useminPrepare', function () {
         flow: {
           steps: {
             js: [copy]
-          },
-          post: {}
+          }
         }
       }
     });