fix: no more release branch of hello-world templates

Author: dtopuzov

core/tns/tns.py

@@ -11,7 +11,7 @@
 from core.osutils.os_type import OSType
 from core.osutils.process import Process
 from core.settings.settings import COMMAND_TIMEOUT, TNS_PATH, TAG, TEST_RUN_HOME, CURRENT_OS, \
-    SUT_FOLDER, PROVISIONING
+    SUT_FOLDER, PROVISIONING, BRANCH
 from core.tns.tns_platform_type import Platform
 from core.tns.tns_verifications import TnsAsserts
 from core.xcode.xcode import Xcode
@@ -178,7 +178,10 @@ def create_app(app_name, attributes={}, log_trace=False, assert_success=True, up
             attributes_to_string = "".join("{0} {1}".format(k, v))
         attr = {}
         if not any(s in attributes_to_string for s in ("--ng", "--template", "--tsc")):
-            attr = {"--template": SUT_FOLDER + os.path.sep + "tns-template-hello-world.tgz"}
+            if BRANCH is "master":
+                attr = {"--template": SUT_FOLDER + os.path.sep + "tns-template-hello-world.tgz"}
+            else:
+                attr = {"--template": "tns-template-hello-world"}
         attr.update(attributes)
         if app_name is None:
             output = Tns.run_tns_command("create ", attributes=attr, log_trace=log_trace)
@@ -202,7 +205,10 @@ def create_app_ts(app_name, attributes={}, log_trace=False, assert_success=True,
         :param update_modules: If true update modules (branch is respected).
         :return: output of `tns create command`
         """
-        attr = {"--template": SUT_FOLDER + os.path.sep + "tns-template-hello-world-ts.tgz"}
+        if BRANCH is "master":
+            attr = {"--template": SUT_FOLDER + os.path.sep + "tns-template-hello-world-ts.tgz"}
+        else:
+            attr = {"--template": "tns-template-hello-world-ts"}
         attributes.update(attr)
         output = Tns.create_app(app_name=app_name, attributes=attributes, log_trace=log_trace,
                                 assert_success=assert_success,
@@ -218,7 +224,10 @@ def create_app_ng(app_name, attributes={}, log_trace=False, assert_success=True,
             template = "tns-template-hello-world-ng@" + template_version
             attr = {"--template": template}
         else:
-            attr = {"--template": SUT_FOLDER + os.path.sep + "tns-template-hello-world-ng.tgz"}
+            if BRANCH is "master":
+                attr = {"--template": SUT_FOLDER + os.path.sep + "tns-template-hello-world-ng.tgz"}
+            else:
+                attr = {"--template": "tns-template-hello-world-ng"}
         attributes.update(attr)
         output = Tns.create_app(app_name=app_name, attributes=attributes, log_trace=log_trace,
                                 assert_success=assert_success,

runNose.py

@@ -18,7 +18,7 @@
 from core.settings.settings import OUTPUT_FOLDER, CURRENT_OS, OSType, \
     ANDROID_PATH, IOS_PATH, SUT_FOLDER, CLI_PATH, ANDROID_RUNTIME_PATH, \
     IOS_RUNTIME_PATH, TNS_MODULES_PATH, TNS_MODULES_WIDGETS_PATH, IOS_INSPECTOR_PATH, TNS_PLATFORM_DECLARATIONS_PATH, \
-    BRANCH, SIMULATOR_NAME, SIMULATOR_TYPE, SIMULATOR_SDK, TEST_RUN_HOME
+    SIMULATOR_NAME, SIMULATOR_TYPE, SIMULATOR_SDK, TEST_RUN_HOME
 from core.tns.tns import Tns
 from core.tns.tns_platform_type import Platform
 from core.xcode.xcode import Xcode
@@ -71,13 +71,13 @@ def get_repos():
     Clone template-hello-world repositories
     """
     Git.clone_repo(repo_url='[email protected]:NativeScript/template-hello-world.git',
-                   local_folder=os.path.join(SUT_FOLDER, 'template-hello-world'), branch=BRANCH)
+                   local_folder=os.path.join(SUT_FOLDER, 'template-hello-world'))
     Git.clone_repo(repo_url='[email protected]:NativeScript/template-hello-world-ts.git',
-                   local_folder=os.path.join(SUT_FOLDER, 'template-hello-world-ts'), branch=BRANCH)
+                   local_folder=os.path.join(SUT_FOLDER, 'template-hello-world-ts'))
 
     # `nativescript-angular` do not longer use release branch
     Git.clone_repo(repo_url='[email protected]:NativeScript/template-hello-world-ng.git',
-                   local_folder=os.path.join(SUT_FOLDER, 'template-hello-world-ng'), branch='master')
+                   local_folder=os.path.join(SUT_FOLDER, 'template-hello-world-ng'))
 
     Npm.pack(folder=os.path.join(SUT_FOLDER, 'template-hello-world'),
              output_file=os.path.join(SUT_FOLDER, 'tns-template-hello-world.tgz'))

