Merge pull request #356 from isleofcode/fix/force-on-validate-locationtype

Fix/force on validate locationtype

Author: alexblom

lib/commands/build.js

@@ -76,7 +76,8 @@ module.exports = Command.extend({
 
       validations.push(
         new ValidateLocationType({
-          config: projectConfig
+          config: projectConfig,
+          force: options.force
         }).run()
       );
     }

lib/tasks/validate/location-type.js

@@ -1,21 +1,27 @@
 var Task            = require('../-task');
 var Promise         = require('rsvp').Promise;
 var chalk           = require('chalk');
+var logger          = require('../../utils/logger');
 
 var MUST_SPECIFY_HASH =
   chalk.red('* config/environment.js: Cordova applications require:') +
   chalk.grey('\n`ENV.locationType = \'hash\'; \n');
 
 module.exports = Task.extend({
   config: undefined,
+  force: false,
 
   run: function() {
     var config = this.config;
     var locationType    = config.locationType;
     var isHashLocation  = locationType === 'hash';
 
-    if (!isHashLocation) {
+    if (!isHashLocation && this.force === false) {
       return Promise.reject(MUST_SPECIFY_HASH);
+    } else {
+      var msg = MUST_SPECIFY_HASH;
+      msg += 'You have passed the --force flag, so continuing';
+      logger.warn(msg);
     }
 
     return Promise.resolve();

node-tests/unit/tasks/validate/location-type-test.js

@@ -4,6 +4,8 @@ var td              = require('testdouble');
 var expect          = require('../../../helpers/expect');
 var mockProject     = require('../../../fixtures/ember-cordova-mock/project');
 var ValidateLocType = require('../../../../lib/tasks/validate/location-type');
+var logger          = require('../../../../lib/utils/logger');
+var contains        = td.matchers.contains;
 
 describe('Validate Location Type', function() {
   var validateLoc;
@@ -32,4 +34,15 @@ describe('Validate Location Type', function() {
     validateLoc.config = { locationType: 'hash' };
     return expect(validateLoc.run()).to.be.fulfilled;
   });
+
+  it('when force is true, it warns vs rejects', function() {
+    validateLoc.config = { locationType: 'auto' };
+    validateLoc.force = true;
+
+    var warnDouble = td.replace(logger, 'warn');
+
+    return validateLoc.run().then(function() {
+      td.verify(warnDouble(contains('You have passed the --force flag')));
+    })
+  });
 });