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

Jump to bottom

Issue199 UI test #224

Merged
merged 13 commits into from
Oct 25, 2023
Merged

Issue199 UI test #224

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
734a48d
List ordered by amount of contributions and profile name
am2089 Oct 10, 2023
62fc15d
Changes made topbxproj, and moved code from the contributorslistview …
am2089 Oct 11, 2023
454aa44
changes requested
am2089 Oct 12, 2023
14ce041
Changes
am2089 Oct 13, 2023
6a7d376
Committed changes to Basic-Car-Maintenance.xcodeproj/project.pbxproj
am2089 Oct 21, 2023
f55c04c
UITest for adding a vehicle in settings
am2089 Oct 22, 2023
8d27e3b
Updated Basic-Car-Maintenance-UITests
am2089 Oct 23, 2023
d43143e
Resolved merge conflicts in project.pbxproj
am2089 Oct 23, 2023
75edc40
Fix BasicCarMaintenanceUITests
am2089 Oct 24, 2023
fdba73a
Fix pbxproj and ui test file
mikaelacaron Oct 25, 2023
ae845cd
Remove reference to old file
mikaelacaron Oct 25, 2023
9576a40
Remove WidgetExtension.xcscheme
mikaelacaron Oct 25, 2023
5749135
Remove comments
mikaelacaron Oct 25, 2023
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
41 changes: 29 additions & 12 deletions Basic-Car-Maintenance-UITests/BasicCarMaintenanceUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,39 @@
// Created by Mikaela Caron on 8/11/23.
//


Check warning on line 8 in Basic-Car-Maintenance-UITests/BasicCarMaintenanceUITests.swift

View workflow job for this annotation

GitHub Actions / SwiftLint 

Limit vertical whitespace to a single empty line; currently 2 (vertical_whitespace)
import XCTest

final class BasicCarMaintenanceUITests: XCTestCase {

override func setUpWithError() throws {

let app = XCUIApplication()

override func setUp() {
continueAfterFailure = false
}

override func tearDownWithError() throws {
}

func testExample() throws {
// UI tests must launch the application that they test.
let app = XCUIApplication()
app.launch()

// Use XCTAssert and related functions to verify your tests produce the correct results.
}

func testAddVehicle() {
// Navigate to the AddVehicleView
app.buttons["Settings"].tap()
XCUIApplication().collectionViews/*@START_MENU_TOKEN@*/.buttons["Add Vehicle"]/*[[".cells.buttons[\"Add Vehicle\"]",".buttons[\"Add Vehicle\"]"],[[[-1,1],[-1,0]]],[0]]@END_MENU_TOKEN@*/.tap()

Check warning on line 23 in Basic-Car-Maintenance-UITests/BasicCarMaintenanceUITests.swift

View workflow job for this annotation

GitHub Actions / SwiftLint 

Line should be 110 characters or less; currently it has 199 characters (line_length)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this /*@START_MENU_TOKEN@*/ stuff shouldn't be here. This is because you had Xcode auto fill something, but you never accepted it, look how it's "highlighted" you need to either double click on it, or click on it once and press enter to accept that as the code

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also note you defined an app property in the class, yet here you're redefining using a new variable for XCUIApplication

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test only works when there's one vehicle and that the Add Vehicle button is in the view immediately and you don't need to scroll to tap on it


// Fill in valid vehicle information
let nameTextField = app.textFields["Vehicle Name"]
nameTextField.tap()
nameTextField.typeText("My Car")

let makeTextField = app.textFields["Vehicle Make"]
makeTextField.tap()
makeTextField.typeText("Toyota")

let modelTextField = app.textFields["Vehicle Model"]
modelTextField.tap()
modelTextField.typeText("Camry")

// Tap the "Add" button
app.buttons["Add"].tap()

}

}
22 changes: 21 additions & 1 deletion Basic-Car-Maintenance.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

/* Begin PBXBuildFile section */
023057F22ACFAD79006C5A73 /* EditEventDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 023057F12ACFAD79006C5A73 /* EditEventDetailView.swift */; };
8288B89B2AE5C5C900AA21F9 /* AddVehicleViewUITest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8288B89A2AE5C5C900AA21F9 /* AddVehicleViewUITest.swift */; };
154984AA2AD9CAEE0015594C /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 154984A92AD9CAEE0015594C /* Constants.swift */; };
57CDD99E2ADC3173002EFED0 /* OdometerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57CDD99D2ADC3173002EFED0 /* OdometerViewModel.swift */; };
57CDD9A02ADC31A8002EFED0 /* AddOdometerReadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57CDD99F2ADC31A8002EFED0 /* AddOdometerReadingView.swift */; };
Expand Down Expand Up @@ -99,13 +100,17 @@

