fix: askx new --template-url -> the language and deployer selection a…

lib/commands/v2new/index.js

@@ -92,6 +92,9 @@ function createNonHostedSkill(cmd, profile, doDebug, userInput, callback) {
             return callback(projectErr);
         }
         Messenger.getInstance().info(`Project for skill "${userInput.skillName}" is successfully created at ${projectFolderPath}\n`);
+        if (cmd.templateUrl) {
+            return callback();
+        }
         try {
             // 2.load involving M(Model) component (ResourcesConfig & Manifest) from the downloaded skill project with 'default' profile
             helper.loadSkillProjectModel(projectFolderPath, 'default');

lib/commands/v2new/wizard-helper.js

@@ -24,12 +24,12 @@ module.exports = {
  */
 function collectUserCreationProjectInfo(cmd, callback) {
     const userInput = {};
-    ui.selectSkillCodeLanguage((languageErr, language) => {
+    _getSkillCodeLanguage(cmd, (languageErr, language) => {
         if (languageErr) {
             return callback(languageErr);
         }
         userInput.language = language;
-        ui.getDeploymentType(CONSTANTS.DEPLOYER_TYPE, (deploymentErr, deploymentType) => {
+        _getDeploymentType(cmd, (deploymentErr, deploymentType) => {
             if (deploymentErr) {
                 return callback(deploymentErr);
             }
@@ -62,6 +62,20 @@ function collectUserCreationProjectInfo(cmd, callback) {
     });
 }
 
+function _getSkillCodeLanguage(cmd, callback) {
+    if (cmd.templateUrl) {
+        return callback();
+    }
+    ui.selectSkillCodeLanguage((err, res) => callback(err || null, res));
+}
+
+function _getDeploymentType(cmd, callback) {
+    if (cmd.templateUrl) {
+        return callback();
+    }
+    ui.getDeploymentType(CONSTANTS.DEPLOYER_TYPE, (err, res) => callback(err || null, res));
+}
+
 /**
  * Get template info for non-hosted skill
  * @param {Object} cmd command object
@@ -73,9 +87,6 @@ function _getTemplateInfo(cmd, userInput, callback) {
         if (userInput.language === 'Java') {
             return callback('Alexa hosted skills don\'t support Java currently.');
         }
-        if (cmd.templateUrl) {
-            return callback('No custom template allowed for an Alexa hosted skill.');
-        }
         process.nextTick(() => {
             callback(null, { templateUrl: null, templateName: null });
         });

test/unit/commands/v2new/index-test.js

@@ -224,6 +224,25 @@ describe('Commands new test - command class test', () => {
                 });
             });
 
+            it('| load skill project model succeeds, with custom template, expect no error thrown', (done) => {
+                // setup
+                const TEST_CMD_TEMPLATE = {
+                    profile: TEST_PROFILE,
+                    templateUrl: 'templateUrl'
+                };
+                const TEST_USER_INPUT = {};
+                wizardHelper.collectUserCreationProjectInfo.callsArgWith(1, null, TEST_USER_INPUT);
+                helper.downloadTemplateFromGit.callsArgWith(2, null);
+                // call
+                instance.handle(TEST_CMD_TEMPLATE, (err) => {
+                    // verify
+                    expect(err).equal(undefined);
+                    expect(errorStub.callCount).equal(0);
+                    expect(infoStub.callCount).equal(2);
+                    done();
+                });
+            });
+
             it('| load skill project model fails, expect error thrown', (done) => {
                 // setup
                 const TEST_USER_INPUT = {};

test/unit/commands/v2new/wizard-helper-test.js

@@ -99,19 +99,6 @@ describe('Commands new test - wizard helper test', () => {
             });
         });
 
-        it('| Hosted skills do not support custom template, expect throw error', (done) => {
-        // setup
-            const TEST_HOSTED_ERROR = 'No custom template allowed for an Alexa hosted skill.';
-            ui.selectSkillCodeLanguage.callsArgWith(0, null, TEST_LANGUAGE_RESPONSE);
-            ui.getDeploymentType.callsArgWith(1, null, TEST_HOSTED_DEPLOYMENT);
-            // call
-            wizardHelper.collectUserCreationProjectInfo(TEST_OPTIONS_WITH_TEMPLATE, (err) => {
-                // verify
-                expect(err).equal(TEST_HOSTED_ERROR);
-                done();
-            });
-        });
-
         it('| custom template should not be non-git url, expect throw error', (done) => {
             // setup
             const TEST_GIT_ERROR = `The provided template url ${TEST_TEMPLATE_URL} is not a supported type. \