Skip to content

Commit

Permalink
rename SmokeXCUITest to Smoktest1!
Browse files Browse the repository at this point in the history
  • Loading branch information
isabelrios committed Feb 6, 2024
1 parent 2c2d47a commit a329d4a
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/firefox-ios-build-contributor-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
python-version: [3.9]
xcode: ["13.1"]
run-config:
- { scheme: 'Fennec_Enterprise_XCUITests', destination: 'platform=iOS Simulator,OS=latest,name=iPhone 11', testplan: 'SmokeXCUITests' }
- { scheme: 'Fennec_Enterprise_XCUITests', destination: 'platform=iOS Simulator,OS=latest,name=iPhone 11', testplan: 'Smoketest1' }
name: Run UI Smoketests
steps:
- name: Checkout repository
Expand Down
36 changes: 11 additions & 25 deletions bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ stages:
# run_if: '{{getenv "BUILD_FOCUS_IOS" | eq "true"}}'
run_tests:
workflows:
- build_and_test_1_SmokeTest:
- build_and_test_1_SmokeTest1:
run_if: '{{getenv "BUILD_FIREFOX_IOS" | eq "true"}}'
- build_and_test_2_SmokeTest2:
run_if: '{{getenv "BUILD_FIREFOX_IOS" | eq "true"}}'
Expand Down Expand Up @@ -164,6 +164,14 @@ workflows:
- text: Build status using latest Rust-Component
- webhook_url: $WEBHOOK_SLACK_TOKEN_2

build_and_test_1_SmokeTest1:
envs:
- opts:
is_expand: false
SHARD: '1'
after_run:
- _build_and_test

build_and_test_2_SmokeTest2:
envs:
- opts:
Expand All @@ -172,28 +180,6 @@ workflows:
after_run:
- _build_and_test

build_and_test_1_SmokeTest:
before_run:
- 0_detect_standalone_build
- 1_git_clone_and_post_clone
- decision_to_run_UI_Tests
- firefox_pull_and_unzip_dependencies
steps:
- xcode-test-without-building@0:
run_if: '{{getenv "RUN_UI_TESTS" | eq "Run_UI_Tests"}}'
timeout: 1200
title: UI Smoketest
inputs:
- destination: platform=iOS Simulator,name=iPhone 15,OS=17.2
- xcodebuild_options: '"-derivedDataPath" "/Users/vagrant/git/DerivedData"
"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY="
"CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"'
- xctestrun: "Users/vagrant/git/DerivedData/Build/Products/Fennec_SmokeXCUITests_iphonesimulator17.2-arm64.xctestrun"
- [email protected]:
run_if: '{{getenv "RUN_UI_TESTS" | eq "Run_UI_Tests"}}'
inputs:
- pipeline_intermediate_files: '$BITRISE_XCRESULT_PATH:BITRISE_UITESTS_XCRESULT_PATH'

build_and_test_3_SmokeTest3:
envs:
- opts:
Expand All @@ -209,7 +195,7 @@ workflows:
SHARD: '4'
after_run:
- _build_and_test

