appium-webdriveragent 5.15.7 → 5.15.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +10 -0
- package/PrivateHeaders/XCTest/XCUIApplication.h +1 -0
- package/WebDriverAgent.xcodeproj/project.pbxproj +18 -6
- package/WebDriverAgent.xcodeproj/project.xcworkspace/xcuserdata/kazu.xcuserdatad/UserInterfaceState.xcuserstate +0 -0
- package/WebDriverAgent.xcodeproj/xcuserdata/kazu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +1342 -0
- package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.h +0 -38
- package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m +5 -148
- package/WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.m +1 -1
- package/WebDriverAgentLib/Categories/XCUIDevice+FBRotation.h +1 -0
- package/WebDriverAgentLib/Categories/XCUIDevice+FBRotation.m +3 -5
- package/WebDriverAgentLib/Categories/XCUIElement+FBTVFocuse.m +2 -2
- package/WebDriverAgentLib/Commands/FBAlertViewCommands.m +4 -4
- package/WebDriverAgentLib/Commands/FBCustomCommands.m +2 -2
- package/WebDriverAgentLib/Commands/FBDebugCommands.m +3 -2
- package/WebDriverAgentLib/Commands/FBElementCommands.m +4 -2
- package/WebDriverAgentLib/Commands/FBFindElementCommands.m +1 -0
- package/WebDriverAgentLib/Commands/FBOrientationCommands.m +8 -9
- package/WebDriverAgentLib/Commands/FBSessionCommands.m +9 -7
- package/WebDriverAgentLib/Commands/FBTouchActionCommands.m +1 -0
- package/WebDriverAgentLib/FBAlert.m +3 -3
- package/WebDriverAgentLib/FBApplication.h +49 -0
- package/WebDriverAgentLib/FBApplication.m +185 -0
- package/WebDriverAgentLib/Routing/FBSession.h +14 -13
- package/WebDriverAgentLib/Routing/FBSession.m +46 -49
- package/WebDriverAgentLib/Utilities/FBAlertsMonitor.m +3 -3
- package/WebDriverAgentLib/Utilities/FBKeyboard.m +5 -6
- package/WebDriverAgentLib/Utilities/FBMjpegServer.m +1 -0
- package/WebDriverAgentLib/Utilities/FBPasteboard.m +2 -2
- package/WebDriverAgentLib/Utilities/FBScreen.m +2 -1
- package/WebDriverAgentLib/Utilities/FBTVNavigationTracker.m +2 -1
- package/WebDriverAgentLib/Utilities/FBXCodeCompatibility.h +33 -0
- package/WebDriverAgentLib/Utilities/FBXCodeCompatibility.m +40 -2
- package/WebDriverAgentLib/WebDriverAgentLib.h +1 -0
- package/WebDriverAgentTests/IntegrationTests/FBAutoAlertsHandlerTests.m +3 -2
- package/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m +1 -0
- package/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.h +3 -1
- package/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m +5 -5
- package/WebDriverAgentTests/IntegrationTests/FBSafariAlertTests.m +2 -1
- package/WebDriverAgentTests/IntegrationTests/FBSessionIntegrationTests.m +10 -11
- package/WebDriverAgentTests/IntegrationTests/FBTapTest.m +1 -0
- package/WebDriverAgentTests/IntegrationTests/FBW3CMultiTouchActionsIntegrationTests.m +1 -0
- package/WebDriverAgentTests/IntegrationTests/XCUIApplicationHelperTests.m +8 -8
- package/WebDriverAgentTests/IntegrationTests/XCUIDeviceHelperTests.m +4 -5
- package/WebDriverAgentTests/IntegrationTests/XCUIElementHelperIntegrationTests.m +1 -0
- package/WebDriverAgentTests/UnitTests/Doubles/{XCUIApplicationDouble.h → FBApplicationDouble.h} +1 -1
- package/WebDriverAgentTests/UnitTests/Doubles/{XCUIApplicationDouble.m → FBApplicationDouble.m} +3 -3
- package/WebDriverAgentTests/UnitTests/FBSessionTests.m +3 -3
- package/build/lib/utils.d.ts +2 -2
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +7 -5
- package/build/lib/utils.js.map +1 -1
- package/lib/utils.js +7 -5
- package/package.json +1 -1
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
#import <XCTest/XCTest.h>
|
|
11
11
|
|
|
12
12
|
#import "FBIntegrationTestCase.h"
|
|
13
|
+
#import "FBApplication.h"
|
|
13
14
|
#import "FBMacros.h"
|
|
14
15
|
#import "FBSession.h"
|
|
15
16
|
#import "FBXCodeCompatibility.h"
|
|
@@ -49,7 +50,7 @@
|
|
|
49
50
|
- (void)disabled_testAutoAcceptingOfAlerts
|
|
50
51
|
{
|
|
51
52
|
self.session = [FBSession
|
|
52
|
-
initWithApplication:
|
|
53
|
+
initWithApplication:FBApplication.fb_activeApplication
|
|
53
54
|
defaultAlertAction:@"accept"];
|
|
54
55
|
for (int i = 0; i < 2; i++) {
|
|
55
56
|
[self.testedApplication.buttons[FBShowAlertButtonName] tap];
|
|
@@ -62,7 +63,7 @@
|
|
|
62
63
|
- (void)disabled_testAutoDismissingOfAlerts
|
|
63
64
|
{
|
|
64
65
|
self.session = [FBSession
|
|
65
|
-
initWithApplication:
|
|
66
|
+
initWithApplication:FBApplication.fb_activeApplication
|
|
66
67
|
defaultAlertAction:@"dismiss"];
|
|
67
68
|
for (int i = 0; i < 2; i++) {
|
|
68
69
|
[self.testedApplication.buttons[FBShowAlertButtonName] tap];
|
|
@@ -9,6 +9,8 @@
|
|
|
9
9
|
|
|
10
10
|
#import <XCTest/XCTest.h>
|
|
11
11
|
|
|
12
|
+
#import "FBApplication.h"
|
|
13
|
+
|
|
12
14
|
extern NSString *const FBShowAlertButtonName;
|
|
13
15
|
extern NSString *const FBShowSheetAlertButtonName;
|
|
14
16
|
extern NSString *const FBShowAlertForceTouchButtonName;
|
|
@@ -20,7 +22,7 @@ extern NSString *const FBTapsCountLabelIdentifier;
|
|
|
20
22
|
*/
|
|
21
23
|
@interface FBIntegrationTestCase : XCTestCase
|
|
22
24
|
@property (nonatomic, strong, readonly) XCUIApplication *testedApplication;
|
|
23
|
-
@property (nonatomic, strong, readonly)
|
|
25
|
+
@property (nonatomic, strong, readonly) FBApplication *springboard;
|
|
24
26
|
|
|
25
27
|
/**
|
|
26
28
|
Launches application and resets side effects of testing like orientation etc.
|
|
@@ -10,12 +10,12 @@
|
|
|
10
10
|
#import <XCTest/XCTest.h>
|
|
11
11
|
|
|
12
12
|
#import "FBAlert.h"
|
|
13
|
+
#import "FBApplication.h"
|
|
13
14
|
#import "FBTestMacros.h"
|
|
14
15
|
#import "FBIntegrationTestCase.h"
|
|
15
16
|
#import "FBConfiguration.h"
|
|
16
17
|
#import "FBMacros.h"
|
|
17
18
|
#import "FBRunLoopSpinner.h"
|
|
18
|
-
#import "XCUIApplication+FBHelpers.h"
|
|
19
19
|
#import "XCUIDevice+FBRotation.h"
|
|
20
20
|
#import "XCUIElement.h"
|
|
21
21
|
#import "XCUIElement+FBIsVisible.h"
|
|
@@ -30,7 +30,7 @@ NSString *const FBTapsCountLabelIdentifier = @"numberOfTapsLabel";
|
|
|
30
30
|
|
|
31
31
|
@interface FBIntegrationTestCase ()
|
|
32
32
|
@property (nonatomic, strong) XCUIApplication *testedApplication;
|
|
33
|
-
@property (nonatomic, strong)
|
|
33
|
+
@property (nonatomic, strong) FBApplication *springboard;
|
|
34
34
|
@end
|
|
35
35
|
|
|
36
36
|
@implementation FBIntegrationTestCase
|
|
@@ -46,7 +46,7 @@ NSString *const FBTapsCountLabelIdentifier = @"numberOfTapsLabel";
|
|
|
46
46
|
[FBConfiguration disableApplicationUIInterruptionsHandling];
|
|
47
47
|
[FBConfiguration disableScreenshots];
|
|
48
48
|
self.continueAfterFailure = NO;
|
|
49
|
-
self.springboard =
|
|
49
|
+
self.springboard = FBApplication.fb_systemApplication;
|
|
50
50
|
self.testedApplication = [XCUIApplication new];
|
|
51
51
|
}
|
|
52
52
|
|
|
@@ -91,10 +91,10 @@ NSString *const FBTapsCountLabelIdentifier = @"numberOfTapsLabel";
|
|
|
91
91
|
{
|
|
92
92
|
[[XCUIDevice sharedDevice] pressButton:XCUIDeviceButtonHome];
|
|
93
93
|
[self.testedApplication fb_waitUntilStable];
|
|
94
|
-
FBAssertWaitTillBecomesTrue(
|
|
94
|
+
FBAssertWaitTillBecomesTrue(FBApplication.fb_systemApplication.icons[@"Safari"].exists);
|
|
95
95
|
[[XCUIDevice sharedDevice] pressButton:XCUIDeviceButtonHome];
|
|
96
96
|
[self.testedApplication fb_waitUntilStable];
|
|
97
|
-
FBAssertWaitTillBecomesTrue(
|
|
97
|
+
FBAssertWaitTillBecomesTrue(FBApplication.fb_systemApplication.icons[@"Calendar"].firstMatch.fb_isVisible);
|
|
98
98
|
}
|
|
99
99
|
|
|
100
100
|
- (void)goToSpringBoardExtras
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
#import <XCTest/XCTest.h>
|
|
11
11
|
|
|
12
12
|
#import "FBIntegrationTestCase.h"
|
|
13
|
+
#import "FBApplication.h"
|
|
13
14
|
#import "FBTestMacros.h"
|
|
14
15
|
#import "FBMacros.h"
|
|
15
16
|
#import "FBSession.h"
|
|
@@ -32,7 +33,7 @@ static NSString *const SAFARI_BUNDLE_ID = @"com.apple.mobilesafari";
|
|
|
32
33
|
- (void)setUp
|
|
33
34
|
{
|
|
34
35
|
[super setUp];
|
|
35
|
-
self.session = [FBSession initWithApplication:
|
|
36
|
+
self.session = [FBSession initWithApplication:FBApplication.fb_activeApplication];
|
|
36
37
|
[self.session launchApplicationWithBundleId:SAFARI_BUNDLE_ID
|
|
37
38
|
shouldWaitForQuiescence:nil
|
|
38
39
|
arguments:nil
|
|
@@ -10,14 +10,13 @@
|
|
|
10
10
|
#import <XCTest/XCTest.h>
|
|
11
11
|
|
|
12
12
|
#import "FBIntegrationTestCase.h"
|
|
13
|
+
#import "FBApplication.h"
|
|
13
14
|
#import "FBExceptions.h"
|
|
14
15
|
#import "FBMacros.h"
|
|
15
16
|
#import "FBSession.h"
|
|
16
17
|
#import "FBXCodeCompatibility.h"
|
|
17
18
|
#import "FBTestMacros.h"
|
|
18
19
|
#import "FBUnattachedAppLauncher.h"
|
|
19
|
-
#import "XCUIApplication+FBHelpers.h"
|
|
20
|
-
#import "XCUIApplication.h"
|
|
21
20
|
|
|
22
21
|
@interface FBSession (Tests)
|
|
23
22
|
|
|
@@ -36,7 +35,7 @@ static NSString *const SETTINGS_BUNDLE_ID = @"com.apple.Preferences";
|
|
|
36
35
|
{
|
|
37
36
|
[super setUp];
|
|
38
37
|
[self launchApplication];
|
|
39
|
-
|
|
38
|
+
FBApplication *app = [[FBApplication alloc] initWithBundleIdentifier:self.testedApplication.bundleID];
|
|
40
39
|
self.session = [FBSession initWithApplication:app];
|
|
41
40
|
}
|
|
42
41
|
|
|
@@ -48,7 +47,7 @@ static NSString *const SETTINGS_BUNDLE_ID = @"com.apple.Preferences";
|
|
|
48
47
|
|
|
49
48
|
- (void)testSettingsAppCanBeOpenedInScopeOfTheCurrentSession
|
|
50
49
|
{
|
|
51
|
-
|
|
50
|
+
FBApplication *testedApp = FBApplication.fb_activeApplication;
|
|
52
51
|
[self.session launchApplicationWithBundleId:SETTINGS_BUNDLE_ID
|
|
53
52
|
shouldWaitForQuiescence:nil
|
|
54
53
|
arguments:nil
|
|
@@ -62,7 +61,7 @@ static NSString *const SETTINGS_BUNDLE_ID = @"com.apple.Preferences";
|
|
|
62
61
|
|
|
63
62
|
- (void)testSettingsAppCanBeReopenedInScopeOfTheCurrentSession
|
|
64
63
|
{
|
|
65
|
-
|
|
64
|
+
FBApplication *systemApp = self.springboard;
|
|
66
65
|
[self.session launchApplicationWithBundleId:SETTINGS_BUNDLE_ID
|
|
67
66
|
shouldWaitForQuiescence:nil
|
|
68
67
|
arguments:nil
|
|
@@ -79,7 +78,7 @@ static NSString *const SETTINGS_BUNDLE_ID = @"com.apple.Preferences";
|
|
|
79
78
|
|
|
80
79
|
- (void)testMainAppCanBeReactivatedInScopeOfTheCurrentSession
|
|
81
80
|
{
|
|
82
|
-
|
|
81
|
+
FBApplication *testedApp = FBApplication.fb_activeApplication;
|
|
83
82
|
[self.session launchApplicationWithBundleId:SETTINGS_BUNDLE_ID
|
|
84
83
|
shouldWaitForQuiescence:nil
|
|
85
84
|
arguments:nil
|
|
@@ -91,8 +90,8 @@ static NSString *const SETTINGS_BUNDLE_ID = @"com.apple.Preferences";
|
|
|
91
90
|
|
|
92
91
|
- (void)testMainAppCanBeRestartedInScopeOfTheCurrentSession
|
|
93
92
|
{
|
|
94
|
-
|
|
95
|
-
|
|
93
|
+
FBApplication *systemApp = self.springboard;
|
|
94
|
+
FBApplication *testedApp = [[FBApplication alloc] initWithBundleIdentifier:self.testedApplication.bundleID];
|
|
96
95
|
[self.session terminateApplicationWithBundleId:testedApp.bundleID];
|
|
97
96
|
FBAssertWaitTillBecomesTrue([self.session.activeApplication.bundleID isEqualToString:systemApp.bundleID]);
|
|
98
97
|
[self.session launchApplicationWithBundleId:testedApp.bundleID
|
|
@@ -106,12 +105,12 @@ static NSString *const SETTINGS_BUNDLE_ID = @"com.apple.Preferences";
|
|
|
106
105
|
{
|
|
107
106
|
[FBUnattachedAppLauncher launchAppWithBundleId:SETTINGS_BUNDLE_ID];
|
|
108
107
|
[self.session kill];
|
|
109
|
-
XCTAssertEqualObjects(SETTINGS_BUNDLE_ID,
|
|
108
|
+
XCTAssertEqualObjects(SETTINGS_BUNDLE_ID, FBApplication.fb_activeApplication.bundleID);
|
|
110
109
|
}
|
|
111
110
|
|
|
112
111
|
- (void)testAppWithInvalidBundleIDCannotBeStarted
|
|
113
112
|
{
|
|
114
|
-
|
|
113
|
+
FBApplication *testedApp = [[FBApplication alloc] initWithBundleIdentifier:@"yolo"];
|
|
115
114
|
@try {
|
|
116
115
|
[testedApp launch];
|
|
117
116
|
XCTFail(@"An exception is expected to be thrown");
|
|
@@ -122,7 +121,7 @@ static NSString *const SETTINGS_BUNDLE_ID = @"com.apple.Preferences";
|
|
|
122
121
|
|
|
123
122
|
- (void)testAppWithInvalidBundleIDCannotBeActivated
|
|
124
123
|
{
|
|
125
|
-
|
|
124
|
+
FBApplication *testedApp = [[FBApplication alloc] initWithBundleIdentifier:@"yolo"];
|
|
126
125
|
@try {
|
|
127
126
|
[testedApp activate];
|
|
128
127
|
XCTFail(@"An exception is expected to be thrown");
|
|
@@ -11,11 +11,11 @@
|
|
|
11
11
|
|
|
12
12
|
#import <mach/mach_time.h>
|
|
13
13
|
|
|
14
|
+
#import "FBApplication.h"
|
|
14
15
|
#import "FBIntegrationTestCase.h"
|
|
15
16
|
#import "FBElement.h"
|
|
16
17
|
#import "FBMacros.h"
|
|
17
18
|
#import "FBTestMacros.h"
|
|
18
|
-
#import "XCUIApplication.h"
|
|
19
19
|
#import "XCUIApplication+FBHelpers.h"
|
|
20
20
|
#import "XCUIElement+FBIsVisible.h"
|
|
21
21
|
#import "FBXCodeCompatibility.h"
|
|
@@ -34,8 +34,8 @@
|
|
|
34
34
|
- (void)testQueringSpringboard
|
|
35
35
|
{
|
|
36
36
|
[self goToSpringBoardFirstPage];
|
|
37
|
-
XCTAssertTrue(
|
|
38
|
-
XCTAssertTrue(
|
|
37
|
+
XCTAssertTrue(FBApplication.fb_systemApplication.icons[@"Safari"].exists);
|
|
38
|
+
XCTAssertTrue(FBApplication.fb_systemApplication.icons[@"Calendar"].firstMatch.exists);
|
|
39
39
|
}
|
|
40
40
|
|
|
41
41
|
- (void)testApplicationTree
|
|
@@ -58,10 +58,10 @@
|
|
|
58
58
|
|
|
59
59
|
- (void)testActiveApplication
|
|
60
60
|
{
|
|
61
|
-
|
|
62
|
-
XCTAssertTrue([
|
|
61
|
+
FBApplication *systemApp = FBApplication.fb_systemApplication;
|
|
62
|
+
XCTAssertTrue([FBApplication fb_activeApplication].buttons[@"Alerts"].fb_isVisible);
|
|
63
63
|
[self goToSpringBoardFirstPage];
|
|
64
|
-
XCTAssertEqualObjects([
|
|
64
|
+
XCTAssertEqualObjects([FBApplication fb_activeApplication].bundleID, systemApp.bundleID);
|
|
65
65
|
XCTAssertTrue(systemApp.icons[@"Safari"].fb_isVisible);
|
|
66
66
|
}
|
|
67
67
|
|
|
@@ -102,14 +102,14 @@
|
|
|
102
102
|
}
|
|
103
103
|
|
|
104
104
|
NSError *error;
|
|
105
|
-
NSArray *auditIssues1 = [
|
|
105
|
+
NSArray *auditIssues1 = [FBApplication.fb_activeApplication fb_performAccessibilityAuditWithAuditTypes:~0UL
|
|
106
106
|
error:&error];
|
|
107
107
|
XCTAssertNotNil(auditIssues1);
|
|
108
108
|
XCTAssertNil(error);
|
|
109
109
|
|
|
110
110
|
NSMutableSet *set = [NSMutableSet new];
|
|
111
111
|
[set addObject:@"XCUIAccessibilityAuditTypeAll"];
|
|
112
|
-
NSArray *auditIssues2 = [
|
|
112
|
+
NSArray *auditIssues2 = [FBApplication.fb_activeApplication fb_performAccessibilityAuditWithAuditTypesSet:set.copy
|
|
113
113
|
error:&error];
|
|
114
114
|
XCTAssertEqualObjects(auditIssues1, auditIssues2);
|
|
115
115
|
XCTAssertNil(error);
|
|
@@ -9,12 +9,11 @@
|
|
|
9
9
|
|
|
10
10
|
#import <XCTest/XCTest.h>
|
|
11
11
|
|
|
12
|
+
#import "FBApplication.h"
|
|
12
13
|
#import "FBIntegrationTestCase.h"
|
|
13
14
|
#import "FBImageUtils.h"
|
|
14
15
|
#import "FBMacros.h"
|
|
15
16
|
#import "FBTestMacros.h"
|
|
16
|
-
#import "XCUIApplication.h"
|
|
17
|
-
#import "XCUIApplication+FBHelpers.h"
|
|
18
17
|
#import "XCUIDevice+FBHelpers.h"
|
|
19
18
|
#import "XCUIDevice+FBRotation.h"
|
|
20
19
|
#import "XCUIScreen.h"
|
|
@@ -102,7 +101,7 @@
|
|
|
102
101
|
NSError *error;
|
|
103
102
|
XCTAssertTrue([[XCUIDevice sharedDevice] fb_goToHomescreenWithError:&error]);
|
|
104
103
|
XCTAssertNil(error);
|
|
105
|
-
XCTAssertTrue([
|
|
104
|
+
XCTAssertTrue([FBApplication fb_activeApplication].icons[@"Safari"].exists);
|
|
106
105
|
}
|
|
107
106
|
|
|
108
107
|
- (void)testLockUnlockScreen
|
|
@@ -125,7 +124,7 @@
|
|
|
125
124
|
|
|
126
125
|
NSError *error;
|
|
127
126
|
XCTAssertTrue([XCUIDevice.sharedDevice fb_openUrl:@"https://apple.com" error:&error]);
|
|
128
|
-
FBAssertWaitTillBecomesTrue([
|
|
127
|
+
FBAssertWaitTillBecomesTrue([FBApplication.fb_activeApplication.bundleID isEqualToString:@"com.apple.mobilesafari"]);
|
|
129
128
|
XCTAssertNil(error);
|
|
130
129
|
}
|
|
131
130
|
|
|
@@ -139,7 +138,7 @@
|
|
|
139
138
|
XCTAssertTrue([XCUIDevice.sharedDevice fb_openUrl:@"https://apple.com"
|
|
140
139
|
withApplication:@"com.apple.mobilesafari"
|
|
141
140
|
error:&error]);
|
|
142
|
-
FBAssertWaitTillBecomesTrue([
|
|
141
|
+
FBAssertWaitTillBecomesTrue([FBApplication.fb_activeApplication.bundleID isEqualToString:@"com.apple.mobilesafari"]);
|
|
143
142
|
XCTAssertNil(error);
|
|
144
143
|
}
|
|
145
144
|
|
package/WebDriverAgentTests/UnitTests/Doubles/{XCUIApplicationDouble.h → FBApplicationDouble.h}
RENAMED
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
|
|
10
10
|
#import <Foundation/Foundation.h>
|
|
11
11
|
|
|
12
|
-
@interface
|
|
12
|
+
@interface FBApplicationDouble : NSObject
|
|
13
13
|
@property (nonatomic, assign, readonly) BOOL didTerminate;
|
|
14
14
|
@property (nonatomic, strong) NSString* bundleID;
|
|
15
15
|
@property (nonatomic) BOOL fb_shouldWaitForQuiescence;
|
package/WebDriverAgentTests/UnitTests/Doubles/{XCUIApplicationDouble.m → FBApplicationDouble.m}
RENAMED
|
@@ -7,13 +7,13 @@
|
|
|
7
7
|
* of patent rights can be found in the PATENTS file in the same directory.
|
|
8
8
|
*/
|
|
9
9
|
|
|
10
|
-
#import "
|
|
10
|
+
#import "FBApplicationDouble.h"
|
|
11
11
|
|
|
12
|
-
@interface
|
|
12
|
+
@interface FBApplicationDouble ()
|
|
13
13
|
@property (nonatomic, assign, readwrite) BOOL didTerminate;
|
|
14
14
|
@end
|
|
15
15
|
|
|
16
|
-
@implementation
|
|
16
|
+
@implementation FBApplicationDouble
|
|
17
17
|
|
|
18
18
|
- (instancetype)init
|
|
19
19
|
{
|
|
@@ -9,13 +9,13 @@
|
|
|
9
9
|
|
|
10
10
|
#import <XCTest/XCTest.h>
|
|
11
11
|
|
|
12
|
+
#import "FBApplicationDouble.h"
|
|
12
13
|
#import "FBSession.h"
|
|
13
14
|
#import "FBConfiguration.h"
|
|
14
|
-
#import "XCUIApplicationDouble.h"
|
|
15
15
|
|
|
16
16
|
@interface FBSessionTests : XCTestCase
|
|
17
17
|
@property (nonatomic, strong) FBSession *session;
|
|
18
|
-
@property (nonatomic, strong)
|
|
18
|
+
@property (nonatomic, strong) FBApplication *testedApplication;
|
|
19
19
|
@property (nonatomic) BOOL shouldTerminateAppValue;
|
|
20
20
|
@end
|
|
21
21
|
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
- (void)setUp
|
|
25
25
|
{
|
|
26
26
|
[super setUp];
|
|
27
|
-
self.testedApplication = (id)
|
|
27
|
+
self.testedApplication = (id)FBApplicationDouble.new;
|
|
28
28
|
self.shouldTerminateAppValue = FBConfiguration.shouldTerminateApp;
|
|
29
29
|
[FBConfiguration setShouldTerminateApp:NO];
|
|
30
30
|
self.session = [FBSession initWithApplication:self.testedApplication];
|
package/build/lib/utils.d.ts
CHANGED
|
@@ -58,9 +58,9 @@ export function getXctestrunFileName(deviceInfo: DeviceInfo, version: string): s
|
|
|
58
58
|
/**
|
|
59
59
|
* Creates xctestrun file per device & platform version.
|
|
60
60
|
* We expects to have WebDriverAgentRunner_iphoneos${sdkVersion|platformVersion}-arm64.xctestrun for real device
|
|
61
|
-
* and WebDriverAgentRunner_iphonesimulator${sdkVersion|platformVersion}
|
|
61
|
+
* and WebDriverAgentRunner_iphonesimulator${sdkVersion|platformVersion}-${x86_64|arm64}.xctestrun for simulator located @bootstrapPath
|
|
62
62
|
* Newer Xcode (Xcode 10.0 at least) generate xctestrun file following sdkVersion.
|
|
63
|
-
* e.g. Xcode which has iOS SDK Version 12.2
|
|
63
|
+
* e.g. Xcode which has iOS SDK Version 12.2 on an intel Mac host machine generates WebDriverAgentRunner_iphonesimulator.2-x86_64.xctestrun
|
|
64
64
|
* even if the cap has platform version 11.4
|
|
65
65
|
*
|
|
66
66
|
* @param {DeviceInfo} deviceInfo
|
package/build/lib/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"AAoCA,oCAA8C;;;;;;;;kBA+HhC,MAAM;;;;UACN,MAAM;;;;qBACN,MAAM;;;;kBACN,MAAM;;AAtDpB;;;;;GAKG;AACH,6CAHW,MAAM,eACN,MAAM,iBAchB;AAED;;;GAGG;AACH,4CAFW,MAAM,iBAiBhB;AAED,+FAKC;AAqCD;;;;;GAKG;AACH,sDAJW,MAAM,iBACN,MAAM,GAAC,MAAM,GACZ,MAAM,CAajB;AA4CD;;;;;GAKG;AACH,iDAJW,UAAU,WACV,MAAM,GACL,MAAM,CAOjB;AA3GD;;;;;;;EAOE;AACF;;;;;;;;;;;;;;;;GAgBG;AACH,6CATW,UAAU,cACV,MAAM,iBACN,MAAM,iBACN,MAAM,GAAC,MAAM,GACZ,QAAQ,MAAM,CAAC,CAa1B;AAqBD;;;;;;GAMG;AACH,iDALW,UAAU,cACV,MAAM,iBACN,MAAM,GACJ,QAAQ,MAAM,CAAC,CAkC3B;AAgBD;;;;;;GAMG;AACH,kCAJW,MAAM,QACN,OAAO,cAAc,EAAE,UAAU,GAC/B,QAAQ,IAAI,CAAC,CA8BzB;AAED;;;;GAIG;AACH,gDAFY,MAAM,CAIjB;AAED;;;;;GAKG;AACH,0CAHY,QAAQ,MAAM,QAAE,CAU3B;AAED;;;;;GAKG;AACH,yCAHW,MAAM,eACN,OAAO,iBAWjB;AAED;;;;;;;;;;;;GAYG;AACH,6CARW,MAAM,GAAC,MAAM,oCAMX,QAAQ,MAAM,EAAE,CAAC,CAgC7B;AA/UD,sEAqCC;AAED;;;;GAIG;AACH,qCAHW,MAAM,GACJ,OAAO,CAInB"}
|
package/build/lib/utils.js
CHANGED
|
@@ -13,6 +13,7 @@ const constants_1 = require("./constants");
|
|
|
13
13
|
const bluebird_1 = __importDefault(require("bluebird"));
|
|
14
14
|
const fs_1 = __importDefault(require("fs"));
|
|
15
15
|
const asyncbox_1 = require("asyncbox");
|
|
16
|
+
const os_1 = require("os");
|
|
16
17
|
const PROJECT_FILE = 'project.pbxproj';
|
|
17
18
|
/**
|
|
18
19
|
* Calculates the path to the current module's root folder
|
|
@@ -172,9 +173,9 @@ exports.setRealDeviceSecurity = setRealDeviceSecurity;
|
|
|
172
173
|
/**
|
|
173
174
|
* Creates xctestrun file per device & platform version.
|
|
174
175
|
* We expects to have WebDriverAgentRunner_iphoneos${sdkVersion|platformVersion}-arm64.xctestrun for real device
|
|
175
|
-
* and WebDriverAgentRunner_iphonesimulator${sdkVersion|platformVersion}
|
|
176
|
+
* and WebDriverAgentRunner_iphonesimulator${sdkVersion|platformVersion}-${x86_64|arm64}.xctestrun for simulator located @bootstrapPath
|
|
176
177
|
* Newer Xcode (Xcode 10.0 at least) generate xctestrun file following sdkVersion.
|
|
177
|
-
* e.g. Xcode which has iOS SDK Version 12.2
|
|
178
|
+
* e.g. Xcode which has iOS SDK Version 12.2 on an intel Mac host machine generates WebDriverAgentRunner_iphonesimulator.2-x86_64.xctestrun
|
|
178
179
|
* even if the cap has platform version 11.4
|
|
179
180
|
*
|
|
180
181
|
* @param {DeviceInfo} deviceInfo
|
|
@@ -257,9 +258,10 @@ exports.getXctestrunFilePath = getXctestrunFilePath;
|
|
|
257
258
|
* @return {string} returns xctestrunFilePath for given device
|
|
258
259
|
*/
|
|
259
260
|
function getXctestrunFileName(deviceInfo, version) {
|
|
260
|
-
|
|
261
|
-
? `
|
|
262
|
-
: `
|
|
261
|
+
const archSuffix = deviceInfo.isRealDevice
|
|
262
|
+
? `os${version}-arm64`
|
|
263
|
+
: `simulator${version}-${(0, os_1.arch)() === 'arm64' ? 'arm64' : 'x86_64'}`;
|
|
264
|
+
return `WebDriverAgentRunner_${isTvOS(deviceInfo.platformName) ? 'tvOS_appletv' : 'iphone'}${archSuffix}.xctestrun`;
|
|
263
265
|
}
|
|
264
266
|
exports.getXctestrunFileName = getXctestrunFileName;
|
|
265
267
|
/**
|
package/build/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":";;;;;;AAAA,6CAA4C;AAC5C,+CAAoC;AACpC,gDAAwB;AACxB,sDAA2B;AAC3B,oDAAuB;AACvB,2CAAuE;AACvE,wDAAyB;AACzB,4CAAqB;AACrB,uCAA4C;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"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"}
|
package/lib/utils.js
CHANGED
|
@@ -7,6 +7,7 @@ import { WDA_RUNNER_BUNDLE_ID, PLATFORM_NAME_TVOS } from './constants';
|
|
|
7
7
|
import B from 'bluebird';
|
|
8
8
|
import _fs from 'fs';
|
|
9
9
|
import { waitForCondition } from 'asyncbox';
|
|
10
|
+
import { arch } from 'os';
|
|
10
11
|
|
|
11
12
|
const PROJECT_FILE = 'project.pbxproj';
|
|
12
13
|
|
|
@@ -168,9 +169,9 @@ async function setRealDeviceSecurity (keychainPath, keychainPassword) {
|
|
|
168
169
|
/**
|
|
169
170
|
* Creates xctestrun file per device & platform version.
|
|
170
171
|
* We expects to have WebDriverAgentRunner_iphoneos${sdkVersion|platformVersion}-arm64.xctestrun for real device
|
|
171
|
-
* and WebDriverAgentRunner_iphonesimulator${sdkVersion|platformVersion}
|
|
172
|
+
* and WebDriverAgentRunner_iphonesimulator${sdkVersion|platformVersion}-${x86_64|arm64}.xctestrun for simulator located @bootstrapPath
|
|
172
173
|
* Newer Xcode (Xcode 10.0 at least) generate xctestrun file following sdkVersion.
|
|
173
|
-
* e.g. Xcode which has iOS SDK Version 12.2
|
|
174
|
+
* e.g. Xcode which has iOS SDK Version 12.2 on an intel Mac host machine generates WebDriverAgentRunner_iphonesimulator.2-x86_64.xctestrun
|
|
174
175
|
* even if the cap has platform version 11.4
|
|
175
176
|
*
|
|
176
177
|
* @param {DeviceInfo} deviceInfo
|
|
@@ -260,9 +261,10 @@ async function getXctestrunFilePath (deviceInfo, sdkVersion, bootstrapPath) {
|
|
|
260
261
|
* @return {string} returns xctestrunFilePath for given device
|
|
261
262
|
*/
|
|
262
263
|
function getXctestrunFileName (deviceInfo, version) {
|
|
263
|
-
|
|
264
|
-
? `
|
|
265
|
-
: `
|
|
264
|
+
const archSuffix = deviceInfo.isRealDevice
|
|
265
|
+
? `os${version}-arm64`
|
|
266
|
+
: `simulator${version}-${arch() === 'arm64' ? 'arm64' : 'x86_64'}`;
|
|
267
|
+
return `WebDriverAgentRunner_${isTvOS(deviceInfo.platformName) ? 'tvOS_appletv' : 'iphone'}${archSuffix}.xctestrun`;
|
|
266
268
|
}
|
|
267
269
|
|
|
268
270
|
/**
|