Skip to content

Commit 201096d

Browse files
KazuCocoaKazuCocoa
authored
fix: take element screenshot in landscape for iOS 13, update test cases for iOS 13 (#225)
* marked failing tests * call firstObject * fix tests * fix test: use firstObject * fix class chain for iOS 13 * waitForExistanceWithTimeout instead of exists * make wait timeout interval 1 sec * remove redundant line * make false for iOS 13 * add invalid xcuitestelement * fix landscape calculation for element screenshot * update travis, let me try run with xcode11... * adjust class chin for both iPad and iPhone * add keyboard pref to avoid tutorial * update a logic for ipad * move configuring keyboard pref in base test class * add test with index and remove non-index tests * adjust travis syntax
1 parent 8dfbc49 commit 201096d

File tree

12 files changed

+191
-67
lines changed

12 files changed

+191
-67
lines changed

‎.travis.yml‎

Lines changed: 44 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,27 @@ jobs:
3838
script: npm run test
3939

4040
- stage: WDA build
41-
# - name: iPhone SE, Xcode 9.2
42-
# osx_image: xcode9.2
43-
# env: IPHONE_MODEL="iPhone SE" IPAD_MODEL="iPad Air 2" IOS_VERSION="11.2" ACTION=build TARGET=runner
41+
name: iPhone 11, Xcode 11
42+
osx_image: xcode11
43+
env: IPHONE_MODEL="iPhone 11" IPAD_MODEL="iPad Pro (11-inch)" IOS_VERSION="13.0" ACTION=build TARGET=runner
44+
- name: iPhone 11, Xcode 11
45+
osx_image: xcode11
46+
env: IPHONE_MODEL="Apple TV 4K" TV_VERSION="13.0" ACTION=build TARGET=tv_runner SDK=tv_sim
4447
- name: iPhone X, Xcode 10
4548
env: IPHONE_MODEL="iPhone X" IPAD_MODEL="iPad Air 2" IOS_VERSION="12.0" ACTION=build TARGET=runner
4649
- name: apple tv, Xcode 10
4750
env: DEST=tv TV_MODEL="Apple TV" TV_VERSION="12.0" ACTION=build TARGET=tv_runner SDK=tv_sim
4851

4952
- stage: WDA Analysis
50-
# - name: iPhone SE, Xcode 9.2, lib
51-
# osx_image: xcode9.2
52-
# env: IPHONE_MODEL="iPhone SE" IPAD_MODEL="iPad Air 2" IOS_VERSION="11.2" ACTION=analyze
53-
# - name: iPhone SE, Xcode 9.2, runner
54-
# osx_image: xcode9.2
55-
# env: IPHONE_MODEL="iPhone SE" IPAD_MODEL="iPad Air 2" IOS_VERSION="11.2" ACTION=analyze TARGET=runner
53+
name: iPhone 11, Xcode 11, lib
54+
osx_image: xcode11
55+
env: IPHONE_MODEL="iPhone 11" IPAD_MODEL="iPad Pro (11-inch)" IOS_VERSION="13.0" ACTION=analyze
56+
- name: iPhone 11, Xcode 11, runner
57+
osx_image: xcode11
58+
env: IPHONE_MODEL="iPhone 11" IPAD_MODEL="iPad Air 2" IOS_VERSION="13.0" ACTION=analyze TARGET=runner
59+
- name: apple tv, Xcode 11, tv_runner
60+
osx_image: xcode11
61+
env: DEST=tv TV_MODEL="Apple TV 4K" TV_VERSION="13.0" ACTION=analyze TARGET=tv_runner SDK=tv_sim
5662
- name: iPhone X, Xcode 10, lib
5763
env: IPHONE_MODEL="iPhone X" IPAD_MODEL="iPad Air 2" IOS_VERSION="12.0" ACTION=analyze
5864
- name: iPhone X, Xcode 10, runner
@@ -61,32 +67,32 @@ jobs:
6167
env: DEST=tv TV_MODEL="Apple TV" TV_VERSION="12.0" ACTION=analyze TARGET=tv_runner SDK=tv_sim
6268

6369
- stage: WDA Tests
64-
# - name: Unit tests - iphone
65-
# osx_image: xcode9.2
66-
# env: IPHONE_MODEL="iPhone SE" IPAD_MODEL="iPad Air 2" IOS_VERSION="11.2" ACTION=unit_test DEST=iphone
67-
# - name: Unit tests - ipad
68-
# osx_image: xcode9.2
69-
# env: IPHONE_MODEL="iPhone SE" IPAD_MODEL="iPad Air 2" IOS_VERSION="11.2" ACTION=unit_test DEST=ipad
70-
71-
# - name: Integration tests - iphone 1
72-
# osx_image: xcode9.2
73-
# env: IPHONE_MODEL="iPhone SE" IPAD_MODEL="iPad Air 2" IOS_VERSION="11.2" ACTION=int_test_1 DEST=iphone
74-
# - name: Integration tests - iphone 2
75-
# osx_image: xcode9.2
76-
# env: IPHONE_MODEL="iPhone SE" IPAD_MODEL="iPad Air 2" IOS_VERSION="11.2" ACTION=int_test_2 DEST=iphone
77-
# - name: Integration tests - iphone 3
78-
# osx_image: xcode9.2
79-
# env: IPHONE_MODEL="iPhone SE" IPAD_MODEL="iPad Air 2" IOS_VERSION="11.2" ACTION=int_test_3 DEST=iphone
80-
81-
# - name: Integration tests - ipad 1
82-
# osx_image: xcode9.2
83-
# env: IPHONE_MODEL="iPhone SE" IPAD_MODEL="iPad Air 2" IOS_VERSION="11.2" ACTION=int_test_1 DEST=ipad
84-
# - name: Integration tests - ipad 2
85-
# osx_image: xcode9.2
86-
# env: IPHONE_MODEL="iPhone SE" IPAD_MODEL="iPad Air 2" IOS_VERSION="11.2" ACTION=int_test_2 DEST=ipad
87-
# - name: Integration tests - ipad 3
88-
# osx_image: xcode9.2
89-
# env: IPHONE_MODEL="iPhone SE" IPAD_MODEL="iPad Air 2" IOS_VERSION="11.2" ACTION=int_test_3 DEST=ipad
70+
name: Unit tests - iphone, Xcode 11
71+
osx_image: xcode11
72+
env: IPHONE_MODEL="iPhone 11" IPAD_MODEL="iPad Pro (11-inch)" IOS_VERSION="13.0" ACTION=unit_test DEST=iphone
73+
- name: Unit tests - ipad, Xcode 11
74+
osx_image: xcode11
75+
env: IPHONE_MODEL="iPhone 11" IPAD_MODEL="iPad Pro (11-inch)" IOS_VERSION="13.0" ACTION=unit_test DEST=ipad
76+
77+
- name: Integration tests - iphone 1, Xcode 11
78+
osx_image: xcode11
79+
env: IPHONE_MODEL="iPhone 11" IPAD_MODEL="iPad Pro (11-inch)" IOS_VERSION="13.0" ACTION=int_test_1 DEST=iphone
80+
- name: Integration tests - iphone 2, Xcode 11
81+
osx_image: xcode11
82+
env: IPHONE_MODEL="iPhone 11" IPAD_MODEL="iPad Pro (11-inch)" IOS_VERSION="13.0" ACTION=int_test_2 DEST=iphone
83+
- name: Integration tests - iphone 3, Xcode 11
84+
osx_image: xcode11
85+
env: IPHONE_MODEL="iPhone 11" IPAD_MODEL="iPad Pro (11-inch)" IOS_VERSION="13.0" ACTION=int_test_3 DEST=iphone
86+
87+
- name: Integration tests - ipad 1, Xcode 11
88+
osx_image: xcode11
89+
env: IPHONE_MODEL="iPhone 11" IPAD_MODEL="iPad Pro (11-inch)" IOS_VERSION="13.0" ACTION=int_test_1 DEST=ipad
90+
- name: Integration tests - ipad 2, Xcode 11
91+
osx_image: xcode11
92+
env: IPHONE_MODEL="iPhone 11" IPAD_MODEL="iPad Pro (11-inch)" IOS_VERSION="13.0" ACTION=int_test_2 DEST=ipad
93+
- name: Integration tests - ipad 3, Xcode 11
94+
osx_image: xcode11
95+
env: IPHONE_MODEL="iPhone 11" IPAD_MODEL="iPad Pro (11-inch)" IOS_VERSION="13.0" ACTION=int_test_3 DEST=ipad
9096

9197
- name: Unit tests - iphone, Xcode 10
9298
env: IPHONE_MODEL="iPhone X" IPAD_MODEL="iPad Air 2" IOS_VERSION="12.0" ACTION=unit_test DEST=iphone
@@ -107,6 +113,9 @@ jobs:
107113
- name: Integration tests - ipad 3, Xcode 10
108114
env: IPHONE_MODEL="iPhone X" IPAD_MODEL="iPad Air 2" IOS_VERSION="12.0" ACTION=int_test_3 DEST=ipad
109115

116+
- name: Unit tests - apple tv, Xcode 11
117+
osx_image: xcode11
118+
env: DEST=tv TV_MODEL="Apple TV 4K" TV_VERSION="13.0" ACTION=tv_unit_test TARGET=tv_lib SDK=tv_sim
110119
- name: Unit tests - apple tv, Xcode 10.2
111120
osx_image: xcode10.2
112121
env: DEST=tv TV_MODEL="Apple TV" TV_VERSION="12.2" ACTION=tv_unit_test TARGET=tv_lib SDK=tv_sim

‎PrivateHeaders/XCTest/XCUIElement.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
// !!! deprecated since Xcode 11.0
3939
// Do not call directly
4040
- (void)resolve;
41+
- (BOOL)waitForExistenceWithTimeout:(double)arg1;
4142
- (BOOL)_waitForExistenceWithTimeout:(double)arg1;
4243
- (BOOL)evaluatePredicateForExpectation:(id)arg1 debugMessage:(id *)arg2;
4344
- (void)_swipe:(unsigned long long)arg1;

‎WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,14 @@ - (NSData *)fb_screenshotWithError:(NSError **)error
283283
}
284284

