appium-webdriveragent 4.2.0 → 4.4.0

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.
Files changed (13) hide show
  1. package/WebDriverAgent.xcodeproj/project.xcworkspace/xcuserdata/elf.xcuserdatad/UserInterfaceState.xcuserstate +0 -0
  2. package/WebDriverAgent.xcodeproj/xcuserdata/elf.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +91 -0
  3. package/WebDriverAgent.xcodeproj/xcuserdata/elf.xcuserdatad/xcschemes/xcschememanagement.plist +59 -0
  4. package/WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.h +7 -0
  5. package/WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.m +7 -0
  6. package/WebDriverAgentLib/Commands/FBCustomCommands.m +20 -3
  7. package/WebDriverAgentLib/Utilities/FBScreenshot.m +2 -1
  8. package/WebDriverAgentRunner-Runner.app.zip +0 -0
  9. package/build/lib/webdriveragent.js +36 -59
  10. package/build/lib/xcodebuild.js +23 -40
  11. package/lib/webdriveragent.js +36 -34
  12. package/lib/xcodebuild.js +24 -23
  13. package/package.json +2 -2
package/WebDriverAgent.xcodeproj/xcuserdata/elf.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist ADDED
@@ -0,0 +1,91 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <Bucket
3
+ uuid = "2F0174F2-ED3F-4D11-9A17-7C590053D796"
4
+ type = "1"
5
+ version = "2.0">
6
+ <Breakpoints>
7
+ <BreakpointProxy
8
+ BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
9
+ <BreakpointContent
10
+ uuid = "471ECA8C-2C53-4C59-88DB-1C1CB3D61601"
11
+ shouldBeEnabled = "No"
12
+ ignoreCount = "0"
13
+ continueAfterRunningActions = "No"
14
+ breakpointStackSelectionBehavior = "1"
15
+ scope = "1"
16
+ stopOnStyle = "0">
17
+ </BreakpointContent>
18
+ </BreakpointProxy>
19
+ <BreakpointProxy
20
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
21
+ <BreakpointContent
22
+ uuid = "C2E06865-6A52-4686-9771-279AF13ABF8A"
23
+ shouldBeEnabled = "Yes"
24
+ ignoreCount = "0"
25
+ continueAfterRunningActions = "No"
26
+ filePath = "WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m"
27
+ timestampString = "0"
28
+ startingColumnNumber = "9223372036854775807"
29
+ endingColumnNumber = "9223372036854775807"
30
+ startingLineNumber = "264"
31
+ endingLineNumber = "264">
32
+ </BreakpointContent>
33
+ </BreakpointProxy>
34
+ <BreakpointProxy
35
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
36
+ <BreakpointContent
37
+ uuid = "54216FE6-E240-47F1-88D3-D450CF0AF44E"
38
+ shouldBeEnabled = "Yes"
39
+ ignoreCount = "0"
40
+ continueAfterRunningActions = "No"
41
+ filePath = "WebDriverAgentLib/Categories/XCUIElement+FBResolve.m"
42
+ startingColumnNumber = "9223372036854775807"
43
+ endingColumnNumber = "9223372036854775807"
44
+ startingLineNumber = "37"
45
+ endingLineNumber = "37"
46
+ landmarkName = "-fb_stableInstance"
47
+ landmarkType = "7">
48
+ <Locations>
49
+ <Location
50
+ uuid = "54216FE6-E240-47F1-88D3-D450CF0AF44E - b09f4ce1ce926e6"
51
+ shouldBeEnabled = "Yes"
52
+ ignoreCount = "0"
53
+ continueAfterRunningActions = "No"
54
+ symbolName = "-[XCUIElement(FBResolve) fb_stableInstance]"
55
+ moduleName = "WebDriverAgentLib"
56
+ usesParentBreakpointCondition = "Yes"
57
+ urlString = "file:///Users/elf/code/WebDriverAgent/WebDriverAgentLib/Categories/XCUIElement+FBResolve.m"
58
+ startingColumnNumber = "9223372036854775807"
59
+ endingColumnNumber = "9223372036854775807"
60
+ startingLineNumber = "37"
61
+ endingLineNumber = "37"
62
+ offsetFromSymbolStart = "19">
63
+ </Location>
64
+ <Location
65
+ shouldBeEnabled = "Yes"
66
+ ignoreCount = "0"
67
+ continueAfterRunningActions = "No"
68
+ usesParentBreakpointCondition = "Yes"
69
+ offsetFromSymbolStart = "0">
70
+ </Location>
71
+ </Locations>
72
+ </BreakpointContent>
73
+ </BreakpointProxy>
74
+ <BreakpointProxy
75
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
76
+ <BreakpointContent
77
+ uuid = "D3009B57-42BC-4905-99BC-70232544FAFB"
78
+ shouldBeEnabled = "Yes"
79
+ ignoreCount = "0"
80
+ continueAfterRunningActions = "No"
81
+ filePath = "WebDriverAgentTests/IntegrationTests/FBAlertTests.m"
82
+ startingColumnNumber = "5"
83
+ endingColumnNumber = "64"
84
+ startingLineNumber = "32"
85
+ endingLineNumber = "32"
86
+ landmarkName = "-setUp"
87
+ landmarkType = "7">
88
+ </BreakpointContent>
89
+ </BreakpointProxy>
90
+ </Breakpoints>
91
+ </Bucket>
package/WebDriverAgent.xcodeproj/xcuserdata/elf.xcuserdatad/xcschemes/xcschememanagement.plist ADDED
@@ -0,0 +1,59 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3
+ <plist version="1.0">
4
+ <dict>
5
+ <key>SchemeUserState</key>
6
+ <dict>
7
+ <key>IntegrationApp.xcscheme_^#shared#^_</key>
8
+ <dict>
9
+ <key>orderHint</key>
10
+ <integer>0</integer>
11
+ </dict>
12
+ <key>IntegrationTests_1.xcscheme_^#shared#^_</key>
13
+ <dict>
14
+ <key>orderHint</key>
15
+ <integer>1</integer>
16
+ </dict>
17
+ <key>IntegrationTests_2.xcscheme_^#shared#^_</key>
18
+ <dict>
19
+ <key>orderHint</key>
20
+ <integer>2</integer>
21
+ </dict>
22
+ <key>IntegrationTests_3.xcscheme_^#shared#^_</key>
23
+ <dict>
24
+ <key>orderHint</key>
25
+ <integer>3</integer>
26
+ </dict>
27
+ <key>WebDriverAgentLib copy.xcscheme_^#shared#^_</key>
28
+ <dict>
29
+ <key>orderHint</key>
30
+ <integer>9</integer>
31
+ </dict>
32
+ <key>WebDriverAgentLib.xcscheme_^#shared#^_</key>
33
+ <dict>
34
+ <key>orderHint</key>
35
+ <integer>4</integer>
36
+ </dict>
37
+ <key>WebDriverAgentLib_tvOS.xcscheme_^#shared#^_</key>
38
+ <dict>
39
+ <key>orderHint</key>
40
+ <integer>5</integer>
41
+ </dict>
42
+ <key>WebDriverAgentRunner-nodebug.xcscheme_^#shared#^_</key>
43
+ <dict>
44
+ <key>orderHint</key>
45
+ <integer>7</integer>
46
+ </dict>
47
+ <key>WebDriverAgentRunner.xcscheme_^#shared#^_</key>
48
+ <dict>
49
+ <key>orderHint</key>
50
+ <integer>6</integer>
51
+ </dict>
52
+ <key>WebDriverAgentRunner_tvOS.xcscheme_^#shared#^_</key>
53
+ <dict>
54
+ <key>orderHint</key>
55
+ <integer>8</integer>
56
+ </dict>
57
+ </dict>
58
+ </dict>
59
+ </plist>
package/WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.h CHANGED
@@ -135,6 +135,13 @@ typedef NS_ENUM(NSUInteger, FBUIInterfaceAppearance) {
135
135
  */
136
136
  - (BOOL)fb_setAppearance:(FBUIInterfaceAppearance)appearance error:(NSError **)error;
137
137
 
138
+ /**
139
+ Get current appearance prefefence.
140
+
141
+ @return 0 (automatic), 1 (light) or 2 (dark), or nil
142
+ */
143
+ - (nullable NSNumber *)fb_getAppearance;
144
+
138
145
  @end
139
146
 
140
147
  NS_ASSUME_NONNULL_END
package/WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.m CHANGED
@@ -326,4 +326,11 @@ static bool fb_isLocked;
326
326
  buildError:error];
