appium-webdriveragent 16.1.6 → 16.2.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 (41) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/WebDriverAgentLib/Categories/XCUIApplication+FBTouchAction.m +1 -1
  3. package/WebDriverAgentLib/Categories/XCUIApplicationProcess+FBQuiescence.m +4 -4
  4. package/WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.m +1 -1
  5. package/WebDriverAgentLib/Categories/XCUIDevice+FBRotation.m +1 -1
  6. package/WebDriverAgentLib/Categories/XCUIElement+FBFind.m +1 -1
  7. package/WebDriverAgentLib/Categories/XCUIElement+FBScrolling.m +1 -1
  8. package/WebDriverAgentLib/Categories/XCUIElement+FBTVFocuse.m +1 -1
  9. package/WebDriverAgentLib/Categories/XCUIElement+FBTyping.m +5 -5
  10. package/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m +4 -4
  11. package/WebDriverAgentLib/Categories/XCUIElement+FBWebDriverAttributes.m +1 -1
  12. package/WebDriverAgentLib/Commands/FBElementCommands.m +3 -3
  13. package/WebDriverAgentLib/Commands/FBFindElementCommands.m +7 -7
  14. package/WebDriverAgentLib/Commands/FBSessionCommands.m +10 -10
  15. package/WebDriverAgentLib/FBAlert.m +7 -7
  16. package/WebDriverAgentLib/Info.plist +2 -2
  17. package/WebDriverAgentLib/Routing/FBResponsePayload.m +1 -1
  18. package/WebDriverAgentLib/Routing/FBSession.m +3 -3
  19. package/WebDriverAgentLib/Routing/FBWebServer.m +7 -7
  20. package/WebDriverAgentLib/Utilities/FBConfiguration.h +75 -142
  21. package/WebDriverAgentLib/Utilities/FBConfiguration.m +128 -374
  22. package/WebDriverAgentLib/Utilities/FBImageProcessor.m +6 -6
  23. package/WebDriverAgentLib/Utilities/FBLogger.m +2 -2
  24. package/WebDriverAgentLib/Utilities/FBMjpegServer.m +4 -4
  25. package/WebDriverAgentLib/Utilities/FBSettingsHandler.m +65 -61
  26. package/WebDriverAgentLib/Utilities/FBW3CActionsSynthesizer.m +1 -1
  27. package/WebDriverAgentLib/Utilities/FBXCTestDaemonsProxy.m +1 -1
  28. package/WebDriverAgentLib/Utilities/FBXCodeCompatibility.m +2 -2
  29. package/WebDriverAgentLib/Utilities/FBXPath.m +9 -9
  30. package/WebDriverAgentRunner/UITestingUITests.m +7 -7
  31. package/WebDriverAgentTests/IntegrationTests/FBAlertTests.m +5 -5
  32. package/WebDriverAgentTests/IntegrationTests/FBConfigurationTests.m +5 -5
  33. package/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m +6 -6
  34. package/WebDriverAgentTests/IntegrationTests/FBXPathIntegrationTests.m +3 -3
  35. package/WebDriverAgentTests/IntegrationTests/XCUIElementAttributesTests.m +5 -5
  36. package/WebDriverAgentTests/UnitTests/FBConfigurationTests.m +8 -8
  37. package/WebDriverAgentTests/UnitTests/FBSessionTests.m +3 -3
  38. package/build/lib/wda-strategies.js +1 -1
  39. package/build/lib/wda-strategies.js.map +1 -1
  40. package/lib/wda-strategies.ts +1 -1
  41. package/package.json +1 -1
package/WebDriverAgentTests/IntegrationTests/XCUIElementAttributesTests.m CHANGED
@@ -176,7 +176,7 @@
176
176
 
177
177
  - (void)testCompactResponseYesWithResponseAttributesSet