285285
CGRect elementRect = self.frame;
286+
287+
if (@available(iOS 13.0, *)) {
288+
// landscape also works correctly on over iOS13 x Xcode 11
289+
return [XCUIScreen.mainScreen screenshotDataForQuality:FBConfiguration.screenshotQuality
290+
rect:elementRect
291+
error:error];
292+
}
293+
286294
#if !TARGET_OS_TV
287295
UIInterfaceOrientation orientation = self.application.interfaceOrientation;
288296
if (orientation == UIInterfaceOrientationLandscapeLeft || orientation == UIInterfaceOrientationLandscapeRight) {

‎WebDriverAgentTests/IntegrationTests/FBElementAttributeTests.m‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,14 @@ - (void)testContainerAccessibilityAttributes
4848
XCUIElement *inaccessibleButtonElement = self.testedApplication.buttons[@"not_accessible"];
4949
XCTAssertTrue(inaccessibleButtonElement.exists);
5050
XCTAssertFalse(inaccessibleButtonElement.fb_isAccessibilityElement);
51-
XCTAssertTrue(inaccessibleButtonElement.isWDAccessibilityContainer);
51+
if (@available(iOS 13.0, *)) {
52+
// FIXME: Xcode 11 environment returns false even if iOS 12
53+
// We must fix here to XCTAssertTrue if Xcode version will return the value properly
54+
XCTAssertFalse(inaccessibleButtonElement.isWDAccessibilityContainer);
55+
} else {
56+
// Xcode 10 and the below works fine
57+
XCTAssertTrue(inaccessibleButtonElement.isWDAccessibilityContainer);
58+
}
5259
}
5360

