refactor: create tests (#22)

* refactor: create tests

Refactor:
- Tests in create_tests.py

Fix:
- Verifications for created app in `tns_assert.py`

* fix: do not update default app

Author: dtopuzov

products/nativescript/tns.py

@@ -145,7 +145,11 @@ def create(app_name=Settings.AppName.DEFAULT, template=None, path=None, app_id=N
 
         # Verify app is created properly
         if verify is not False:
-            TnsAssert.created(app_name=app_name, output=result.output, app_data=app_data)
+            # Usually we do not pass path on tns create, which actually equals to cwd.
+            # In such cases pass correct path to TnsAssert.created()
+            if path is None:
+                path = Settings.TEST_RUN_HOME
+            TnsAssert.created(app_name=app_name, output=result.output, app_data=app_data, path=path)
 
         return result
 

products/nativescript/tns_assert.py

@@ -2,23 +2,26 @@
 
 from core.enums.app_type import AppType
 from core.settings import Settings
-from core.utils.file_utils import Folder
 from core.utils.file_utils import File
+from core.utils.file_utils import Folder
 from core.utils.json_utils import JsonUtils
 from core.utils.perf_utils import PerfUtils
 from products.nativescript.tns_helpers import TnsHelpers
 
 
 class TnsAssert(object):
-    NODE_MODULES = 'node_modules'
-    TNS_MODULES = os.path.join(NODE_MODULES, 'tns-core-modules')
-    HOOKS = 'hooks'
 
     @staticmethod
-    def created(app_name, output=None, app_data=None):
-
+    def created(app_name, output=None, app_data=None, path=Settings.TEST_RUN_HOME):
+        """
+        Verify app is created properly.
+        :param app_name: Name of the app.
+        :param output: Console output of `tns create` command.
+        :param app_data: AppInfo object.
+        :param path: Base path where app is created.
+        """
         # Assert app exists
-        app_path = os.path.join(Settings.TEST_RUN_HOME, app_name)
+        app_path = os.path.join(path, app_name)
         assert Folder.exists(app_path), 'Failed to create app. ' + os.linesep + app_path + ' do not exists!'
 
         # Assert output
@@ -31,24 +34,30 @@ def created(app_name, output=None, app_data=None):
 
         # Assert app data
         if app_data is not None:
-            # Assert app type
-            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.app_type is AppType.JS:
-                pass
-            elif app_data.app_type is AppType.TS:
-                TnsAssert.__verify_created_ts()
-            elif app_data.app_type is AppType.NG:
-                TnsAssert.__verify_created_ng()
-            elif app_data.app_type is AppType.VUE:
-                pass
-            elif app_data.app_type is AppType.SHARED_NG:
-                pass
+            # Verify modules installed
+            node_path = TnsHelpers.get_app_node_modules_path(app_name=app_name, path=path)
+            assert Folder.exists(os.path.join(node_path, 'tns-core-modules')), '{N} theme do not exists in app.'
+            assert File.exists(os.path.join(node_path, 'tns-core-modules', 'tns-core-modules.d.ts'))
+
+            # Verify {N} core theme is installed
+            assert Folder.exists(os.path.join(node_path, 'nativescript-theme-core')), '{N} theme do not exists in app.'
+
+            # Verify webpack is installed
+            before_watch_hooks = os.path.join(app_path, 'hooks', 'before-watch')
+            assert Folder.exists(os.path.join(node_path, 'nativescript-dev-webpack')), 'Webpack not installed in app.'
+            assert File.exists(os.path.join(app_path, 'webpack.config.js')), 'Missing webpack config.'
+            assert File.exists(os.path.join(before_watch_hooks, 'nativescript-dev-webpack.js')), 'Hooks not installed.'
+
+            # Verify typescript in TS and NG apps:
+            if app_data.app_type in {AppType.TS, AppType.NG, AppType.SHARED_NG}:
+                assert Folder.exists(os.path.join(node_path, 'nativescript-dev-typescript')), 'TS not installed in app.'
+                assert File.exists(os.path.join(app_path, 'tsconfig.json')), 'Missing config.'
+                assert File.exists(os.path.join(app_path, 'tsconfig.tns.json')), 'Missing config.'
+                assert File.exists(os.path.join(before_watch_hooks, 'nativescript-dev-typescript.js')), \
+                    'Hooks not installed.'
 
             # Assert app id
-            if app_data.app_id is not None:
+            if app_data.bundle_id is not None:
                 pass
 
             # Assert size
@@ -95,29 +104,3 @@ def build(app_name, platform=None, release=False, provision=Settings.IOS.DEV_PRO
             # Assert size
             if app_data.size is not None:
                 pass
-
-    @staticmethod
-    def __verify_created_ts():
-        app_path = TnsHelpers.get_app_path(app_name='TestAppTS')
-        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, 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'))
-
-    @staticmethod
-    def __verify_created_ng():
-        app_path = TnsHelpers.get_app_path(app_name='TestAppNG')
-        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, 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'))

products/nativescript/tns_helpers.py

@@ -12,9 +12,12 @@
 class TnsHelpers(object):
 
     @staticmethod
-    def get_app_path(app_name):
-        app_path = os.path.join(Settings.TEST_RUN_HOME, app_name)
-        return app_path
+    def get_app_path(app_name, path=Settings.TEST_RUN_HOME):
+        return os.path.join(path, app_name)
+
+    @staticmethod
+    def get_app_node_modules_path(app_name, path=Settings.TEST_RUN_HOME):
+        return os.path.join(TnsHelpers.get_app_path(app_name=app_name, path=path), 'node_modules')
 
     @staticmethod
     def get_apk(app_name):

tests/cli/create/create_tests.py

@@ -8,76 +8,77 @@
 from products.nativescript.tns import Tns
 
 
+# noinspection PyMethodMayBeStatic
 class CreateTests(TnsTest):
-    app_data_JS = Apps.HELLO_WORLD_JS
-    app_data_TS = Apps.HELLO_WORLD_TS
-    app_data_NG = Apps.HELLO_WORLD_NG
-
-    js_app = Settings.AppName.DEFAULT + 'JS'
-    ts_app = Settings.AppName.DEFAULT + 'TS'
-    ng_app = Settings.AppName.DEFAULT + 'NG'
-
-    js_app_space = Settings.AppName.WITH_SPACE
-    js_app_dash = Settings.AppName.WITH_DASH
-    js_app_number = Settings.AppName.WITH_NUMBER
 
     @classmethod
     def setUpClass(cls):
         TnsTest.setUpClass()
 
     def setUp(self):
         TnsTest.setUp(self)
-        Folder.clean(os.path.join(Settings.TEST_RUN_HOME, 'folder'))
-        Folder.clean(os.path.join(Settings.TEST_RUN_HOME, 'js_app_space'))
-        Folder.clean(os.path.join(Settings.TEST_RUN_HOME, 'js_app_dash'))
-        Folder.clean(os.path.join(Settings.TEST_RUN_HOME, 'js_app_number'))
+        CreateTests.__clean_folders()
 
     @classmethod
     def tearDownClass(cls):
         TnsTest.tearDownClass()
+        CreateTests.__clean_folders()
 
     def test_001_create_app_like_real_user(self):
-        Tns.create(app_name=self.js_app, app_data=None)
+        """Create app with no any params"""
+        Tns.create(app_name=Settings.AppName.DEFAULT, app_data=Apps.HELLO_WORLD_JS, update=False)
 
     def test_002_create_app_template_js(self):
-        """Create app with --template js project without update modules"""
-        Tns.create(app_name=self.js_app, template=Template.HELLO_WORLD_JS.local_package,
-                   app_data=self.app_data_JS, update=False, verify=False)
+        """Create app with --template js project"""
+        Tns.create(app_name=Settings.AppName.DEFAULT, template=Template.HELLO_WORLD_JS.local_package,
+                   app_data=Apps.HELLO_WORLD_JS, update=False)
 
     def test_003_create_app_template_ts(self):
-        """Create app with --template ts project without update modules"""
-        Tns.create(app_name=self.ts_app, template=Template.HELLO_WORLD_TS.local_package,
-                   app_data=self.app_data_TS, update=False, verify=False)
+        """Create app with --template ts project"""
+        Tns.create(app_name=Settings.AppName.DEFAULT, template=Template.HELLO_WORLD_TS.local_package,
+                   app_data=Apps.HELLO_WORLD_TS, update=False)
 
     def test_004_create_app_template_ng(self):
-        """Create app with --template ng project without update modules"""
-        Tns.create(app_name=self.ng_app, template=Template.HELLO_WORLD_NG.local_package,
-                   app_data=self.app_data_NG, update=False, verify=False)
+        """Create app with --template ng project"""
+        Tns.create(app_name=Settings.AppName.DEFAULT, template=Template.HELLO_WORLD_NG.local_package,
+                   app_data=Apps.HELLO_WORLD_NG, update=False)
 
     def test_005_create_project_with_path(self):
         """Create project with --path option"""
-        Tns.create(app_name=self.js_app, template=Template.HELLO_WORLD_JS.local_package,
-                   app_data=self.app_data_JS, path=os.path.join(Settings.TEST_RUN_HOME, 'folder', 'subfolder'),
-                   update=False, verify=False)
-        assert Folder.exists(os.path.join(Settings.TEST_RUN_HOME, 'folder', 'subfolder', 'TestAppJS'))
+        Tns.create(app_name=Settings.AppName.DEFAULT,
+                   template=Template.HELLO_WORLD_JS.local_package,
+                   app_data=Apps.HELLO_WORLD_JS,
+                   path=os.path.join(Settings.TEST_RUN_HOME, 'folder', 'subfolder'),
+                   update=False)
 
-    def test_006_create_project_with_space(self):
+    def test_006_create_project_with_dash(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, update=False, verify=False)
+        Tns.create(app_name=Settings.AppName.WITH_DASH, template=Template.HELLO_WORLD_JS.local_package,
+                   app_data=Apps.HELLO_WORLD_JS, update=False)
 
     def test_007_create_project_with_space(self):
         """ Create project with dash is possible, but packageId will skip the dash symbol"""
-        Tns.create(app_name=self.js_app_dash, template=Template.HELLO_WORLD_JS.local_package,
-                   app_data=self.app_data_JS, update=False, verify=False)
+        Tns.create(app_name=Settings.AppName.WITH_SPACE, template=Template.HELLO_WORLD_JS.local_package,
+                   app_data=Apps.HELLO_WORLD_JS, update=False)
 
     def test_008_create_project_named_123(self):
         """Create app starting with digits should not be possible without --force option"""
-        Tns.create(app_name=self.js_app_number, template=Template.HELLO_WORLD_JS.local_package,
-                   app_data=self.app_data_JS, update=False, verify=False)
-        # TODO: package_json contains
+        result = Tns.create(app_name=Settings.AppName.WITH_NUMBER, template=Template.HELLO_WORLD_JS.local_package,
+                            app_data=Apps.HELLO_WORLD_JS, update=False, verify=False)
+        assert 'The project name does not start with letter and will fail to build for Android.' in result.output
+        assert 'If You want to create project with this name add --force to the create command.' in result.output
+
+        Tns.create(app_name=Settings.AppName.WITH_NUMBER, template=Template.HELLO_WORLD_JS.local_package,
+                   app_data=Apps.HELLO_WORLD_JS, force=True, update=False)
 
     def test_009_create_project_with_appid(self):
         """Create project with --appid option"""
-        Tns.create(app_name=self.js_app, template=Template.HELLO_WORLD_JS.local_package, app_data=self.app_data_JS,
-                   update=False, verify=False, app_id='org.nativescript.MyApp')
+        Tns.create(app_name=Settings.AppName.DEFAULT, template=Template.HELLO_WORLD_JS.local_package,
+                   app_data=Apps.HELLO_WORLD_JS, update=False, app_id='org.nativescript.MyApp')
+
+    @staticmethod
+    def __clean_folders():
+        Folder.clean(os.path.join(Settings.TEST_RUN_HOME, 'folder'))
+        Folder.clean(os.path.join(Settings.TEST_RUN_HOME, Settings.AppName.WITH_SPACE))
+        Folder.clean(os.path.join(Settings.TEST_RUN_HOME, Settings.AppName.WITH_DASH))
+        Folder.clean(os.path.join(Settings.TEST_RUN_HOME, Settings.AppName.WITH_NUMBER))