Do not check for ERR when installing nativescipt

Author: dtopuzov

core/installer/cli.py

@@ -13,11 +13,8 @@ class Cli(object):
     def install():
         output = run("npm i " + SUT_FOLDER + os.path.sep + "nativescript.tgz")
         message = "NativeScript CLI installation failed - \"{e}\" found in output."
-        assert "npm ERR" not in output, message.format(e="npm ERR")
-        assert "FiberFuture" not in output, message.format(e="FiberFuture")
         assert "dev-post-install" not in output, message.format(e="dev-post-install")
-        assert File.exists("node_modules/.bin/tns"), \
-            "NativeScript CLI installation failed - tns does not exist."
+        assert File.exists("node_modules/.bin/tns"), "NativeScript CLI installation failed - tns does not exist."
         print output
 
     @staticmethod

core/settings/strings.py

@@ -5,8 +5,6 @@
 ios = "ios"
 android = "android"
 invalid = "invalidEntry"
-config_debug = "CONFIGURATION Debug"
-config_release = "CONFIGURATION Release"
 app_identifier = "org.nativescript.testapp"
 
 # Files
@@ -60,11 +58,7 @@
 devDependencies = "devDependencies"
 started_on_device = "Successfully started on device with identifier"
 
-# Pods
-carousel = "carousel"
-
 # Plugins
-
 nativescript_unit_test_runner = "nativescript-unit-test-runner"
 tns_core_modules = "tns-core-modules"
 
@@ -75,11 +69,3 @@
 invalid_value = "The value '{0}' is not valid."
 no_platform = "No platform specified"
 "and neither was a --path specified."
-cannot_resolve_device = "Could not find device by specified identifier"
-list_devices = "To list currently connected devices and verify that the specified identifier exists, run 'tns device'"
-no_platform_installed = "No installed platforms found. Use $ tns platform add"
-
-
-
-
-

core/tns/tns.py

@@ -12,7 +12,7 @@
 from core.osutils.process import Process
 from core.settings.settings import TNS_PATH, SUT_FOLDER, DEVELOPMENT_TEAM, TEST_RUN_HOME, \
     COMMAND_TIMEOUT, CURRENT_OS, TAG
-from core.settings.strings import config_release, codesign, config_debug
+from core.settings.strings import codesign
 from core.tns.tns_platform_type import Platform
 from core.tns.tns_verifications import TnsAsserts
 from core.xcode.xcode import Xcode
@@ -382,9 +382,9 @@ def build_ios(attributes={}, assert_success=True, tns_path=None):
 
             # Verify release/debug builds
             if "--release" in attributes.keys():
-                assert config_release in output
+                assert "CONFIGURATION Release" in output
             else:
-                assert config_debug in output
+                assert "CONFIGURATION Debug" in output
 
             entitlements_path = app_name + '/platforms/ios/' + app_id + '/' + app_id + '.entitlements'
             assert File.exists(entitlements_path), "Entitlements file is missing!"

core/tns/tns_verifications.py

@@ -3,7 +3,6 @@
 """
 import json
 import os
-import re
 
 from core.npm.npm import Npm
 from core.osutils.file import File
@@ -71,7 +70,7 @@ def created(app_name, output=None, full_check=True):
         """
         Assert application is created properly.
         :param app_name: App name