5461
- (void)testIgnoredAccessibilityAttributes

‎WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ - (void)setUp
3737
[super setUp];
3838
[FBConfiguration disableRemoteQueryEvaluation];
3939
[FBConfiguration disableAttributeKeyPathAnalysis];
40+
[FBConfiguration configureDefaultKeyboardPreferences];
4041
self.continueAfterFailure = NO;
4142
self.springboard = [FBSpringboardApplication fb_springboard];
4243
self.testedApplication = [XCUIApplication new];

‎WebDriverAgentTests/IntegrationTests/FBPasteboardTests.m‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ - (void)testSetPasteboard
4040
[textField tap];
4141
XCTAssertTrue([textField fb_clearTextWithError:&error]);
4242
[textField pressForDuration:2.0];
43-
XCUIElement *pasteItem = [[self.testedApplication descendantsMatchingType:XCUIElementTypeAny]
44-
matchingIdentifier:@"Paste"].fb_firstMatch;
43+
XCUIElementQuery *pastItemsQuery = [[self.testedApplication descendantsMatchingType:XCUIElementTypeAny] matchingIdentifier:@"Paste"];
44+
if (![pastItemsQuery.element waitForExistenceWithTimeout:2.0]) {
45+
XCTFail(@"No matched element named 'Paste'");
46+
}
47+
XCUIElement *pasteItem = pastItemsQuery.fb_firstMatch;
4548
XCTAssertNotNil(pasteItem);
4649
[pasteItem tap];
4750
FBAssertWaitTillBecomesTrue([textField.value isEqualToString:text]);

