Skip to content

Commit 813f07f

Browse files
committed
fix assert for webpack messages, we run with webpack by default now
1 parent 6cfb050 commit 813f07f

1 file changed

Lines changed: 7 additions & 14 deletions

File tree

core/tns/tns.py

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -556,16 +556,12 @@ def build_android(attributes={}, assert_success=True, tns_path=None, log_trace=F
556556
apk_path = apk_path.replace("\"", "") # Handle projects with space
557557
assert File.exists(apk_path), "Apk file does not exist at " + apk_path
558558

559-
# Verify final package contains right modules (or verify bundle when it is used)
560-
if "--bundle" not in attributes.keys():
561-
assert "Webpack compilation complete" not in output
562-
else:
563-
assert "Webpack compilation complete" in output
564-
assert File.exists(os.path.join(app_name, TnsAsserts.PLATFORM_ANDROID_APP_PATH, "bundle.js"))
565-
assert File.exists(os.path.join(app_name, TnsAsserts.PLATFORM_ANDROID_APP_PATH, "package.json"))
566-
assert File.exists(os.path.join(app_name, TnsAsserts.PLATFORM_ANDROID_APP_PATH, "starter.js"))
567-
assert File.exists(os.path.join(app_name, TnsAsserts.PLATFORM_ANDROID_APP_PATH, "vendor.js"))
568-
assert not Folder.exists(os.path.join(app_name, TnsAsserts.PLATFORM_ANDROID_NPM_MODULES_PATH))
559+
assert "Webpack compilation complete" in output
560+
assert File.exists(os.path.join(app_name, TnsAsserts.PLATFORM_ANDROID_APP_PATH, "bundle.js"))
561+
assert File.exists(os.path.join(app_name, TnsAsserts.PLATFORM_ANDROID_APP_PATH, "package.json"))
562+
assert File.exists(os.path.join(app_name, TnsAsserts.PLATFORM_ANDROID_APP_PATH, "starter.js"))
563+
assert File.exists(os.path.join(app_name, TnsAsserts.PLATFORM_ANDROID_APP_PATH, "vendor.js"))
564+
assert not Folder.exists(os.path.join(app_name, TnsAsserts.PLATFORM_ANDROID_NPM_MODULES_PATH))
569565

570566
return output
571567

@@ -653,10 +649,7 @@ def build_ios(attributes={}, assert_success=True, tns_path=None, log_trace=False
653649
assert id1 or id2 in xcode_project, "TeamID not passed to Xcode!"
654650

655651
# Verify final package contains right modules (or verify bundle when it is used)
656-
if "--bundle" not in attributes.keys():
657-
assert "Webpack compilation complete" not in output
658-
else:
659-
assert "Webpack compilation complete" in output
652+
assert "Webpack compilation complete" in output
660653

661654
return output
662655

0 commit comments

Comments
 (0)