-        :param output: Outout of `tns create command`
+        :param output: Output of `tns create command`
         :param full_check: If true everything will be checked. If false only console output will be checked.
         """
 
@@ -117,22 +116,17 @@ def created_ts(app_name, output=None):
         dts = os.path.join(app_name, TnsAsserts.TNS_MODULES, 'tns-core-modules.d.ts')
 
         # Assert content of files added with TypeScript plugin.
-        modules_version = TnsAsserts.get_modules_version(app_name=app_name)
-        modules_version = re.sub("\D", "", modules_version)
-
         File.exists(ts_config)
         File.exists(ref_dts)
         File.exists(dts)
         red_tds_content = File.read(ref_dts)
-        if modules_version[0] < 3:
-            assert './node_modules/tns-core-modules/tns-core-modules.d.ts' in red_tds_content
-        else:
-            assert './node_modules/tns-core-modules/tns-core-modules.d.ts' not in red_tds_content
-            ts_config_json = TnsAsserts.get_tsconfig_json(app_name=app_name)
-            paths = ts_config_json.get('compilerOptions').get('paths')
-            assert paths is not None, 'Paths missing in tsconfig.json'
-            assert '/node_modules/tns-core-modules/' in str(paths), \
-                '"/node_modules/tns-core-modules/" not found in paths section iof tsconfig.json'
+
+        assert './node_modules/tns-core-modules/tns-core-modules.d.ts' not in red_tds_content
+        ts_config_json = TnsAsserts.get_tsconfig_json(app_name=app_name)
+        paths = ts_config_json.get('compilerOptions').get('paths')
+        assert paths is not None, 'Paths missing in tsconfig.json'
+        assert '/node_modules/tns-core-modules/' in str(paths), \
+            '"/node_modules/tns-core-modules/" not found in paths section iof tsconfig.json'
 
         assert not Folder.is_empty(app_name + TnsAsserts.NODE_MODULES + '/nativescript-dev-typescript')
         assert File.exists(app_name + TnsAsserts.HOOKS + 'before-prepare/nativescript-dev-typescript.js')
@@ -330,3 +324,28 @@ def _full_prepare():
                 'Prepare does not skip \'ios\' specific js files.'
             assert not File.exists(os.path.join(modules_path, 'application', 'application.ios.js')), \
                 'Prepare does not strip \'ios\' from name of js files.'
+
+    @staticmethod
+    def can_not_find_device(output):
+        """
+        Assert output for invalid device.
+        :param output: Output of tns command
+        """
+        assert "Could not find device by specified identifier" in output
+        assert "To list currently connected devices and verify that the specified identifier exists" in output
+
+    @staticmethod
+    def invalid_device(output):
+        """
+        Assert output for invalid device.
+        :param output: Output of tns command
+        """
+
+        assert "Searching for devices..." in output
+        assert "Cannot find connected devices" in output
+        assert "No emulator image available for device identifier" in output or \
+               "No simulator image available for device identifier " in output
+        assert "To list available emulator images, run 'tns device <Platform> --available-devices'" in output or \
+               "To list available simulator images, run 'tns device <Platform> --available-devices" in output
+        assert "To list currently connected devices and verify that the specified identifier exists, run 'tns device'" \
+               in output

tests/build/ios/build_ios_provision_tests.py

@@ -44,6 +44,7 @@ def test_200_build_ios_list_provisions(self):
         assert "Due" in output
         assert "Devices" in output
         assert PROVISIONING in output
+        assert DISTRIBUTION_PROVISIONING in output
         assert DEVELOPMENT_TEAM in output
 
     @unittest.skipIf("9." in Xcode.get_version(),

tests/device/deploy_android_tests.py

@@ -14,6 +14,7 @@
 from core.settings.strings import *
 from core.tns.tns import Tns
 from core.tns.tns_platform_type import Platform
+from core.tns.tns_verifications import TnsAsserts
 
 
 class DeployAndroidTests(BaseClass):
@@ -119,6 +120,4 @@ def test_402_deploy_invalid_device(self):
                                                                    "--justlaunch": "",
                                                                    "--device": "invaliddevice_id"
                                                                    })
-        assert "Could not find device by specified identifier" in output
-        assert "To list currently connected devices and verify that the specified identifier exists, run" in output
-        assert "tns device" in output
+        TnsAsserts.invalid_device(output=output)

tests/device/device_android_tests.py

@@ -10,9 +10,10 @@
 from core.osutils.file import File
 from core.osutils.folder import Folder
 from core.settings.settings import ANDROID_RUNTIME_PATH, EMULATOR_ID
+from core.settings.strings import invalid
 from core.tns.tns import Tns
-from core.settings.strings import *
 from core.tns.tns_platform_type import Platform
+from core.tns.tns_verifications import TnsAsserts
 
 
 class DeviceAndroidTests(BaseClass):
@@ -100,12 +101,12 @@ def test_400_device_invalid_platform(self):
 
     def test_401_device_log_invalid_device_id(self):
         output = Tns.run_tns_command("device log", attributes={"--device": "invaliddevice_id"})
-        assert cannot_resolve_device in output
+        TnsAsserts.can_not_find_device(output=output)
 
     def test_402_device_run_invalid_device_id(self):
         output = Tns.run_tns_command("device run android", attributes={"--device": "invaliddevice_id"})
-        assert cannot_resolve_device in output
+        TnsAsserts.can_not_find_device(output=output)
 
     def test_403_device_list_applications_invalid_device_id(self):
         output = Tns.run_tns_command("device list-applications", attributes={"--device": "invaliddevice_id"})
-        assert cannot_resolve_device in output
+        TnsAsserts.can_not_find_device(output=output)

tests/device/run_android_device_tests.py

@@ -25,7 +25,6 @@
 from core.device.helpers.adb import Adb
 from core.osutils.file import File
 from core.osutils.folder import Folder
-from core.osutils.process import Process
 from core.settings.settings import ANDROID_RUNTIME_PATH, EMULATOR_ID
 from core.tns.replace_helper import ReplaceHelper
 from core.tns.tns import Tns

tests/emulator/run_android_tests.py

@@ -28,7 +28,6 @@
 from core.osutils.os_type import OSType
 from core.settings.settings import ANDROID_RUNTIME_PATH, ANDROID_KEYSTORE_PATH, ANDROID_KEYSTORE_PASS, \
     ANDROID_KEYSTORE_ALIAS, ANDROID_KEYSTORE_ALIAS_PASS, EMULATOR_ID, EMULATOR_NAME, CURRENT_OS, TEST_RUN_HOME
-from core.settings.strings import cannot_resolve_device, list_devices
 from core.tns.replace_helper import ReplaceHelper
 from core.tns.tns import Tns
 from core.tns.tns_platform_type import Platform
@@ -210,8 +209,8 @@ def test_200_tns_run_android_break_and_fix_app(self):
                             expected_image='livesync-hello-world_home')
 
         # Move js files
-        app_js_original_path = src=os.path.join(self.app_name, 'app', 'app.js')
-        app_js_new_path = src = os.path.join(TEST_RUN_HOME, 'app.js')
+        app_js_original_path = os.path.join(self.app_name, 'app', 'app.js')
+        app_js_new_path = os.path.join(TEST_RUN_HOME, 'app.js')
         File.copy(src=app_js_original_path, dest=app_js_new_path)
         File.remove(file_path=app_js_original_path)
         strings = ['Successfully synced application', EMULATOR_ID]
@@ -564,5 +563,4 @@ def test_401_tns_run_android_should_not_continue_on_build_failure(self):
     def test_404_run_on_invalid_device_id(self):
         output = Tns.run_android(attributes={'--path': self.app_name, '--device': 'fakeId', '--justlaunch': ''},
                                  assert_success=False)
-        assert cannot_resolve_device in output
-        assert list_devices in output
+        TnsAsserts.invalid_device(output=output)

tests/simulator/run_ios_tests.py

@@ -24,9 +24,7 @@
 from core.device.simulator import Simulator
 from core.osutils.file import File
 from core.osutils.folder import Folder
-from core.osutils.process import Process
 from core.settings.settings import IOS_RUNTIME_PATH, SIMULATOR_NAME, TEST_RUN_HOME
-from core.settings.strings import cannot_resolve_device, list_devices
 from core.tns.replace_helper import ReplaceHelper
 from core.tns.tns import Tns
 from core.tns.tns_platform_type import Platform
@@ -388,8 +386,7 @@ def test_400_tns_run_on_folder_with_spaces(self):
     def test_404_run_on_invalid_device_id(self):
         output = Tns.run_ios(attributes={'--path': self.app_name, '--device': 'fakeId', '--justlaunch': ''},
                              assert_success=False)
-        assert cannot_resolve_device in output
-        assert list_devices in output
+        TnsAsserts.invalid_device(output=output)
 
     @unittest.skipIf(Device.get_count(platform=Platform.IOS) > 0, "Valid only if there are no devices.")
     def test_410_run_without_platform_and_without_devices(self):