tests/webpack/hello_world_ng_tests.py

@@ -154,7 +154,7 @@ def test_100_android_build_release_with_and_bundle_and_uglify(self):
         assert 450000 < bundle_js_size < 500000, "Actual bundle_js_size is " + str(bundle_js_size)
         assert 30 < starter_js_size < 50, "Actual starter_js_size is " + str(starter_js_size)
         assert 1300000 < vendor_js_size < 1350000, "Actual vendor_js_size is " + str(vendor_js_size)
-        assert 11000000 < apk_size < 11500000, "Actual app is " + str(apk_size)
+        assert 11500000 < apk_size < 12000000, "Actual app is " + str(apk_size)
 
         Helpers.run_android_via_adb(app_name=self.app_name, config="release", image=self.image_original)
 
@@ -172,7 +172,7 @@ def test_100_ios_build_release_with_and_bundle_and_uglify(self):
         starter_js_size = File.get_size(os.path.join(app_path, "app", "starter.js"))
         vendor_js_size = File.get_size(os.path.join(app_path, "app", "vendor.js"))
         ipa_size = File.get_size(ipa_path)
-        assert 3500 < bundle_js_size < 3750, "Actual bundle_js_size is " + str(bundle_js_size)
+        assert 450000 < bundle_js_size < 500000, "Actual bundle_js_size is " + str(bundle_js_size)
         assert 30 < starter_js_size < 50, "Actual starter_js_size is " + str(starter_js_size)
         assert 685000 < vendor_js_size < 695000, "Actual vendor_js_size is " + str(vendor_js_size)
         assert 12500000 < ipa_size < 13000000, "Actual app is " + str(ipa_size)
@@ -221,7 +221,7 @@ def test_110_ios_build_release_with_and_bundle_and_snapshot(self):
         assert 1300000 < bundle_js_size < 1350000, "Actual bundle_js_size is " + str(bundle_js_size)
         assert 30 < starter_js_size < 50, "Actual starter_js_size is " + str(starter_js_size)
         assert 3500000 < vendor_js_size < 3600000, "Actual vendor_js_size is " + str(vendor_js_size)
-        assert 12500000 < ipa_size < 13000000, "Actual app is " + str(ipa_size)
+        assert 13000000 < ipa_size < 13500000, "Actual app is " + str(ipa_size)
 
     def test_120_android_build_release_with_and_bundle_and_snapshot_and_uglify(self):
         # Workaround for https://github.com/NativeScript/nativescript-dev-webpack/issues/370
@@ -247,7 +247,7 @@ def test_120_android_build_release_with_and_bundle_and_snapshot_and_uglify(self)
         assert 450000 < bundle_js_size < 500000, "Actual bundle_js_size is " + str(bundle_js_size)
         assert 30 < starter_js_size < 50, "Actual starter_js_size is " + str(starter_js_size)
         assert vendor_js_size == 0, "Actual vendor_js_size is " + str(vendor_js_size)
-        assert 12500000 < apk_size < 13500000, "Actual app is " + str(apk_size)
+        assert 14000000 < apk_size < 15000000, "Actual app is " + str(apk_size)
 
         Helpers.run_android_via_adb(app_name=self.app_name, config="release", image=self.image_original)
 
@@ -265,8 +265,8 @@ def test_120_ios_build_release_with_and_bundle_and_snapshot_and_uglify(self):
         starter_js_size = File.get_size(os.path.join(app_path, "app", "starter.js"))
         vendor_js_size = File.get_size(os.path.join(app_path, "app", "vendor.js"))
         ipa_size = File.get_size(ipa_path)
-        assert 3500 < bundle_js_size < 3750
-        assert 30 < starter_js_size < 50
+        assert 450000 < bundle_js_size < 500000, "Actual bundle_js_size is " + str(bundle_js_size)
+        assert 30 < starter_js_size < 50, "Actual starter_js_size is " + str(starter_js_size)
         assert 680000 < vendor_js_size < 700000, "Actual vendor_js_size is " + str(vendor_js_size)
         assert 12500000 < ipa_size < 13000000, "Actual app is " + str(ipa_size)