327
327
  }
328
328
 
329
+ - (NSNumber *)fb_getAppearance
330
+ {
331
+ return [self respondsToSelector:@selector(appearanceMode)]
332
+ ? [NSNumber numberWithLongLong:[self appearanceMode]]
333
+ : nil;
334
+ }
335
+
329
336
  @end
package/WebDriverAgentLib/Commands/FBCustomCommands.m CHANGED
@@ -426,6 +426,16 @@
426
426
  */
427
427
  + (NSString *)userInterfaceStyle
428
428
  {
429
+
430
+ if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
431
+ // Only iOS 15+ simulators/devices return correct data while
432
+ // the api itself works in iOS 13 and 14 that has style preference.
433
+ NSNumber *appearance = [XCUIDevice.sharedDevice fb_getAppearance];
434
+ if (appearance != nil) {
435
+ return [self getAppearanceName:appearance];
436
+ }
437
+ }
438
+
429
439
  static id userInterfaceStyle = nil;
430
440
  static dispatch_once_t styleOnceToken;
431
441
  dispatch_once(&styleOnceToken, ^{
@@ -441,10 +451,17 @@
441
451
  return @"unsupported";
442
452
  }
443
453
 
444
- switch ([userInterfaceStyle integerValue]) {
445
- case 1: // UIUserInterfaceStyleLight
454
+ return [self getAppearanceName:userInterfaceStyle];
455
+ }
456
+
457
+ + (NSString *)getAppearanceName:(NSNumber *)appearance
458
+ {
459
+ switch ([appearance longLongValue]) {
460
+ case FBUIInterfaceAppearanceUnspecified:
461
+ return @"automatic";
462
+ case FBUIInterfaceAppearanceLight:
446
463
  return @"light";
447
- case 2: // UIUserInterfaceStyleDark
464
+ case FBUIInterfaceAppearanceDark:
448
465
  return @"dark";
449
466
  default:
450
467
  return @"unknown";
package/WebDriverAgentLib/Utilities/FBScreenshot.m CHANGED
@@ -212,7 +212,8 @@ NSString *formatTimeInterval(NSTimeInterval interval) {
212
212
  dispatch_once(&shouldUseSRApi, ^{
213
213
  if ([proxy respondsToSelector:@selector(_XCT_requestScreenshot:withReply:)]) {
214
214
  #if TARGET_OS_SIMULATOR
215
- result = YES;
215
+ // Required to support simulators running iOS 14.4 and below with Xcode 12.5 and above due to unsupported API on the simulator side.
216
+ result = SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"14.5");
216
217
  #else
217
218
  result = SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0");
218
219
  #endif
package/WebDriverAgentRunner-Runner.app.zip CHANGED
Binary file