_build_and_test:
before_run:
- 0_detect_standalone_build
Expand All @@ -220,7 +206,7 @@ workflows:
- xcode-test-without-building@0:
run_if: '{{getenv "RUN_UI_TESTS" | eq "Run_UI_Tests"}}'
timeout: 1200
title: UI Smoketest${SHARD}
title: UI Smoketest$SHARD
inputs:
- destination: platform=iOS Simulator,name=iPhone 15,OS=17.2
- xcodebuild_options: '"-derivedDataPath" "/Users/vagrant/git/DerivedData"
Expand Down
8 changes: 4 additions & 4 deletions firefox-ios/Client.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1435,7 +1435,7 @@
E1AF3563286DE5F800960045 /* FullFunctionalTestPlan.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = E1AF355B286DE5F600960045 /* FullFunctionalTestPlan.xctestplan */; };
E1AF3564286DE5F800960045 /* SyncIntegrationTestPlan.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = E1AF355C286DE5F600960045 /* SyncIntegrationTestPlan.xctestplan */; };
E1AF3565286DE5F800960045 /* UnitTest.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = E1AF355D286DE5F700960045 /* UnitTest.xctestplan */; };
E1AF3566286DE5F800960045 /* SmokeXCUITests.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = E1AF355E286DE5F700960045 /* SmokeXCUITests.xctestplan */; };
E1AF3566286DE5F800960045 /* Smoketest1.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = E1AF355E286DE5F700960045 /* Smoketest1.xctestplan */; };
E1AF3567286DE5F800960045 /* PerformanceTestPlan.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = E1AF355F286DE5F700960045 /* PerformanceTestPlan.xctestplan */; };
E1AFBAF9292EA0330065E35E /* SendToDeviceHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AFBAF8292EA0330065E35E /* SendToDeviceHelper.swift */; };
E1B04A9D28E20A8300670E54 /* InstructionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1B04A9C28E20A8300670E54 /* InstructionsView.swift */; };
Expand Down Expand Up @@ -7271,7 +7271,7 @@
E1AF355B286DE5F600960045 /* FullFunctionalTestPlan.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = FullFunctionalTestPlan.xctestplan; sourceTree = "<group>"; };
E1AF355C286DE5F600960045 /* SyncIntegrationTestPlan.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SyncIntegrationTestPlan.xctestplan; sourceTree = "<group>"; };
E1AF355D286DE5F700960045 /* UnitTest.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = UnitTest.xctestplan; sourceTree = "<group>"; };
E1AF355E286DE5F700960045 /* SmokeXCUITests.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SmokeXCUITests.xctestplan; sourceTree = "<group>"; };
E1AF355E286DE5F700960045 /* Smoketest1.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Smoketest1.xctestplan; sourceTree = "<group>"; };
E1AF355F286DE5F700960045 /* PerformanceTestPlan.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PerformanceTestPlan.xctestplan; sourceTree = "<group>"; };
E1AFBAF8292EA0330065E35E /* SendToDeviceHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendToDeviceHelper.swift; sourceTree = "<group>"; };
E1B04A9C28E20A8300670E54 /* InstructionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstructionsView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -10821,7 +10821,7 @@
E1AF355A286DE5F600960045 /* Smoketest2.xctestplan */,
E1AF3558286DE5F600960045 /* Smoketest3.xctestplan */,
E1AF3559286DE5F600960045 /* Smoketest4.xctestplan */,
E1AF355E286DE5F700960045 /* SmokeXCUITests.xctestplan */,
E1AF355E286DE5F700960045 /* Smoketest1.xctestplan */,
3B43E3D11D95C48D00BBA9DB /* StoragePerfTests */,
2FCAE22A1ABB51F800877008 /* StorageTests */,
E1AF355C286DE5F600960045 /* SyncIntegrationTestPlan.xctestplan */,
Expand Down Expand Up @@ -12657,7 +12657,7 @@
74821FFE1DB6D3AC00EEEA72 /* MailSchemes.plist in Resources */,
FA9294011D6584A200AC8D33 /* QRCode.xcassets in Resources */,
D308EE561CBF0BF5006843F2 /* CertError.css in Resources */,
E1AF3566286DE5F800960045 /* SmokeXCUITests.xctestplan in Resources */,
E1AF3566286DE5F800960045 /* Smoketest1.xctestplan in Resources */,
E1AF3561286DE5F800960045 /* Smoketest4.xctestplan in Resources */,
8A2B1A5D28216C4D0061216B /* Debug.xcconfig in Resources */,
0BA1E00E1B03FB0B007675AF /* NetError.html in Resources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@
default = "YES">
</TestPlanReference>
<TestPlanReference
reference = "container:firefox-ios-tests/Tests/SmokeXCUITests.xctestplan">
reference = "container:firefox-ios-tests/Tests/Smoketest1.xctestplan">
</TestPlanReference>
<TestPlanReference
reference = "container:firefox-ios-tests/Tests/Smoketest4.xctestplan">
Expand Down

0 comments on commit a329d4a

Please sign in to comment.