Skip to content

Commit

Permalink
Merge pull request #1658 from bugsnag/tms/namespace-casin
Browse files Browse the repository at this point in the history
Make test fixture bundle id all lower case
  • Loading branch information
twometresteve authored Jun 7, 2024
2 parents 39c1a64 + acab3a0 commit 2773366
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 17 deletions.
6 changes: 0 additions & 6 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,6 @@ steps:
# BrowserStack
#
- label: ':browserstack: iOS 17 E2E tests batch 1'
# TODO Skipped pending PLAT-12209
skip: Skipped pending PLAT-12209
depends_on:
- cocoa_fixture
timeout_in_minutes: 60
Expand Down Expand Up @@ -372,8 +370,6 @@ steps:
limit: 2

- label: ':browserstack: iOS 17 E2E tests batch 2'
# TODO Skipped pending PLAT-12209
skip: Skipped pending PLAT-12209
depends_on:
- cocoa_fixture
timeout_in_minutes: 60
Expand Down Expand Up @@ -405,8 +401,6 @@ steps:

# PLAT-11155: App hang tests run on BrowserStack (Appium 1.x) for now
- label: ':browserstack: iOS 17 app hang tests'
# TODO Skipped pending PLAT-12209
skip: Skipped pending PLAT-12209
depends_on:
- cocoa_fixture
timeout_in_minutes: 30
Expand Down
2 changes: 1 addition & 1 deletion features/app_and_device_attributes.feature
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Feature: App and Device attributes present
And the error payload field "events.0.app.bundleVersion" is not null
#And the error payload field "events.0.app.dsymUUIDs" is a non-empty array # Fails, == nil
And the error payload field "events.0.app.id" equals the platform-dependent string:
| ios | com.bugsnag.fixtures.iOSTestApp |
| ios | com.bugsnag.fixtures.cocoa |
| macos | com.bugsnag.fixtures.macOSTestApp |
And the error payload field "events.0.app.isLaunching" is true
And the error payload field "events.0.app.releaseStage" equals "development"
Expand Down
2 changes: 1 addition & 1 deletion features/app_hangs.feature
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Feature: App hangs
And the error payload field "events.0.app.bundleVersion" is not null
#And the error payload field "events.0.app.dsymUUIDs" is a non-empty array # Fails, == nil
And the error payload field "events.0.app.id" equals the platform-dependent string:
| ios | com.bugsnag.fixtures.iOSTestApp |
| ios | com.bugsnag.fixtures.cocoa |
| macos | com.bugsnag.fixtures.macOSTestApp |
And the error payload field "events.0.app.isLaunching" is true
And the error payload field "events.0.app.releaseStage" equals "development"
Expand Down
4 changes: 2 additions & 2 deletions features/barebone_tests.feature
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Feature: Barebone tests
And the event "app.binaryArch" matches "(arm|x86)"
And the event "app.bundleVersion" equals "12301"
And the event "app.id" equals the platform-dependent string:
| ios | com.bugsnag.fixtures.iOSTestApp |
| ios | com.bugsnag.fixtures.cocoa |
| macos | com.bugsnag.fixtures.macOSTestApp |
| watchos | com.bugsnag.fixtures.watchOSTestApp.watchkitapp.watchkitextension |
And the event "app.inForeground" is true
Expand Down Expand Up @@ -271,7 +271,7 @@ Feature: Barebone tests
And the event "app.bundleVersion" equals "321.123"
And the event "app.dsymUUIDs" is not null
And the event "app.id" equals the platform-dependent string:
| ios | com.bugsnag.fixtures.iOSTestApp |
| ios | com.bugsnag.fixtures.cocoa |
| macos | com.bugsnag.fixtures.macOSTestApp |
And the event "app.inForeground" is true
And the event "app.isLaunching" is true
Expand Down
4 changes: 2 additions & 2 deletions features/fixtures/ios/iOSTestApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,7 @@
LINKER_DISPLAYS_MANGLED_NAMES = NO;
OTHER_SWIFT_FLAGS = "-Onone";
PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.bugsnag.fixtures.iOSTestApp;
PRODUCT_BUNDLE_IDENTIFIER = com.bugsnag.fixtures.cocoa;
PRODUCT_NAME = "$(TARGET_NAME)";
STRIP_INSTALLED_PRODUCT = NO;
STRIP_STYLE = all;
Expand Down Expand Up @@ -1174,7 +1174,7 @@
MTL_ENABLE_DEBUG_INFO = YES;
OTHER_SWIFT_FLAGS = "-Onone";
PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.bugsnag.fixtures.iOSTestApp;
PRODUCT_BUNDLE_IDENTIFIER = com.bugsnag.fixtures.cocoa;
PRODUCT_NAME = "$(TARGET_NAME)";
STRIP_INSTALLED_PRODUCT = NO;
STRIP_STYLE = all;
Expand Down
2 changes: 1 addition & 1 deletion features/out_of_memory.feature
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Feature: Out of memory errors
And the event "metaData.device.timezone" is not null
And the event "metaData.device.simulator" is false
And the event "metaData.device.wordSize" is not null
And the event "app.id" equals "com.bugsnag.fixtures.iOSTestApp"
And the event "app.id" equals "com.bugsnag.fixtures.cocoa"
And the event "metaData.app.name" equals "iOSTestApp"
And the event "app.inForeground" is true
And the event "app.type" equals "iOS"
Expand Down
2 changes: 1 addition & 1 deletion features/scripts/foreground_ios_app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Bring a previously running app to the foreground

xcrun simctl launch "$iOS_Simulator" com.bugsnag.fixtures.iOSTestApp \
xcrun simctl launch "$iOS_Simulator" com.bugsnag.fixtures.cocoa \
"EVENT_TYPE=AutoCaptureRunScenario" \
"BUGSNAG_API_KEY=$BUGSNAG_API_KEY" \
"MOCK_API_PATH=http://localhost:$MOCK_API_PORT"
2 changes: 1 addition & 1 deletion features/steps/app_steps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
wait_for_true('the app is not running') do
case Maze::Helper.get_current_platform
when 'ios'
Maze.driver.app_state('com.bugsnag.fixtures.iOSTestApp') == :not_running
Maze.driver.app_state('com.bugsnag.fixtures.cocoa') == :not_running
when 'macos'
`lsappinfo info -only pid -app com.bugsnag.fixtures.macOSTestApp`.empty?
else
Expand Down
4 changes: 2 additions & 2 deletions features/support/env.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

if Maze.config.os == 'ios' && Maze.config.farm == :local
# Recent Appium versions don't always uninstall the old version of the app ¯\_(ツ)_/¯
system('ideviceinstaller --uninstall com.bugsnag.fixtures.iOSTestApp')
system('ideviceinstaller --uninstall com.bugsnag.fixtures.cocoa')
end

if Maze.config.os == 'ios'
Expand Down Expand Up @@ -159,7 +159,7 @@ def skip_between(os, version_lo, version_hi)
end
when 'ios'
begin
data = Maze.driver.pull_file '@com.bugsnag.fixtures.iOSTestApp/Documents/kscrash.log'
data = Maze.driver.pull_file '@com.bugsnag.fixtures.cocoa/Documents/kscrash.log'
File.open(File.join(path, 'kscrash.log'), 'wb') { |file| file << data }
rescue StandardError
puts "Maze.driver.pull_file failed: #{$ERROR_INFO}"
Expand Down

0 comments on commit 2773366

Please sign in to comment.