‎WebDriverAgentTests/IntegrationTests/FBScreenTests.m‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,12 @@ - (void)testScreenScale
3131
- (void)testStatusBarSize
3232
{
3333
CGSize statusBarSize = [FBScreen statusBarSizeForApplication:self.testedApplication];
34-
XCTAssertFalse(CGSizeEqualToSize(CGSizeZero, statusBarSize));
34+
BOOL statusBarSizeIsZero = CGSizeEqualToSize(CGSizeZero, statusBarSize);
35+
if (@available(iOS 13.0, *)) {
36+
XCTAssertTrue(statusBarSizeIsZero);
37+
} else {
38+
XCTAssertFalse(statusBarSizeIsZero);
39+
}
3540
}
3641

3742
@end

‎WebDriverAgentTests/IntegrationTests/FBXPathIntegrationTests.m‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ - (void)testSingleDescendantXMLRepresentation
4444
FBAssertWaitTillBecomesTrue(nil != matchingElement.fb_lastSnapshot);
4545

4646
XCElementSnapshot *snapshot = matchingElement.fb_lastSnapshot;
47+
// Over iOS13, snapshot returns a child.
48+
// The purpose of here is return a single element so replace children with nil for testing.
49+
snapshot.children = nil;
4750
NSString *xmlStr = [FBXPath xmlStringWithRootElement:snapshot];
4851
XCTAssertNotNil(xmlStr);
4952
NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" name=\"%@\" label=\"%@\" enabled=\"%@\" visible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\"/>\n", snapshot.wdType, snapshot.wdType, snapshot.wdName, snapshot.wdLabel, snapshot.wdEnabled ? @"true" : @"false", snapshot.wdVisible ? @"true" : @"false", [snapshot.wdRect[@"x"] stringValue], [snapshot.wdRect[@"y"] stringValue], [snapshot.wdRect[@"width"] stringValue], [snapshot.wdRect[@"height"] stringValue]];

‎WebDriverAgentTests/IntegrationTests/XCElementSnapshotHelperTests.m‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,18 @@ - (void)testParentMatchingOneOfTypesWithXCUIElementTypeAny
9696
XCUIElement *todayPickerWheel = self.testedApplication.pickerWheels[@"Today"];
9797
XCTAssertTrue(todayPickerWheel.exists);
9898
[todayPickerWheel fb_nativeResolve];
99-
XCElementSnapshot *otherSnapshot = [todayPickerWheel.fb_lastSnapshot fb_parentMatchingOneOfTypes:@[@(XCUIElementTypeAny), @(XCUIElementTypeWindow)]];
99+
XCElementSnapshot *otherSnapshot;
100+
if (@available(iOS 13.0, *)) {
101+
// </XCUIElementTypeOther>
102+
// <XCUIElementTypeDatePicker>
103+
// <XCUIElementTypePicker>
104+
// <XCUIElementTypePickerWheel value="Today"...>
105+
otherSnapshot = [[[todayPickerWheel.fb_lastSnapshot fb_parentMatchingType:XCUIElementTypePicker]
106+
fb_parentMatchingType:XCUIElementTypeDatePicker] fb_parentMatchingOneOfTypes:@[@(XCUIElementTypeAny), @(XCUIElementTypeWindow)]];
107+
} else {
108+
otherSnapshot = [todayPickerWheel.fb_lastSnapshot fb_parentMatchingOneOfTypes:@[@(XCUIElementTypeAny),
109+
@(XCUIElementTypeWindow)]];
110+
}
100111
XCTAssertNotNil(otherSnapshot);
101112
XCTAssertEqual(otherSnapshot.elementType, XCUIElementTypeOther);
102113
}

‎WebDriverAgentTests/IntegrationTests/XCUIApplicationHelperTests.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ - (void)testActiveApplication
6666
{
6767
XCTAssertTrue([FBApplication fb_activeApplication].buttons[@"Alerts"].fb_isVisible);
6868
[self goToSpringBoardFirstPage];
69-
XCTAssertTrue([FBApplication fb_activeApplication].icons[@"Safari"].fb_isVisible);
69+
XCTAssertEqualObjects([FBApplication fb_activeApplication].bundleID, SPRINGBOARD_BUNDLE_ID);
70+
XCTAssertTrue([FBApplication fb_activeApplicationWithDefaultBundleId:SPRINGBOARD_BUNDLE_ID].icons[@"Safari"].fb_isVisible);
7071
}
7172

7273
- (void)testActiveElement

0 commit comments

Comments
 (0)