Merge pull request #5041 from NativeScript/fatme/merge-release-master

chore: merge release into master

Author: Fatme

docs/man_pages/project/creation/create.md

@@ -53,6 +53,7 @@ Template | Command
 `Angular - Tabs` | tns create --template tns-template-tab-navigation-ng
 `Vue.js - Blank`, `--vue`, `--vuejs` | tns create --template tns-template-blank-vue
 `Vue.js - SideDrawer`, | tns create --template tns-template-drawer-navigation-vue
+`Vue.js - Tabs` | tns create --template tns-template-tab-navigation-vue
 
 ### Related Commands
 

lib/commands/create-project.ts

@@ -210,6 +210,11 @@ or --js flags.)
 			key: CreateProjectCommand.DrawerTemplateKey,
 			value: "tns-template-drawer-navigation-vue",
 			description: CreateProjectCommand.DrawerTemplateDescription
+		},
+		{
+			key: CreateProjectCommand.TabsTemplateKey,
+			value: "tns-template-tab-navigation-vue",
+			description: CreateProjectCommand.TabsTemplateDescription
 		}];
 
 		return templates;

lib/common/test/unit-tests/logger.ts

@@ -162,14 +162,14 @@ describe("logger", () => {
 		[undefined, null, false, "string value", 42, { obj: 1 }, ["string value 1", "string value 2"]].forEach(value => {
 			it(`handles formatted message with '${value}' value in one of the args`, () => {
 				logger.info("test %s", value);
-				assert.equal(outputs.info, `test ${value}`);
+				assert.equal(outputs.info, util.format("test %s", value));
 				assert.deepEqual(outputs.context, {}, "Nothing should be added to logger context.");
 				assert.deepEqual(outputs.removedContext, {}, "Removed context should be empty.");
 			});
 
 			it(`handles formatted message with '${value}' value in one of the args and additional values passed to context`, () => {
 				logger.info("test %s", value, { [LoggerConfigData.skipNewLine]: true });
-				assert.equal(outputs.info, `test ${value}`);
+				assert.equal(outputs.info, util.format("test %s", value));
 				assert.deepEqual(outputs.context, { [LoggerConfigData.skipNewLine]: true }, `${LoggerConfigData.skipNewLine} should be set with value true.`);
 				assert.deepEqual(outputs.removedContext, { [LoggerConfigData.skipNewLine]: true }, `Removed context should contain ${LoggerConfigData.skipNewLine}`);
 			});

test/project-commands.ts

@@ -18,15 +18,14 @@ const expectedFlavorChoices = [
 	{ key: "Plain TypeScript", description: "Learn more at https://nativescript.org/typescript" },
 	{ key: "Plain JavaScript", description: "Use NativeScript without any framework" }
 ];
-const expectedTemplateChoices = [
-	{ key: "Hello World", description: "A Hello World app" },
-	{ key: "SideDrawer", description: "An app with pre-built pages that uses a drawer for navigation" },
-	{ key: "Tabs", description: "An app with pre-built pages that uses tabs for navigation" }
-];
-const expectedTemplateChoicesVue = [
-	{ key: "Blank", description: "A blank app" },
-	{ key: "SideDrawer", description: "An app with pre-built pages that uses a drawer for navigation" }
-];
+const templateChoises = {
+	helloWorld: { key: "Hello World", description: "A Hello World app" },
+	blank: { key: "Blank", description: "A blank app" },
+	sideDrawer: { key: "SideDrawer", description: "An app with pre-built pages that uses a drawer for navigation" },
+	tabs: { key: "Tabs", description: "An app with pre-built pages that uses tabs for navigation" }
+};
+const expectedTemplateChoices = [templateChoises.helloWorld, templateChoises.sideDrawer, templateChoises.tabs];
+const expectedTemplateChoicesVue = [templateChoises.blank, templateChoises.sideDrawer, templateChoises.tabs];
 
 class ProjectServiceMock implements IProjectService {
 	async validateProjectName(opts: { projectName: string, force: boolean, pathToProject: string }): Promise<string> {