Merge pull request #425 from jelhan/fix-cordova-output-path

Fix: cordova build does not respect cordovaOutputPath when calling LintIndex

Author: alexblom

lib/commands/build.js

@@ -63,13 +63,14 @@ module.exports = Command.extend({
       project: this.project
     });
 
+    let indexHtmlPath = path.join(options.cordovaOutputPath, 'index.html');
+
     let lint = new LintIndex({
-      source: 'www/index.html',
-      project: this.project
+      source: indexHtmlPath
     });
 
     let addCordovaJS = new AddCordovaJS({
-      source: path.join(options.cordovaOutputPath, 'index.html')
+      source: indexHtmlPath
     });
 
     let framework = requireFramework(this.project);

lib/commands/lint-index.js

@@ -1,5 +1,7 @@
 const Command          = require('./-command');
+const cordovaPath      = require('../targets/cordova/utils/get-path');
 const Lint             = require('../tasks/lint-index');
+const path             = require('path');
 
 module.exports = Command.extend({
   name: 'lint-index',
@@ -16,8 +18,7 @@ module.exports = Command.extend({
     this._super.apply(this, arguments);
 
     let lint = new Lint({
-      source: options.source,
-      project: this.project
+      source: path.join(cordovaPath(this.project), options.source)
     });
 
     return lint.run();

lib/tasks/lint-index.js

@@ -1,9 +1,7 @@
 const Task             = require('./-task');
 const HTMLParser       = require('htmlparser2').Parser;
 const Promise          = require('rsvp').Promise;
-const path             = require('path');
 const fsUtils          = require('../utils/fs-utils');
-const cordovaPath      = require('../targets/cordova/utils/get-path');
 const logger           = require('../utils/logger');
 
 const ROOT_URL_PATTERN = /^\//;
@@ -78,8 +76,7 @@ module.exports = Task.extend({
   },
 
   run() {
-    let projectPath = cordovaPath(this.project);
-    let indexPath = path.join(projectPath, this.source);
+    let indexPath = this.source;
 
     logger.info('corber : Linting ' + indexPath + '...\n');
 

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

@@ -161,8 +161,21 @@ describe('Build Command', function() {
     let build = setupBuild();
     return build.run(baseOpts).then(function() {
       td.verify(new LintTask({
-        source: 'www/index.html',
-        project: mockProject.project
+        source: 'corber/cordova/www/index.html',
+      }));
+    });
+  });
+
+  it('supports custom output path with --cordova-output-path option', function() {
+    let build = setupBuild();
+    baseOpts.cordovaOutputPath = 'foo';
+
+    return build.run(baseOpts).then(function() {
+      td.verify(new AddCordovaJS({
+        source: 'foo/index.html'
+      }));
+      td.verify(new LintTask({
+        source: 'foo/index.html'
       }));
     });
   });