Skip to content

Commit 92a7a32

Browse files
[CI] Align mock server initialization with mair repo (#1105)
1 parent 953afb9 commit 92a7a32

File tree

2 files changed

+12
-17
lines changed

2 files changed

+12
-17
lines changed

StreamChatSwiftUITestsAppTests/Robots/UserRobot.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ final class UserRobot: Robot {
1111
let composer = MessageListPage.Composer.self
1212
let contextMenu = MessageListPage.ContextMenu.self
1313
let debugAlert = MessageListPage.Alert.Debug.self
14-
private var server: StreamMockServer
15-
16-
init(_ server: StreamMockServer) {
17-
self.server = server
18-
}
1914

2015
@discardableResult
2116
func login() -> Self {

StreamChatSwiftUITestsAppTests/Tests/Base TestCase/StreamTestCase.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ let app = XCUIApplication()
88

99
class StreamTestCase: XCTestCase {
1010
let deviceRobot = DeviceRobot(app)
11-
var userRobot: UserRobot!
11+
let userRobot = UserRobot()
1212
var backendRobot: BackendRobot!
1313
var participantRobot: ParticipantRobot!
1414
var mockServer: StreamMockServer!
@@ -19,10 +19,6 @@ class StreamTestCase: XCTestCase {
1919
continueAfterFailure = false
2020

2121
try super.setUpWithError()
22-
mockServer = StreamMockServer(driverPort: "4568", testName: testName)
23-
backendRobot = BackendRobot(mockServer)
24-
participantRobot = ParticipantRobot(mockServer)
25-
userRobot = UserRobot(mockServer)
2622
alertHandler()
2723
backendHandler()
2824
app.launch()
@@ -31,7 +27,9 @@ class StreamTestCase: XCTestCase {
3127
override func tearDownWithError() throws {
3228
attachElementTree()
3329
app.terminate()
34-
mockServer.stop()
30+
if useMockServer {
31+
mockServer.stop()
32+
}
3533

3634
try super.tearDownWithError()
3735
app.launchArguments.removeAll()
@@ -41,13 +39,15 @@ class StreamTestCase: XCTestCase {
4139

4240
extension StreamTestCase {
4341
private func backendHandler() {
44-
app.setEnvironmentVariables([
45-
.websocketHost: "ws://localhost",
46-
.httpHost: "http://localhost",
47-
.port: StreamMockServer.port!
48-
])
49-
5042
if useMockServer {
43+
mockServer = StreamMockServer(driverPort: "4568", testName: testName)
44+
backendRobot = BackendRobot(mockServer)
45+
participantRobot = ParticipantRobot(mockServer)
46+
app.setEnvironmentVariables([
47+
.websocketHost: "ws://localhost",
48+
.httpHost: "http://localhost",
49+
.port: StreamMockServer.port!
50+
])
5151
app.setLaunchArguments(.useMockServer)
5252
} else if let switchApiKey {
5353
app.setEnvironmentVariables([.customApiKey: switchApiKey])

0 commit comments

Comments
 (0)