Merge pull request #4027 from chadhietala/reorder-postbuild-hook

Re-order postBuild hook
ember-cli · May 7, 2015 · 9a9ef86 · 9a9ef86
2 parents b878608 + 1ef8617
commit 9a9ef86
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/lib/models/builder.js b/lib/models/builder.js
@@ -116,8 +116,8 @@ module.exports = Task.extend({
        .then(function() {
          return self.builder.build.apply(self.builder, args);
        })
-      .then(this.processBuildResult.bind(this))
       .then(this.processAddonBuildSteps.bind(this, 'postBuild'))
+      .then(this.processBuildResult.bind(this))
       .catch(function(error) {
 
         this.processAddonBuildSteps('buildError', error);

diff --git a/tests/unit/models/builder-test.js b/tests/unit/models/builder-test.js
@@ -187,6 +187,22 @@ describe('models/builder.js', function() {
       });
     });
 
+    it('should call postBuild before processBuildResult', function() {
+      var called = [];
+
+      addon.postBuild = function() {
+        called.push('postBuild');
+      };
+
+      builder.processBuildResult = function() {
+        called.push('processBuildResult');
+      };
+
+      return builder.build().then(function() {
+        expect(called).to.deep.equal(['postBuild', 'processBuildResult']);
+      });
+    });
+
     it('buildError receives the error object from the errored step', function() {
       var thrownBuildError = new Error('buildError');
       var receivedBuildError;