178
178
  {
179
- [FBConfiguration setElementResponseAttributes:@"name,text,enabled"];
179
+ FBConfiguration.sharedInstance.elementResponseAttributes = @"name,text,enabled";
180
180
  XCUIElement *alertsButton = self.testedApplication.buttons[@"Alerts"];
181
181
  NSDictionary *fields = FBDictionaryResponseWithElement(alertsButton, YES);
182
182
  XCTAssertNotNil(fields[@"ELEMENT"]);
@@ -186,7 +186,7 @@
186
186
 
187
187
  - (void)testCompactResponseNoWithResponseAttributesSet
188
188
  {
189
- [FBConfiguration setElementResponseAttributes:@"name,text,enabled"];
189
+ FBConfiguration.sharedInstance.elementResponseAttributes = @"name,text,enabled";
190
190
  XCUIElement *alertsButton = self.testedApplication.buttons[@"Alerts"];
191
191
  NSDictionary *fields = FBDictionaryResponseWithElement(alertsButton, NO);
192
192
  XCTAssertNotNil(fields[@"ELEMENT"]);
@@ -199,7 +199,7 @@
199
199
 
200
200
  - (void)testInvalidAttribute
201
201
  {
202
- [FBConfiguration setElementResponseAttributes:@"invalid_field,name"];
202
+ FBConfiguration.sharedInstance.elementResponseAttributes = @"invalid_field,name";
203
203
  XCUIElement *alertsButton = self.testedApplication.buttons[@"Alerts"];
204
204
  NSDictionary *fields = FBDictionaryResponseWithElement(alertsButton, NO);
205
205
  XCTAssertNotNil(fields[@"ELEMENT"]);
@@ -210,7 +210,7 @@
210
210
 
211
211
  - (void)testKnownAttributes
212
212
  {
213
- [FBConfiguration setElementResponseAttributes:@"name,type,label,text,rect,enabled,displayed,selected"];
213
+ FBConfiguration.sharedInstance.elementResponseAttributes = @"name,type,label,text,rect,enabled,displayed,selected";
214
214
  XCUIElement *alertsButton = self.testedApplication.buttons[@"Alerts"];
215
215
  NSDictionary *fields = FBDictionaryResponseWithElement(alertsButton, NO);
216
216
  XCTAssertNotNil(fields[@"ELEMENT"]);
@@ -228,7 +228,7 @@
228
228
 
229
229
  - (void)testArbitraryAttributes
230
230
  {
231
- [FBConfiguration setElementResponseAttributes:@"attribute/name,attribute/value"];
231
+ FBConfiguration.sharedInstance.elementResponseAttributes = @"attribute/name,attribute/value";
232
232
  XCUIElement *alertsButton = self.testedApplication.buttons[@"Alerts"];
233
233
  NSDictionary *fields = FBDictionaryResponseWithElement(alertsButton, NO);
234
234
  XCTAssertNotNil(fields[@"ELEMENT"]);
package/WebDriverAgentTests/UnitTests/FBConfigurationTests.m CHANGED
@@ -27,46 +27,46 @@
27
27
 
28
28
  - (void)testBindingPortDefault
29
29
  {
30
- XCTAssertTrue(NSEqualRanges([FBConfiguration bindingPortRange], NSMakeRange(8100, 100)));
30
+ XCTAssertTrue(NSEqualRanges(FBConfiguration.sharedInstance.bindingPortRange, NSMakeRange(8100, 100)));
31
31
  }
32
32
 
33
33
  - (void)testBindingPortEnvironmentOverwrite
34
34
  {
35
35
  setenv("USE_PORT", "1000", 1);
36
- XCTAssertTrue(NSEqualRanges([FBConfiguration bindingPortRange], NSMakeRange(1000, 1)));
36
+ XCTAssertTrue(NSEqualRanges(FBConfiguration.sharedInstance.bindingPortRange, NSMakeRange(1000, 1)));
37
37
  }
38
38
 
39
39
  - (void)testVerboseLoggingDefault
40
40
  {
41
- XCTAssertFalse([FBConfiguration verboseLoggingEnabled]);
41
+ XCTAssertFalse(FBConfiguration.sharedInstance.verboseLoggingEnabled);
42
42
  }
43
43
 
44
44
  - (void)testVerboseLoggingEnvironmentOverwrite
45
45
  {
46
46
  setenv("VERBOSE_LOGGING", "YES", 1);
47
- XCTAssertTrue([FBConfiguration verboseLoggingEnabled]);
47
+ XCTAssertTrue(FBConfiguration.sharedInstance.verboseLoggingEnabled);
48
48
  }
49
49
 
50
50
  - (void)testBindingIPDefault
51
51
  {
52
- XCTAssertNil([FBConfiguration bindingIPAddress]);
52
+ XCTAssertNil(FBConfiguration.sharedInstance.bindingIPAddress);
53
53
  }
54
54
 
55
55
  - (void)testBindingIPEnvironmentOverwrite
56
56
  {
57
57
  setenv("USE_IP", "192.168.1.100", 1);
58
- XCTAssertEqualObjects([FBConfiguration bindingIPAddress], @"192.168.1.100");
58
+ XCTAssertEqualObjects(FBConfiguration.sharedInstance.bindingIPAddress, @"192.168.1.100");
59
59
  }
60
60
 
61
61
  - (void)testHttpRequestBodySizeLimitDefault
62
62
  {
63
- XCTAssertEqual([FBConfiguration httpRequestBodySizeLimit], 1024ull * 1024ull * 1024ull);
63
+ XCTAssertEqual(FBConfiguration.sharedInstance.httpRequestBodySizeLimit, 1024ull * 1024ull * 1024ull);
64
64
  }
65
65
 
66
66
  - (void)testHttpRequestBodySizeLimitEnvironmentOverwrite
67
67
  {
68
68
  setenv("MAX_HTTP_REQUEST_BODY_SIZE", "1024", 1);
69
- XCTAssertEqual([FBConfiguration httpRequestBodySizeLimit], 1024ull);
69
+ XCTAssertEqual(FBConfiguration.sharedInstance.httpRequestBodySizeLimit, 1024ull);
70
70
  }
71
71
 
72
72
  @end
package/WebDriverAgentTests/UnitTests/FBSessionTests.m CHANGED
@@ -24,15 +24,15 @@
24
24
  {
25
25
  [super setUp];
26
26
  self.testedApplication = (id)XCUIApplicationDouble.new;
27
- self.shouldTerminateAppValue = FBConfiguration.shouldTerminateApp;
28
- [FBConfiguration setShouldTerminateApp:NO];
27
+ self.shouldTerminateAppValue = FBConfiguration.sharedInstance.shouldTerminateApp;
28
+ FBConfiguration.sharedInstance.shouldTerminateApp = NO;
29
29
  self.session = [FBSession initWithApplication:self.testedApplication];
30
30
  }
31
31
 
32
32
  - (void)tearDown
33
33
  {
34
34
  [self.session kill];
35
- [FBConfiguration setShouldTerminateApp:self.shouldTerminateAppValue];
35
+ FBConfiguration.sharedInstance.shouldTerminateApp = self.shouldTerminateAppValue;
36
36
  [super tearDown];
37
37
  }
38
38
 
package/build/lib/wda-strategies.js CHANGED
@@ -227,7 +227,7 @@ async function quitXcodebuild(ctx) {
227
227
  }
228
228
  function createPreinstalledWdaEnvironment(ctx) {
229
229
  const xctestEnv = {
230
- USE_PORT: ctx.wdaLocalPort || WDA_AGENT_PORT,
230
+ USE_PORT: ctx.wdaRemotePort || WDA_AGENT_PORT,
231
231
  WDA_PRODUCT_BUNDLE_IDENTIFIER: ctx.bundleIdForXctest,
232
232
  };
233
233
  if (ctx.mjpegServerPort) {
package/build/lib/wda-strategies.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"wda-strategies.js","sourceRoot":"","sources":["../../lib/wda-strategies.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"wda-strategies.js","sourceRoot":"","sources":["../../lib/wda-strategies.ts"],"names":[],"mappings":"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"}
package/lib/wda-strategies.ts CHANGED
@@ -317,7 +317,7 @@ async function quitXcodebuild(ctx: WdaStartupStrategyContext): Promise<void> {
317
317
 
318
318
  function createPreinstalledWdaEnvironment(ctx: WdaStartupStrategyContext): WdaLaunchEnvironment {
319
319
  const xctestEnv: WdaLaunchEnvironment = {
320
- USE_PORT: ctx.wdaLocalPort || WDA_AGENT_PORT,
320
+ USE_PORT: ctx.wdaRemotePort || WDA_AGENT_PORT,
321
321
  WDA_PRODUCT_BUNDLE_IDENTIFIER: ctx.bundleIdForXctest,
322
322
  };
323
323
  if (ctx.mjpegServerPort) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appium-webdriveragent",
3
- "version": "16.1.6",
3
+ "version": "16.2.0",
4
4
  "description": "Package bundling WebDriverAgent",
5
5
  "keywords": [
6
6
  "Appium",