/* Begin PBXFileReference section */
023057F12ACFAD79006C5A73 /* EditEventDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditEventDetailView.swift; sourceTree = "<group>"; };
<<<<<<< HEAD
8288B89A2AE5C5C900AA21F9 /* AddVehicleViewUITest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddVehicleViewUITest.swift; sourceTree = "<group>"; };
=======
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what a merge conflict looks like, this is something you have to fix, and not commit

154984A92AD9CAEE0015594C /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
57CDD99D2ADC3173002EFED0 /* OdometerViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OdometerViewModel.swift; sourceTree = "<group>"; };
57CDD99F2ADC31A8002EFED0 /* AddOdometerReadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddOdometerReadingView.swift; sourceTree = "<group>"; };
57CDD9A32ADC320F002EFED0 /* OdometerReading.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OdometerReading.swift; sourceTree = "<group>"; };
8014A4CE2AD75928005B51F6 /* AppIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppIcon.swift; sourceTree = "<group>"; };
8014A4D02AD76034005B51F6 /* ChooseAppIconView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChooseAppIconView.swift; sourceTree = "<group>"; };
8014A4D22AD77C92005B51F6 /* ChooseAppIconViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChooseAppIconViewModel.swift; sourceTree = "<group>"; };
>>>>>>> upstream/dev
898009782AD1899700604E7C /* ContributorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContributorTests.swift; sourceTree = "<group>"; };
8A3D74852AD6D9A10000FEEB /* AlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertView.swift; sourceTree = "<group>"; };
8AEE816E2ACF37F800FC0C2A /* Action.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Action.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -267,8 +272,8 @@
FF5D139A2A86C2D500BC9BD6 = {
isa = PBXGroup;
children = (
FFBE79BA2AD0A48C0005524E /* Configurations */,
FF098EFA2AB3424E003EC0FE /* Basic-Car-Maintenance.xcconfig */,
FFBE79BA2AD0A48C0005524E /* Configurations */,
FF5D13A52A86C2D600BC9BD6 /* Basic-Car-Maintenance */,
FFDADF822ACD35A100DDEF79 /* Basic-Car-Maintenance-Widget */,
FF5D13B72A86C2D800BC9BD6 /* Basic-Car-Maintenance-Tests */,
Expand Down Expand Up @@ -321,6 +326,7 @@
isa = PBXGroup;
children = (
FF5D13C22A86C2D800BC9BD6 /* BasicCarMaintenanceUITests.swift */,
8288B89A2AE5C5C900AA21F9 /* AddVehicleViewUITest.swift */,
);
path = "Basic-Car-Maintenance-UITests";
sourceTree = "<group>";
Expand Down Expand Up @@ -698,6 +704,7 @@
buildActionMask = 2147483647;
files = (
FF5D13C32A86C2D800BC9BD6 /* BasicCarMaintenanceUITests.swift in Sources */,
8288B89B2AE5C5C900AA21F9 /* AddVehicleViewUITest.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -738,6 +745,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
Expand Down Expand Up @@ -767,6 +775,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -800,6 +809,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
Expand Down Expand Up @@ -829,6 +839,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand All @@ -850,6 +861,7 @@
};
FF5D13C92A86C2D800BC9BD6 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = FF098EFA2AB3424E003EC0FE /* Basic-Car-Maintenance.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "";
Expand All @@ -858,6 +870,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "Basic-Car-Maintenance/Basic_Car_Maintenance.entitlements";
CODE_SIGN_STYLE = Automatic;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"Basic-Car-Maintenance/Preview Content\"";
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -898,6 +911,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "Basic-Car-Maintenance/Basic_Car_Maintenance.entitlements";
CODE_SIGN_STYLE = Automatic;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"Basic-Car-Maintenance/Preview Content\"";
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
Expand All @@ -919,6 +933,8 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 13.4;
OTHER_LDFLAGS = "-ObjC";
"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "com.andrewmuniz.Basic-Car-Maintenance";
"PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = "com.andrewmuniz.Basic-Car-Maintenance";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
Expand All @@ -935,6 +951,7 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
DEAD_CODE_STRIPPING = YES;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MACOSX_DEPLOYMENT_TARGET = 13.4;
Expand All @@ -955,6 +972,7 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
DEAD_CODE_STRIPPING = YES;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MACOSX_DEPLOYMENT_TARGET = 13.4;
Expand All @@ -974,6 +992,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
DEAD_CODE_STRIPPING = YES;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MACOSX_DEPLOYMENT_TARGET = 13.4;
Expand All @@ -993,6 +1012,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
DEAD_CODE_STRIPPING = YES;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MACOSX_DEPLOYMENT_TARGET = 13.4;
Expand Down
1 change: 0 additions & 1 deletion ...intenance.xcodeproj/xcshareddata/xcschemes/Basic-Car-Maintenance-WidgetExtension.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"
askForAppToLaunch = "Yes"
launchAutomaticallySubstyle = "2">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
3 changes: 3 additions & 0 deletions Basic-Car-Maintenance.xcodeproj/xcshareddata/xcschemes/WidgetExtension.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"
Loading