Merge pull request #388 from JackCA/fix-serve-hook-validate-order

run beforeBuild hook before validating on serve
isleofcode · Oct 12, 2017 · 81a7115 · 81a7115
2 parents 90fff1f + c5bf399
commit 81a7115
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/commands/serve.js b/lib/commands/serve.js
@@ -76,9 +76,9 @@ module.exports = Command.extend({
     let ui = this.ui;
 
     return editXml.addNavigation(project, reloadUrl)
+      .then(() => hook.run('beforeBuild', opts))
       .then(() => cordovaTarget.validateServe())
       .then(() => framework.validateServe(opts))
-      .then(() => hook.run('beforeBuild', opts))
       .then(() => setupLivereload.run(reloadUrl))
       .then(function() {
         if (opts.skipCordovaBuild !== true) {

diff --git a/node-tests/unit/commands/serve-test.js b/node-tests/unit/commands/serve-test.js
@@ -114,11 +114,11 @@ describe('Serve Command', function() {
   it('runs tasks in the correct order', function() {
     return serveCmd.run({}).then(function() {
       expect(tasks).to.deep.equal([
+        'hook beforeBuild',
         'validate-allow-navigation',
         'validate-platform',
         'validate-plugin',
         'framework-validate-serve',
-        'hook beforeBuild',
         'create-livereload-shell',
         'cordova-build',
         'hook afterBuild',
@@ -146,11 +146,11 @@ describe('Serve Command', function() {
       skipCordovaBuild: true
     }).then(function() {
       expect(tasks).to.deep.equal([
+        'hook beforeBuild',
         'validate-allow-navigation',
         'validate-platform',
         'validate-plugin',
         'framework-validate-serve',
-        'hook beforeBuild',
         'create-livereload-shell',
         'hook afterBuild'
       ]);