feat(build): re-adds cordova.js to ember builds

Author: alexblom

lib/commands/build.js

@@ -1,9 +1,11 @@
 const Command          = require('./-command');
 const Hook             = require('../tasks/run-hook');
 const LintIndex        = require('../tasks/lint-index');
+const AddCordovaJS     = require('../tasks/add-cordova-js');
 const logger           = require('../utils/logger');
 const requireTarget    = require('../utils/require-target');
 const requireFramework = require('../utils/require-framework');
+const path             = require('path');
 
 module.exports = Command.extend({
   name: 'build',
@@ -66,6 +68,10 @@ module.exports = Command.extend({
       project: this.project
     });
 
+    let addCordovaJS = new AddCordovaJS({
+      source: path.join(options.cordovaOutputPath, 'index.html')
+    });
+
     let framework = requireFramework(this.project);
     let cordovaTarget = requireTarget(this.project, options);
 
@@ -76,7 +82,7 @@ module.exports = Command.extend({
       .then(() => cordovaTarget.validateBuild(options.skipCordovaBuild))
       .then(() => {
         if (options.skipEmberBuild !== true) {
-          return framework.build(options);
+          return framework.build(options).then(() => addCordovaJS.run());
         }
       })
       .then(() => {

lib/frameworks/vue/tasks/build.js

@@ -1,7 +1,5 @@
 const Task             = require('../../../tasks/-task');
 const Bash             = require('../../../tasks/bash');
-const AddCordovaJS     = require('../../../tasks/add-cordova-js');
-const path             = require('path');
 
 module.exports = Task.extend({
   buildCommand: undefined,
@@ -21,12 +19,7 @@ module.exports = Task.extend({
       command: `cp -R ${this.buildPath}/* ${this.cordovaOutputPath}`
     });
 
-    let addCordovaJS = new AddCordovaJS({
-      source: path.join(this.cordovaOutputPath, 'index.html')
-    });
-
     return build.run()
-      .then(copy.prepare())
-      .then(addCordovaJS.prepare())
+      .then(copy.prepare());
   }
 });

node-tests/unit/commands/build-test.js

@@ -1,47 +1,33 @@
-var td              = require('testdouble');
+const td             = require('testdouble');
+const expect         = require('../../helpers/expect');
+const Promise        = require('rsvp');
+const mockProject    = require('../../fixtures/ember-cordova-mock/project');
+const mockAnalytics  = require('../../fixtures/ember-cordova-mock/analytics');
 
-var expect          = require('../../helpers/expect');
-var Promise         = require('rsvp');
-
-var CdvTarget       = require('../../../lib/targets/cordova/target');
-var HookTask        = require('../../../lib/tasks/run-hook');
-var LintTask        = require('../../../lib/tasks/lint-index');
-
-var mockProject     = require('../../fixtures/ember-cordova-mock/project');
-var mockAnalytics   = require('../../fixtures/ember-cordova-mock/analytics');
-
-var setupBuild = function() {
-  var BuildCmd = require('../../../lib/commands/build');
+describe('Build Command', function() {
+  let baseOpts, tasks;
+  let AddCordovaJS, LintTask;
 
-  var project = mockProject.project;
-  project.config = function() {
-    return {
-      locationType: 'hash'
+  beforeEach(function() {
+    baseOpts = {
+      cordovaOutputPath: 'ember-cordova/cordova/www',
+      platform: 'ios'
     };
-  }
-
-  var build = new BuildCmd({
-    project: project
   });
-  build.analytics = mockAnalytics;
-
-  return build;
-};
 
-describe('Build Command', function() {
   afterEach(function() {
     td.reset();
   });
 
-  var tasks;
-
-  beforeEach(function() {
-    mockTasks();
-  });
-
-  function mockTasks() {
+  function setupBuild() {
+    let CdvTarget, HookTask;
     tasks = [];
 
+    CdvTarget = require('../../../lib/targets/cordova/target');
+    HookTask = require('../../../lib/tasks/run-hook');
+    AddCordovaJS = td.replace('../../../lib/tasks/add-cordova-js');
+    LintTask = td.replace('../../../lib/tasks/lint-index');
+
     td.replace('../../../lib/utils/require-framework', function() {
       return {
         validateBuild: function() {
@@ -75,27 +61,48 @@ describe('Build Command', function() {
       tasks.push('cordova-target-build');
       return Promise.resolve();
     });
+
+    td.replace(AddCordovaJS.prototype, 'run', function() {
+      tasks.push('add-cordova-js');
+      return Promise.resolve();
+    });
+
+    let BuildCmd = require('../../../lib/commands/build');
+    let project = mockProject.project;
+    project.config = function() {
+      return {
+        locationType: 'hash'
+      };
+    };
+
+    let build = new BuildCmd({
+      project: project
+    });
+    build.analytics = mockAnalytics;
+
+    return build;
   }
 
   it('exits cleanly', function() {
-    var build = setupBuild();
+    let build = setupBuild();
 
     return expect(function() {
-      build.run({});
+      build.run(baseOpts);
     }).not.to.throw(Error);
   });
 
   it('runs tasks in the correct order', function() {
-    var build = setupBuild();
+    let build = setupBuild();
 
-    return build.run({})
+    return build.run(baseOpts)
     .then(function() {
       //h-t ember-electron for the pattern
       expect(tasks).to.deep.equal([
         'hook beforeBuild',
         'framework-validate-build',
         'cordova-target-validate-build',
         'framework-build',
+        'add-cordova-js',
         'cordova-target-build',
         'hook afterBuild',
         'lint-index'
@@ -104,9 +111,10 @@ describe('Build Command', function() {
   });
 
   it('skips ember-build with the --skip-ember-build flag', function() {
-    var build = setupBuild();
+    let build = setupBuild();
+    baseOpts.skipEmberBuild = true;
 
-    return build.run({skipEmberBuild: true})
+    return build.run(baseOpts)
     .then(function() {
       //h-t ember-electron for the pattern
       expect(tasks).to.deep.equal([
@@ -121,19 +129,40 @@ describe('Build Command', function() {
   });
 
   it('skips cordova-build with the --skip-cordova-build flag', function() {
-    var build = setupBuild();
+    let build = setupBuild();
+    baseOpts.skipCordovaBuild = true;
 
-    return build.run({skipCordovaBuild: true})
+    return build.run(baseOpts)
     .then(function() {
       //h-t ember-electron for the pattern
       expect(tasks).to.deep.equal([
         'hook beforeBuild',
         'framework-validate-build',
         'cordova-target-validate-build',
         'framework-build',
+        'add-cordova-js',
         'hook afterBuild',
         'lint-index'
       ]);
     });
   });
+
+  it('constructs AddCordovaJS as expected', function() {
+    let build = setupBuild();
+    return build.run(baseOpts).then(function() {
+      td.verify(new AddCordovaJS({
+        source: 'ember-cordova/cordova/www/index.html'
+      }));
+    });
+  });
+
+  it('constructs lint index as expected', function() {
+    let build = setupBuild();
+    return build.run(baseOpts).then(function() {
+      td.verify(new LintTask({
+        source: 'www/index.html',
+        project: mockProject.project
+      }));
+    });
+  });
 });

node-tests/unit/frameworks/vue/tasks/build-test.js

@@ -3,13 +3,12 @@ const expect         = require('../../../../helpers/expect');
 const Promise        = require('rsvp').Promise;
 
 describe('Vue Build Task', function() {
-  let buildTask, tasks, Bash, AddCordovaJS;
+  let buildTask, tasks, Bash;
 
   beforeEach(function() {
     tasks = [];
 
     Bash = td.replace('../../../../../lib/tasks/bash');
-    AddCordovaJS = td.replace('../../../../../lib/tasks/add-cordova-js');
     let Build = require('../../../../../lib/frameworks/vue/tasks/build');
 
     td.replace(Bash.prototype, 'run', function() {
@@ -22,11 +21,6 @@ describe('Vue Build Task', function() {
       return Promise.resolve();
     });
 
-    td.replace(AddCordovaJS.prototype, 'prepare', function() {
-      tasks.push('add-cordova-js');
-      return Promise.resolve();
-    });
-
     buildTask = new Build({
       buildCommand: 'fakeBuildCommand',
       buildPath: 'fakePath',
@@ -42,8 +36,7 @@ describe('Vue Build Task', function() {
     return buildTask.run({cordovaOutputPath: 'fakePath'}).then(function() {
       expect(tasks).to.deep.equal([
         'bash-task',
-        'bash-task-2',
-        'add-cordova-js'
+        'bash-task-2'
       ]);
     });
   });
@@ -53,9 +46,6 @@ describe('Vue Build Task', function() {
     buildTask.run({cordovaOutputPath: 'fakePath'});
 
     td.verify(new Bash(captor.capture()));
-    td.verify(new AddCordovaJS({
-      source: 'fakeCordovaPath/index.html'
-    }));
 
     expect(captor.values[0].command).to.equal('fakeBuildCommand');
     expect(captor.values[1].command).to.equal(