From 11ed5c7668b369b702a0f0c19d666003ccad29c1 Mon Sep 17 00:00:00 2001
From: Steve Kirkland-Walton <steve@bugsnag.com>
Date: Mon, 8 Jan 2024 22:22:40 +0000
Subject: [PATCH] Corrections [full ci]

---
 .buildkite/full/react-native-cli-pipeline.full.yml |  4 ++--
 scripts/react-native-cli-helper.js                 |  2 +-
 test/react-native-cli/features/steps/steps.rb      | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.buildkite/full/react-native-cli-pipeline.full.yml b/.buildkite/full/react-native-cli-pipeline.full.yml
index 3f42044007..b568006446 100644
--- a/.buildkite/full/react-native-cli-pipeline.full.yml
+++ b/.buildkite/full/react-native-cli-pipeline.full.yml
@@ -687,8 +687,8 @@ steps:
             service-ports: true
             command:
               - --app=build/rn0_63_expo_ejected.apk
-              - --app-activity=com.reactnative_expo_ejected.MainActivity
-              - --app-package=com.reactnative_expo_ejected
+              - --app-activity=com.reactnative.MainActivity
+              - --app-package=com.reactnative
               - --farm=bb
               - --device=ANDROID_10|ANDROID_11|ANDROID_12
               - --a11y-locator
diff --git a/scripts/react-native-cli-helper.js b/scripts/react-native-cli-helper.js
index 85547a01ca..f140806aa0 100644
--- a/scripts/react-native-cli-helper.js
+++ b/scripts/react-native-cli-helper.js
@@ -35,7 +35,7 @@ module.exports = {
       common.run(initCommand, true)
 
       // Use Perl to replace the Bugsnag start command to use a loaded configuration
-      const applicationPath = `android/app/src/main/java/com/${rnVersion}/`
+      const applicationPath = 'android/app/src/main/java/com/reactnative/'
       common.changeDir(`${destFixtures}/${rnVersion}/${applicationPath}`)
       const perlCommand = 'perl -pi -e "s/Bugsnag.start\\(this\\);/Bugsnag.start\\(this, createConfiguration\\(\\)\\);/g" MainApplication.java'
       common.run(perlCommand, true)
diff --git a/test/react-native-cli/features/steps/steps.rb b/test/react-native-cli/features/steps/steps.rb
index ac13e270aa..b6be2ac0d4 100644
--- a/test/react-native-cli/features/steps/steps.rb
+++ b/test/react-native-cli/features/steps/steps.rb
@@ -224,12 +224,12 @@ def parse_package_json
   step("the interactive file '#{filename}' contains '[Bugsnag start];'")
 end
 
-def get_android_main_application_path(current_fixture)
-  "android/app/src/main/java/com/#{current_fixture}/MainApplication.java"
+def get_android_main_application_path
+  "android/app/src/main/java/com/reactnative/MainApplication.java"
 end
 
 Then('the Android app contains the bugsnag initialisation code') do
-  filename = get_android_main_application_path current_fixture
+  filename = get_android_main_application_path
   step("the interactive file '#{filename}' contains 'import com.bugsnag.android.Bugsnag;'")
   step("the interactive file '#{filename}' contains 'Bugsnag.start(this);'")
 end
@@ -242,7 +242,7 @@ def get_android_main_application_path(current_fixture)
 end
 
 Then('the Android app does not contain the bugsnag initialisation code') do
-  filename = get_android_main_application_path current_fixture
+  filename = get_android_main_application_path
   step("the interactive file '#{filename}' does not contain 'import com.bugsnag.android.Bugsnag;'")
   step("the interactive file '#{filename}' does not contain 'Bugsnag.start(this);'")
 end
@@ -272,7 +272,7 @@ def get_android_main_application_path(current_fixture)
     When I input "git status --porcelain" interactively
     Then I wait for the interactive shell to output the following lines in stdout
       """
-      M #{get_android_main_application_path current_fixture}
+      M #{get_android_main_application_path}
       M index.js
       M ios/#{current_fixture}/AppDelegate.m
       """