refactoring

Author: Miroslava Ivanova

products/nativescript/tns_assert.py

@@ -31,11 +31,11 @@ def created(app_name, output=None, app_data=None):
         # Assert app data
         if app_data is not None:
             # Assert app type
-            assert File.exists(os.path.join(app_path, 'node_modules', 'tns-core-modules', 'package.json'))
-            assert File.exists(os.path.join(app_path, 'node_modules', 'tns-core-modules', 'LICENSE'))
-            assert File.exists(os.path.join(app_path, 'node_modules', 'tns-core-modules', 'xml', 'xml.js'))
-            assert Folder.exists(os.path.join(app_path, 'node_modules', 'nativescript-theme-core'))
-            assert Folder.exists(os.path.join(app_path, 'node_modules', 'nativescript-dev-webpack'))
+            assert Folder.exists(os.path.join(app_path, TnsAssert.TNS_MODULES))
+            assert Folder.exists(os.path.join(app_path, TnsAssert.TNS_MODULES))
+            assert Folder.exists(os.path.join(app_path, TnsAssert.TNS_MODULES))
+            assert Folder.exists(os.path.join(app_path, TnsAssert.NODE_MODULES, 'nativescript-theme-core'))
+            assert Folder.exists(os.path.join(app_path, TnsAssert.NODE_MODULES, 'nativescript-dev-webpack'))
 
             if app_data.type is AppType.JS:
                 pass
@@ -44,18 +44,22 @@ def created(app_name, output=None, app_data=None):
                 assert File.exists(os.path.join(app_path, 'webpack.config.js'))
                 assert File.exists(os.path.join(app_path, 'tsconfig.tns.json'))
                 assert not File.exists(os.path.join(app_path, 'references.d.ts'))
-                assert File.exists(os.path.join(app_path, 'node_modules', 'tns-core-modules', 'tns-core-modules.d.ts'))
-                assert File.exists(os.path.join(app_path, TnsAssert.HOOKS, 'before-prepare', 'nativescript-dev-typescript.js'))
-                assert File.exists(os.path.join(app_path, TnsAssert.HOOKS, 'before-watch', 'nativescript-dev-typescript.js'))
+                assert File.exists(os.path.join(app_path, TnsAssert.TNS_MODULES, 'tns-core-modules.d.ts'))
+                assert File.exists(os.path.join(app_path, TnsAssert.HOOKS, 'before-prepare',
+                                                'nativescript-dev-typescript.js'))
+                assert File.exists(os.path.join(app_path, TnsAssert.HOOKS, 'before-watch',
+                                                'nativescript-dev-typescript.js'))
                 pass
             elif app_data.type is AppType.NG:
                 assert File.exists(os.path.join(app_path, 'tsconfig.json'))
                 assert File.exists(os.path.join(app_path, 'webpack.config.js'))
                 assert File.exists(os.path.join(app_path, 'tsconfig.tns.json'))
                 assert not File.exists(os.path.join(app_path, 'references.d.ts'))
-                assert File.exists(os.path.join(app_path, 'node_modules', 'tns-core-modules', 'tns-core-modules.d.ts'))
-                assert File.exists(os.path.join(app_path, TnsAssert.HOOKS, 'before-prepare', 'nativescript-dev-typescript.js'))
-                assert File.exists(os.path.join(app_path, TnsAssert.HOOKS, 'before-watch', 'nativescript-dev-typescript.js'))
+                assert File.exists(os.path.join(app_path, TnsAssert.TNS_MODULES, 'tns-core-modules.d.ts'))
+                assert File.exists(os.path.join(app_path, TnsAssert.HOOKS, 'before-prepare',
+                                                'nativescript-dev-typescript.js'))
+                assert File.exists(os.path.join(app_path, TnsAssert.HOOKS, 'before-watch',
+                                                'nativescript-dev-typescript.js'))
                 pass
             elif app_data.type is AppType.VUE:
                 pass

tests/cli/create/create_tests.py

@@ -27,6 +27,8 @@ class CreateTests(TnsTest):
     ng_source_project_dir = os.path.join(Settings.TEST_RUN_HOME, ng_app)
     ng_target_project_dir = os.path.join(Settings.TEST_RUN_HOME, 'data', 'temp', ng_app)
 
+    js_app_space = Settings.AppName.WITH_SPACE
+
     @classmethod
     def setUpClass(cls):
         TnsTest.setUpClass()
@@ -40,8 +42,19 @@ def tearDownClass(cls):
 
     def test_001_create_app_like_real_user(self):
         Tns.create(app_name=self.js_app, app_data=None)
-
-    def test_002_create_apps(self):
+    s
+    def test_002_create_app_template_js(self):
         Tns.create(app_name=self.js_app, template=Template.HELLO_WORLD_JS.local_package, app_data=self.app_data_JS)
+
+    def test_003_create_app_template_ts(self):
         Tns.create(app_name=self.ts_app, template=Template.HELLO_WORLD_TS.local_package, app_data=self.app_data_TS)
+
+    def test_004_create_app_template_ng(self):
         Tns.create(app_name=self.ng_app, template=Template.HELLO_WORLD_NG.local_package, app_data=self.app_data_NG)
+
+    def test_005_create_project_with_path(self):
+        """Create project with --path option"""
+
+    def test_006_create_project_with_space(self):
+        """ Create project with space is possible, but packageId will skip the space symbol"""
+        Tns.create(app_name=self.js_app_space, template=Template.HELLO_WORLD_JS.local_package, app_data=self.app_data_JS)