Skip to content

Commit 4f27e15

Browse files
Merge branch 'development' into improve-tests
2 parents 53c11d7 + 2a0d6a1 commit 4f27e15

52 files changed

Lines changed: 4631 additions & 3313 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/swiftui-auth.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ on:
66
paths:
77
- '.github/workflows/swiftui-auth.yml'
88
- 'samples/swiftui/**'
9+
- 'e2eTest/**'
910
- 'FirebaseSwiftUI/**'
1011
- 'Package.swift'
1112
pull_request:
1213
branches: [ main, development ]
1314
paths:
1415
- '.github/workflows/swiftui-auth.yml'
1516
- 'samples/swiftui/**'
17+
- 'e2eTest/**'
1618
- 'FirebaseSwiftUI/**'
1719
- 'Package.swift'
1820

@@ -96,7 +98,7 @@ jobs:
9698
- name: Start Firebase Emulator
9799
run: |
98100
sudo chown -R 501:20 "/Users/runner/.npm"
99-
cd ./samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample
101+
cd ./e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExample
100102
./start-firebase-emulator.sh
101103
102104
- name: Install xcpretty
@@ -107,7 +109,7 @@ jobs:
107109

108110
- name: Build for Integration Tests
109111
run: |
110-
cd ./samples/swiftui/FirebaseSwiftUIExample
112+
cd ./e2eTest/FirebaseSwiftUIExample
111113
set -o pipefail
112114
xcodebuild build-for-testing \
113115
-scheme FirebaseSwiftUIExampleTests \
@@ -116,7 +118,7 @@ jobs:
116118
117119
- name: Run Integration Tests
118120
run: |
119-
cd ./samples/swiftui/FirebaseSwiftUIExample
121+
cd ./e2eTest/FirebaseSwiftUIExample
120122
set -o pipefail
121123
xcodebuild test-without-building \
122124
-scheme FirebaseSwiftUIExampleTests \
@@ -129,14 +131,14 @@ jobs:
129131
uses: actions/upload-artifact@v4
130132
with:
131133
name: integration-tests-logs
132-
path: samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleTests.log
134+
path: e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExampleTests.log
133135

134136
- name: Upload test results
135137
if: failure()
136138
uses: actions/upload-artifact@v4
137139
with:
138140
name: integration-tests-results
139-
path: samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleTests.xcresult
141+
path: e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExampleTests.xcresult
140142

141143
# UI Tests (requires emulator)
142144
ui-tests:
@@ -162,7 +164,7 @@ jobs:
162164
- name: Start Firebase Emulator
163165
run: |
164166
sudo chown -R 501:20 "/Users/runner/.npm"
165-
cd ./samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample
167+
cd ./e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExample
166168
./start-firebase-emulator.sh
167169
168170
- name: Install xcpretty
@@ -173,7 +175,7 @@ jobs:
173175

174176
- name: Build for UI Tests
175177
run: |
176-
cd ./samples/swiftui/FirebaseSwiftUIExample
178+
cd ./e2eTest/FirebaseSwiftUIExample
177179
set -o pipefail
178180
xcodebuild build-for-testing \
179181
-scheme FirebaseSwiftUIExampleUITests \
@@ -182,7 +184,7 @@ jobs:
182184
183185
- name: Run UI Tests
184186
run: |
185-
cd ./samples/swiftui/FirebaseSwiftUIExample
187+
cd ./e2eTest/FirebaseSwiftUIExample
186188
set -o pipefail
187189
xcodebuild test-without-building \
188190
-scheme FirebaseSwiftUIExampleUITests \
@@ -197,11 +199,11 @@ jobs:
197199
uses: actions/upload-artifact@v4
198200
with:
199201
name: firebase-emulator-logs
200-
path: samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample/firebase-debug.log
202+
path: e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExample/firebase-debug.log
201203

202204
- name: Upload test results
203205
if: failure()
204206
uses: actions/upload-artifact@v4
205207
with:
206208
name: FirebaseSwiftUIExampleUITests.xcresult
207-
path: samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests.xcresult
209+
path: e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests.xcresult

0 commit comments

Comments
 (0)