Add test for NativeScript/nativescript-cli#2936

Author: dtopuzov

core/tns/tns.py

@@ -302,7 +302,8 @@ def plugin_add(name, attributes={}, log_trace=False, assert_success=True, tns_pa
         output = Tns.run_tns_command("plugin add " + name, attributes=attributes, log_trace=log_trace,
                                      tns_path=tns_path)
         if assert_success:
-            assert "Successfully installed plugin {0}".format(name.replace("@" + Tns.NEXT_TAG, "")) in output
+            short_name = name.replace("@" + Tns.NEXT_TAG, "").replace(".tgz", "").split(os.sep)[-1]
+            assert "Successfully installed plugin {0}".format(short_name) in output
         return output
 
     @staticmethod

data/plugins/CFBundleURLName-Plugin.tgz

@@ -9,7 +9,7 @@
 from core.osutils.command import run
 from core.osutils.file import File
 from core.osutils.folder import Folder
-from core.settings.settings import TNS_PATH, IOS_RUNTIME_PATH, ANDROID_RUNTIME_PATH
+from core.settings.settings import TNS_PATH, IOS_RUNTIME_PATH, ANDROID_RUNTIME_PATH, TEST_RUN_HOME
 from core.settings.strings import *
 from core.tns.tns import Tns
 from core.tns.tns_platform_type import Platform
@@ -190,6 +190,20 @@ def test_302_plugin_and_npm_modules_in_same_project(self):
         assert not File.exists(self.app_name + "/platforms/android/src/main/assets/app/tns_modules/" +
                                "nativescript-appversion/appversion.ios.js")
 
+    def test_320_CFBundleURLTypes_overridden_from_plugin(self):
+        """
+        Test for issue https://github.com/NativeScript/nativescript-cli/issues/2936
+        """
+        Tns.create_app(self.app_name)
+        plugin_path = os.path.join(TEST_RUN_HOME, 'data', 'plugins', 'CFBundleURLName-Plugin.tgz')
+        Tns.plugin_add(plugin_path, attributes={"--path": self.app_name})
+        Tns.prepare_ios(attributes={"--path": self.app_name})
+        plist = File.read(os.path.join(TEST_RUN_HOME, self.app_name, 'platforms', 'ios', self.app_name,
+                                       self.app_name + "-Info.plist"))
+        assert "<key>NSAllowsArbitraryLoads</key>" in plist, \
+            "NSAppTransportSecurity from plugin is not found in final Info.plist"
+        assert "<string>bar</string>" in plist, "CFBundleURLTypes from plugin is not found in final Info.plist"
+
     def test_401_plugin_add_invalid_plugin(self):
         Tns.create_app(self.app_name)
         output = Tns.plugin_add("wd", attributes={"--path": self.app_name}, assert_success=False)
@@ -220,4 +234,4 @@ def test_403_plugin_add_plugin_not_supported_on_specific_platform(self):
         output = Tns.prepare_android(attributes={"--path": self.app_name})
         TnsAsserts.prepared(self.app_name, platform=Platform.ANDROID, output=output, prepare=Prepare.FULL)
         assert File.pattern_exists(self.app_name + "/platforms/android", pattern="*.aar")
-        assert File.pattern_exists(self.app_name + "/platforms/android", pattern="*ACRA*")
+        assert File.pattern_exists(self.app_name + "/platforms/android", pattern="*ACRA*")

tests/build/ios/plugin_ios_tests.py

@@ -10,6 +10,7 @@
 from core.osutils.folder import Folder
 from core.settings.settings import EMULATOR_NAME, EMULATOR_ID, ANDROID_RUNTIME_PATH
 from core.tns.tns import Tns
+from core.tns.tns_platform_type import Platform
 
 
 class DebugAndroidEmulatorTests(BaseClass):
@@ -18,6 +19,7 @@ def setUpClass(cls):
         logfile = os.path.join('out', cls.__name__ + '.txt')
         BaseClass.setUpClass(logfile)
         Emulator.stop()
+        Device.uninstall_app(app_prefix="org.nativescript.", platform=Platform.ANDROID)
         Emulator.ensure_available()
         Folder.cleanup(cls.app_name)
 

tests/emulator/debug_android_tests.py

@@ -16,6 +16,7 @@
 from core.settings.settings import ANDROID_RUNTIME_PATH, EMULATOR_ID, EMULATOR_NAME
 from core.tns.replace_helper import ReplaceHelper
 from core.tns.tns import Tns
+from core.tns.tns_platform_type import Platform
 
 
 @flaky(max_runs=2)
@@ -25,6 +26,7 @@ def setUpClass(cls):
         logfile = os.path.join('out', cls.__name__ + '.txt')
         BaseClass.setUpClass(logfile)
         Emulator.stop()
+        Device.uninstall_app(app_prefix="org.nativescript.", platform=Platform.ANDROID)
         Emulator.ensure_available()
         Folder.cleanup(cls.app_name)
 

tests/emulator/run_android_ng_tests.py

@@ -41,6 +41,7 @@ def setUpClass(cls):
         logfile = os.path.join('out', cls.__name__ + '.txt')
         BaseClass.setUpClass(logfile)
         Emulator.stop()
+        Device.uninstall_app(app_prefix="org.nativescript.", platform=Platform.ANDROID)
         Emulator.ensure_available()
         Folder.cleanup(cls.app_name)
 

tests/emulator/run_android_tests.py

@@ -215,7 +215,7 @@ def test_300_tns_run_ios_just_launch_and_incremental_builds(self):
         """
 
         # Execute `tns run android --path TNS_App --justlaunch` and verify app looks correct on emulator
-        Tns.run_ios(attributes={'--path': self.app_name, '--emulator': '', '--justlaunch': ''}, timeout=120)
+        Tns.run_ios(attributes={'--path': self.app_name, '--emulator': '', '--justlaunch': ''}, timeout=180)
         Device.screen_match(device_name=SIMULATOR_NAME,
                             device_id=self.SIMULATOR_ID, expected_image='livesync-hello-world_home')