Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed SwiftUI UI tests not finding the right state to tap if not already displayed on screen.

Browse source
This commit is contained in:
Stefan Ceriu 2021-12-16 16:29:07 +02:00 committed by Stefan Ceriu
parent 3fbb74bf11
commit b9efd87ef7
9 changed files with 54 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
View file

@ -20,12 +20,12 @@ import Foundation
@available(iOS 14.0, *)
enum MockAppScreens {
static let appScreens: [MockScreenState.Type] = [
MockTemplateUserProfileScreenState.self,
MockTemplateRoomListScreenState.self,
MockTemplateRoomChatScreenState.self,
MockUserSuggestionScreenState.self,
MockPollEditFormScreenState.self,
MockPollTimelineScreenState.self
MockPollTimelineScreenState.self,
MockTemplateUserProfileScreenState.self,
MockTemplateRoomListScreenState.self,
MockTemplateRoomChatScreenState.self
]
}

33
RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift
View file

@ -22,7 +22,6 @@ protocol MockScreenState {
static var screenStates: [MockScreenState] { get }
var screenType: Any.Type { get }
var screenView: ([Any], AnyView) { get }
var stateTitle: String { get }
}
@available(iOS 14.0, *)
@ -33,44 +32,32 @@ extension MockScreenState {
let depsAndViews = screenStates.map(\.screenView)
let deps = depsAndViews.map({ $0.0 })
let views = depsAndViews.map({ $0.1 })
let stateTitles = screenStates.map(\.stateTitle)
let fullScreenTitles = screenStates.map(\.fullScreenTitle)
let titles = screenStates.map(\.title)
var states = [ScreenStateInfo]()
for i in 0..<deps.count {
let dep = deps[i]
let view = views[i]
let stateTitle = stateTitles[i]
let stateKey = screenStateKeys[i]
let fullScreenTitle = fullScreenTitles[i]
states.append(ScreenStateInfo(dependencies: dep, view: view, stateTitle: stateTitle, fullScreenTitle:fullScreenTitle, stateKey: stateKey))
let screenTitle = titles[i]
states.append(ScreenStateInfo(dependencies: dep, view: view, screenTitle: screenTitle))
}
return StateRenderer(states: states)
}
/// A unique key to identify each screen state.
static var screenStateKeys: [String] {
return screenStates.enumerated().map { (index, state) in
state.screenName + String(index)
}
/// All available screen state keys
static var screenNames: [String] {
screenStates.map { $0.title }
}
/// A title to represent the screen and it's screen state
var screenName: String {
"\(String(describing: screenType.self))"
var title: String {
"\(simpleTypeName(screenType.self)): \(simpleTypeName(self))"
}
/// A title to represent this screen state
var stateTitle: String {
String(describing: self)
private func simpleTypeName(_ type: Any) -> String {
String(describing: type).components(separatedBy: .punctuationCharacters).filter { $0.count > 0}.last!
}
/// A title to represent the screen and it's screen state
var fullScreenTitle: String {
"\(screenName): \(stateTitle)"
}
}
@available(iOS 14.0, *)

3
RiotSwiftUI/Modules/Common/Mock/ScreenList.swift
View file

@ -33,8 +33,7 @@ struct ScreenList: View {
ForEach(0..<allStates.count) { i in
let state = allStates[i]
NavigationLink(destination: state.view) {
Text(state.fullScreenTitle)
.accessibilityIdentifier(state.stateKey)
Text(state.screenTitle)
}
}
}

4
RiotSwiftUI/Modules/Common/Mock/ScreenStateInfo.swift
View file

@ -21,7 +21,5 @@ import SwiftUI
struct ScreenStateInfo {
var dependencies: [Any]
var view: AnyView
var stateTitle: String
var fullScreenTitle: String
var stateKey: String
var screenTitle: String
}

2
RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift
View file

@ -39,7 +39,7 @@ class StateRenderer {
ForEach(0..<states.count) { i in
let state = self.states[i]
Self.wrapWithNavigation(addNavigation, view: state.view)
.previewDisplayName(state.stateTitle)
.previewDisplayName(state.screenTitle)
}
}
}

11
RiotSwiftUI/Modules/Common/Test/UI/MockScreenTest.swift
View file

@ -45,9 +45,10 @@ class MockScreenTest: XCTestCase {
guard let screenType = screenType else {
return testSuite
}
// Create a test case for each screen state
screenType.screenStates.enumerated().forEach { index, screenState in
let key = screenType.screenStateKeys[index]
let key = screenType.screenNames[index]
addTestFor(screenState: screenState, screenStateKey: key, toTestSuite: testSuite)
}
return testSuite
@ -64,12 +65,8 @@ class MockScreenTest: XCTestCase {
// For every test case launch the app and go to the relevant screen
continueAfterFailure = false
app.launch()
goToScreen()
}
private func goToScreen() {
guard let screenKey = screenStateKey else { fatalError("no screen") }
let link = app.buttons[screenKey]
link.tap()
app.goToScreenWithIdentifier(screenKey)
}
}

30
RiotSwiftUI/Modules/Common/Test/UI/XCUIApplication+Riot.swift Normal file
View file

@ -0,0 +1,30 @@
//
// Copyright 2021 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
import Foundation
import XCTest
extension XCUIApplication {
func goToScreenWithIdentifier(_ identifier: String) {
let button = self.buttons[identifier]
while !button.isHittable {
self.tables.firstMatch.swipeUp()
}
button.tap()
}
}

2
RiotSwiftUI/Modules/Room/PollEditForm/Test/UI/PollEditFormUITests.swift
View file

@ -29,7 +29,7 @@ class PollEditFormUITests: XCTestCase {
app = XCUIApplication()
app.launch()
app.buttons[MockPollEditFormScreenState.screenStateKeys.first!].tap()
app.goToScreenWithIdentifier(MockPollEditFormScreenState.standard.title)
}
func testInitialStateComponents() {

4
RiotSwiftUI/Modules/Room/PollTimeline/Test/UI/PollTimelineUITests.swift
View file

@ -32,7 +32,7 @@ class PollTimelineUITests: XCTestCase {
}
func testOpenPoll() {
app.buttons[MockPollTimelineScreenState.screenStateKeys.first!].tap()
app.goToScreenWithIdentifier(MockPollTimelineScreenState.open.title)
XCTAssert(app.staticTexts["Question"].exists)
XCTAssert(app.staticTexts["20 votes cast"].exists)
@ -70,7 +70,7 @@ class PollTimelineUITests: XCTestCase {
}
func testClosedPoll() {
app.buttons[MockPollTimelineScreenState.screenStateKeys.last!].tap()
app.goToScreenWithIdentifier(MockPollTimelineScreenState.closed.title)
XCTAssert(app.staticTexts["Question"].exists)
XCTAssert(app.staticTexts["Final results based on 20 votes"].exists)