Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add UITest for creating a custom list Part 1 #6148

Merged
merged 1 commit into from
Apr 25, 2024
Merged

Add UITest for creating a custom list Part 1 #6148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions ios/MullvadVPN.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,8 @@
A988A3E22AFE54AC0008D2C7 /* AccountExpiry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A6F2FA62AFBB9AE006D0856 /* AccountExpiry.swift */; };
A988DF272ADE86ED00D807EF /* WireGuardObfuscationSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = A988DF252ADE86ED00D807EF /* WireGuardObfuscationSettings.swift */; };
A988DF2A2ADE880300D807EF /* TunnelSettingsV3.swift in Sources */ = {isa = PBXBuildFile; fileRef = A988DF282ADE880300D807EF /* TunnelSettingsV3.swift */; };
A998DA812BD147AD001D61A2 /* ListCustomListsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = A998DA802BD147AD001D61A2 /* ListCustomListsPage.swift */; };
A998DA832BD2B055001D61A2 /* EditCustomListLocationsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = A998DA822BD2B055001D61A2 /* EditCustomListLocationsPage.swift */; };
A99E5EE02B7628150033F241 /* ProblemReportViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A99E5EDF2B7628150033F241 /* ProblemReportViewModel.swift */; };
A99E5EE22B762ED30033F241 /* ProblemReportViewController+ViewManagement.swift in Sources */ = {isa = PBXBuildFile; fileRef = A99E5EE12B762ED30033F241 /* ProblemReportViewController+ViewManagement.swift */; };
A9A1DE792AD5708E0073F689 /* TransportStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9A1DE782AD5708E0073F689 /* TransportStrategy.swift */; };
Expand Down Expand Up @@ -808,6 +810,8 @@
A9B6AC1B2ADEA3AD00F7802A /* MemoryCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58BDEB9C2A98F69E00F578F2 /* MemoryCache.swift */; };
A9BA08312BA32FA9005A7A2D /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = A92962582B1F4FDB00DFB93B /* PrivacyInfo.xcprivacy */; };
A9BA08322BA32FB6005A7A2D /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = A92962582B1F4FDB00DFB93B /* PrivacyInfo.xcprivacy */; };
A9BFAFFF2BD004ED00F2BCA1 /* CustomListsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9BFAFFE2BD004ED00F2BCA1 /* CustomListsTests.swift */; };
A9BFB0012BD00B7F00F2BCA1 /* CustomListPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9BFB0002BD00B7F00F2BCA1 /* CustomListPage.swift */; };
A9C342C12ACC37E30045F00E /* TunnelStatusBlockObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9E0317D2ACC32920095D843 /* TunnelStatusBlockObserver.swift */; };
A9C342C32ACC3EE90045F00E /* RelayCacheTracker+Stubs.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9C342C22ACC3EE90045F00E /* RelayCacheTracker+Stubs.swift */; };
A9C342C52ACC42130045F00E /* ServerRelaysResponse+Stubs.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9C342C42ACC42130045F00E /* ServerRelaysResponse+Stubs.swift */; };
Expand Down Expand Up @@ -1966,13 +1970,17 @@
A98502022B627B120061901E /* LocalNetworkProbe.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalNetworkProbe.swift; sourceTree = "<group>"; };
A988DF252ADE86ED00D807EF /* WireGuardObfuscationSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireGuardObfuscationSettings.swift; sourceTree = "<group>"; };
A988DF282ADE880300D807EF /* TunnelSettingsV3.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelSettingsV3.swift; sourceTree = "<group>"; };
A998DA802BD147AD001D61A2 /* ListCustomListsPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListCustomListsPage.swift; sourceTree = "<group>"; };
A998DA822BD2B055001D61A2 /* EditCustomListLocationsPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditCustomListLocationsPage.swift; sourceTree = "<group>"; };
A99E5EDF2B7628150033F241 /* ProblemReportViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProblemReportViewModel.swift; sourceTree = "<group>"; };
A99E5EE12B762ED30033F241 /* ProblemReportViewController+ViewManagement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ProblemReportViewController+ViewManagement.swift"; sourceTree = "<group>"; };
A9A1DE782AD5708E0073F689 /* TransportStrategy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransportStrategy.swift; sourceTree = "<group>"; };
A9A5F9A12ACB003D0083449F /* TunnelManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelManagerTests.swift; sourceTree = "<group>"; };
A9A8A8EA2A262AB30086D569 /* FileCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileCache.swift; sourceTree = "<group>"; };
A9B6AC172ADE8F4300F7802A /* MigrationManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrationManagerTests.swift; sourceTree = "<group>"; };
A9B6AC192ADE8FBB00F7802A /* InMemorySettingsStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InMemorySettingsStore.swift; sourceTree = "<group>"; };
A9BFAFFE2BD004ED00F2BCA1 /* CustomListsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomListsTests.swift; sourceTree = "<group>"; };
A9BFB0002BD00B7F00F2BCA1 /* CustomListPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomListPage.swift; sourceTree = "<group>"; };
A9C342C22ACC3EE90045F00E /* RelayCacheTracker+Stubs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RelayCacheTracker+Stubs.swift"; sourceTree = "<group>"; };
A9C342C42ACC42130045F00E /* ServerRelaysResponse+Stubs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ServerRelaysResponse+Stubs.swift"; sourceTree = "<group>"; };
A9CF11FC2A0518E7001D9565 /* AddressCacheTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressCacheTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3623,19 +3631,20 @@
852969262B4D9C1F007EAD4C /* MullvadVPNUITests */ = {
isa = PBXGroup;
children = (
85B267602B849ADB0098E3CD /* mullvad-api.h */,
852969272B4D9C1F007EAD4C /* AccountTests.swift */,
8556EB532B9A1D7100D26DD4 /* BridgingHeader.h */,
85557B112B594FC900795FE1 /* ConnectivityTests.swift */,
A9BFAFFE2BD004ED00F2BCA1 /* CustomListsTests.swift */,
852969372B4ED20E007EAD4C /* Info.plist */,
85B267602B849ADB0098E3CD /* mullvad-api.h */,
85557B0C2B591B0F00795FE1 /* Networking */,
852969312B4E9220007EAD4C /* Pages */,
850201DA2B503D7700EF8C96 /* RelayTests.swift */,
85D039972BA4711800940E7F /* SettingsMigrationTests.swift */,
85C7A2E82B89024B00035D5A /* SettingsTests.swift */,
8518F6392B601910009EB113 /* Test base classes */,
85557B152B5ABBBE00795FE1 /* XCUIElementQuery+Extensions.swift */,
85A42B852BB1D627007BABF7 /* XCUIElement+Extensions.swift */,
85C7A2E82B89024B00035D5A /* SettingsTests.swift */,
85D039972BA4711800940E7F /* SettingsMigrationTests.swift */,
85557B152B5ABBBE00795FE1 /* XCUIElementQuery+Extensions.swift */,
);
path = MullvadVPNUITests;
sourceTree = "<group>";
Expand All @@ -3647,9 +3656,12 @@
85557B1F2B5FBBD700795FE1 /* AccountPage.swift */,
8529693B2B4F0257007EAD4C /* Alert.swift */,
8587A05C2B84D43100152938 /* ChangeLogAlert.swift */,
852A26452BA9C9CB006EB9C8 /* DNSSettingsPage.swift */,
A9BFB0002BD00B7F00F2BCA1 /* CustomListPage.swift */,
85A42B872BB44D31007BABF7 /* DeviceManagementPage.swift */,
852A26452BA9C9CB006EB9C8 /* DNSSettingsPage.swift */,
A998DA822BD2B055001D61A2 /* EditCustomListLocationsPage.swift */,
85557B1D2B5FB8C700795FE1 /* HeaderBar.swift */,
A998DA802BD147AD001D61A2 /* ListCustomListsPage.swift */,
852969342B4E9270007EAD4C /* LoginPage.swift */,
85139B2C2B84B4A700734217 /* OutOfTimePage.swift */,
852969322B4E9232007EAD4C /* Page.swift */,
Expand Down Expand Up @@ -5639,6 +5651,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
A9BFB0012BD00B7F00F2BCA1 /* CustomListPage.swift in Sources */,
8556EB522B9A1C6900D26DD4 /* MullvadApi.swift in Sources */,
85EC620C2B838D10005AFFB5 /* MullvadAPIWrapper.swift in Sources */,
A9DF789D2B7D1E8B0094E4AD /* LoggedInWithTimeUITestCase.swift in Sources */,
Expand All @@ -5655,7 +5668,9 @@
8590896F2B61763B003AF5F5 /* LoggedOutUITestCase.swift in Sources */,
85557B202B5FBBD700795FE1 /* AccountPage.swift in Sources */,
852969352B4E9270007EAD4C /* LoginPage.swift in Sources */,
A998DA832BD2B055001D61A2 /* EditCustomListLocationsPage.swift in Sources */,
8556EB562B9B0AC500D26DD4 /* RevokedDevicePage.swift in Sources */,
A9BFAFFF2BD004ED00F2BCA1 /* CustomListsTests.swift in Sources */,
85557B102B59215F00795FE1 /* FirewallRule.swift in Sources */,
85557B0E2B591B2600795FE1 /* FirewallAPIClient.swift in Sources */,
852969282B4D9C1F007EAD4C /* AccountTests.swift in Sources */,
Expand All @@ -5668,6 +5683,7 @@
8532E6872B8CCED600ACECD1 /* ProblemReportSubmittedPage.swift in Sources */,
85FB5A0C2B6903990015DCED /* WelcomePage.swift in Sources */,
852A26462BA9C9CB006EB9C8 /* DNSSettingsPage.swift in Sources */,
A998DA812BD147AD001D61A2 /* ListCustomListsPage.swift in Sources */,
850201DF2B5040A500EF8C96 /* TunnelControlPage.swift in Sources */,
8542CE242B95F7B9006FCA14 /* VPNSettingsPage.swift in Sources */,
85557B1E2B5FB8C700795FE1 /* HeaderBar.swift in Sources */,
Expand Down
19 changes: 18 additions & 1 deletion ios/MullvadVPN/Classes/AccessbilityIdentifier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,21 @@ public enum AccessibilityIdentifier: String {
case restorePurchasesButton
case secureConnectionButton
case selectLocationButton
case closeSelectLocationButton
case settingsButton
case startUsingTheAppButton
case problemReportAppLogsButton
case problemReportSendButton
case relayStatusCollapseButton
case settingsDoneButton
case openCustomListsMenuButton
case addNewCustomListButton
case editCustomListButton
case saveCreateCustomListButton
case confirmDeleteCustomListButton
case cancelDeleteCustomListButton
case customListLocationCheckmarkButton
case listCustomListDoneButton

// Cells
case deviceCell
Expand All @@ -60,6 +69,9 @@ public enum AccessibilityIdentifier: String {
case wireGuardObfuscationCell
case udpOverTCPPortCell
case quantumResistantTunnelCell
case customListEditNameFieldCell
case customListEditAddOrEditLocationCell
case customListEditDeleteListCell

// Labels
case accountPagePaidUntilLabel
Expand All @@ -71,7 +83,6 @@ public enum AccessibilityIdentifier: String {

// Views
case accountView
case addLocationsView
case alertContainerView
case alertTitle
case changeLogAlert
Expand All @@ -91,6 +102,12 @@ public enum AccessibilityIdentifier: String {
case welcomeView
case deleteAccountView
case settingsContainerView
case newCustomListView
case customListEditTableView
case listCustomListsView
case listCustomListsTableView
case editCustomListEditLocationsView
case editCustomListEditLocationsTableView

// Other UI elements
case connectionPanelInAddressRow
Expand Down
3 changes: 2 additions & 1 deletion ios/MullvadVPN/Coordinators/CustomLists/AddLocationsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class AddLocationsViewController: UIViewController {
tableView.separatorInset = .zero
tableView.rowHeight = 56
tableView.indicatorStyle = .white
tableView.accessibilityIdentifier = .addLocationsView
tableView.accessibilityIdentifier = .editCustomListEditLocationsTableView
return tableView
}()

Expand All @@ -46,6 +46,7 @@ class AddLocationsViewController: UIViewController {

override func viewDidLoad() {
super.viewDidLoad()
view.accessibilityIdentifier = .editCustomListEditLocationsView
tableView.backgroundColor = view.backgroundColor
view.backgroundColor = .secondaryColor
addConstraints()
Expand Down
3 changes: 3 additions & 0 deletions ios/MullvadVPN/Coordinators/CustomLists/CustomListCellConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ struct CustomListCellConfiguration {
contentConfiguration.maxLength = 30
contentConfiguration.editingEvents.onChange = subject.bindTextAction(to: \.name)

cell.accessibilityIdentifier = AccessibilityIdentifier.customListEditNameFieldCell
cell.contentConfiguration = contentConfiguration
}

Expand All @@ -86,6 +87,7 @@ struct CustomListCellConfiguration {

contentConfiguration.text = itemIdentifier.text
cell.contentConfiguration = contentConfiguration
cell.accessibilityIdentifier = AccessibilityIdentifier.customListEditAddOrEditLocationCell

if let cell = cell as? CustomCellDisclosureHandling {
cell.disclosureType = .chevron
Expand All @@ -101,6 +103,7 @@ struct CustomListCellConfiguration {
onDelete?()
}

cell.accessibilityIdentifier = AccessibilityIdentifier.customListEditDeleteListCell
cell.contentConfiguration = contentConfiguration
}
}
7 changes: 6 additions & 1 deletion ios/MullvadVPN/Coordinators/CustomLists/CustomListViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class CustomListViewController: UIViewController {
}
)
barButtonItem.style = .done
barButtonItem.accessibilityIdentifier = AccessibilityIdentifier.saveCreateCustomListButton

return barButtonItem
}()
Expand Down Expand Up @@ -86,6 +87,7 @@ class CustomListViewController: UIViewController {
navigationItem.rightBarButtonItem = saveBarButton
view.directionalLayoutMargins = UIMetrics.contentLayoutMargins
view.backgroundColor = .secondaryColor
view.accessibilityIdentifier = .newCustomListView
isModalInPresentation = true

addSubviews()
Expand All @@ -102,6 +104,7 @@ class CustomListViewController: UIViewController {
tableView.delegate = dataSourceConfiguration
tableView.backgroundColor = .secondaryColor
tableView.registerReusableViews(from: CustomListItemIdentifier.CellIdentifier.self)
tableView.accessibilityIdentifier = AccessibilityIdentifier.customListEditTableView
}

private func configureDataSource() {
Expand Down Expand Up @@ -180,6 +183,7 @@ class CustomListViewController: UIViewController {
comment: ""
),
style: .destructive,
accessibilityId: .confirmDeleteCustomListButton,
handler: {
self.interactor.delete(id: self.subject.value.id)
self.delegate?.customListDidDelete(self.subject.value.customList)
Expand All @@ -192,7 +196,8 @@ class CustomListViewController: UIViewController {
value: "Cancel",
comment: ""
),
style: .default
style: .default,
accessibilityId: .cancelDeleteCustomListButton
),
]
)
Expand Down
4 changes: 4 additions & 0 deletions ios/MullvadVPN/Coordinators/CustomLists/ListCustomListViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class ListCustomListViewController: UIViewController {
super.viewDidLoad()

view.backgroundColor = .secondaryColor
view.accessibilityIdentifier = .listCustomListsView

addSubviews()
configureNavigationItem()
Expand Down Expand Up @@ -88,6 +89,7 @@ class ListCustomListViewController: UIViewController {
tableView.separatorStyle = .singleLine
tableView.rowHeight = UIMetrics.SettingsCell.customListsCellHeight
tableView.registerReusableViews(from: CellReuseIdentifier.self)
tableView.accessibilityIdentifier = .listCustomListsTableView
}

private func configureNavigationItem() {
Expand All @@ -104,6 +106,8 @@ class ListCustomListViewController: UIViewController {
self?.didFinish?()
})
)

navigationItem.rightBarButtonItem?.accessibilityIdentifier = .listCustomListDoneButton
}

private func configureDataSource() {
Expand Down
7 changes: 5 additions & 2 deletions ios/MullvadVPN/Coordinators/LocationCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
}

extension LocationCoordinator: LocationViewControllerDelegate {
func didRequestRouteToCustomLists(_ controller: LocationViewController, nodes: [LocationNode]) {

Check warning on line 188 in ios/MullvadVPN/Coordinators/LocationCoordinator.swift

View workflow job for this annotation

GitHub Actions / End to end tests 

Function Body Length Violation: Function body should span 50 lines or less excluding comments and whitespace: currently spans 52 lines (function_body_length)
let actionSheet = UIAlertController(
title: NSLocalizedString(
"CUSTOM_LIST_ACTION_SHEET_TITLE",
Expand All @@ -200,7 +200,7 @@
actionSheet.overrideUserInterfaceStyle = .dark
actionSheet.view.tintColor = UIColor(red: 0.0, green: 0.59, blue: 1.0, alpha: 1)

actionSheet.addAction(UIAlertAction(
let addCustomListAction = UIAlertAction(
title: NSLocalizedString(
"CUSTOM_LIST_ACTION_SHEET_ADD_LIST_BUTTON",
tableName: "CustomLists",
Expand All @@ -211,7 +211,9 @@
handler: { [weak self] _ in
self?.showAddCustomList(nodes: nodes)
}
))
)
addCustomListAction.accessibilityIdentifier = AccessibilityIdentifier.addNewCustomListButton
actionSheet.addAction(addCustomListAction)
let editAction = UIAlertAction(
title: NSLocalizedString(
"CUSTOM_LIST_ACTION_SHEET_EDIT_LISTS_BUTTON",
Expand All @@ -225,6 +227,7 @@
}
)
editAction.isEnabled = !customListRepository.fetchAll().isEmpty
editAction.accessibilityIdentifier = AccessibilityIdentifier.editCustomListButton

actionSheet.addAction(editAction)

Expand Down
1 change: 1 addition & 0 deletions ios/MullvadVPN/View controllers/SelectLocation/LocationCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ extension LocationCell {
locationLabel.text = item.node.name
showsCollapseControl = !item.node.children.isEmpty
isExpanded = item.node.showsChildren
checkboxButton.accessibilityIdentifier = .customListLocationCheckmarkButton
checkboxButton.isSelected = item.isSelected
checkboxButton.tintColor = item.isSelected ? .successColor : .white

Expand Down
5 changes: 3 additions & 2 deletions ios/MullvadVPN/View controllers/SelectLocation/LocationSectionHeaderView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ class LocationSectionHeaderView: UIView, UIContentView {
} set {
guard let newConfiguration = newValue as? Configuration,
actualConfiguration != newConfiguration else { return }
let previousConfiguration = actualConfiguration
actualConfiguration = newConfiguration
apply(configuration: previousConfiguration)
apply(configuration: newConfiguration)
}
}

Expand Down Expand Up @@ -66,7 +65,9 @@ class LocationSectionHeaderView: UIView, UIContentView {
let isActionHidden = configuration.primaryAction == nil
nameLabel.text = configuration.name
actionButton.isHidden = isActionHidden
actionButton.accessibilityIdentifier = nil
actualConfiguration.primaryAction.flatMap { [weak self] action in
self?.actionButton.accessibilityIdentifier = .openCustomListsMenuButton
self?.actionButton.addAction(action, for: .touchUpInside)
}
}
Expand Down
1 change: 1 addition & 0 deletions ios/MullvadVPN/View controllers/SelectLocation/LocationViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ final class LocationViewController: UIViewController {
self?.didFinish?()
})
)
navigationItem.rightBarButtonItem?.accessibilityIdentifier = .closeSelectLocationButton

setUpDataSources()
setUpTableView()
Expand Down
Loading
Loading