Skip to content

Commit 14eb716

Browse files
authored
Merge pull request #88 from appium/master
merge update
2 parents 911b508 + a1b5af6 commit 14eb716

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+590
-237
lines changed

.azure-pipelines.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml
22
variables:
3-
MIN_VM_IMAGE: macOS-12
4-
MIN_XCODE_VERSION: 13.1
5-
MIN_PLATFORM_VERSION: 15.0
6-
MIN_TV_PLATFORM_VERSION: 15.0
7-
MIN_TV_DEVICE_NAME: Apple TV 4K (2nd generation)
8-
MIN_IPHONE_DEVICE_NAME: iPhone 11
9-
MIN_IPAD_DEVICE_NAME: iPad Pro (11-inch) (3rd generation)
10-
MAX_VM_IMAGE: macOS-12
11-
MAX_XCODE_VERSION: 14.2
12-
MAX_PLATFORM_VERSION: 16.2
13-
MAX_PLATFORM_VERSION_TV: 16.1
14-
MAX_IPHONE_DEVICE_NAME: iPhone 13
15-
MAX_TV_DEVICE_NAME: Apple TV 4K (2nd generation)
16-
MAX_IPAD_DEVICE_NAME: iPad Pro (11-inch) (3rd generation)
3+
MIN_VM_IMAGE: macOS-13
4+
MIN_XCODE_VERSION: 14.3.1
5+
MIN_PLATFORM_VERSION: 16.4
6+
MIN_TV_PLATFORM_VERSION: 16.4
7+
MIN_TV_DEVICE_NAME: Apple TV 4K (3rd generation)
8+
MIN_IPHONE_DEVICE_NAME: iPhone 14 Plus
9+
MIN_IPAD_DEVICE_NAME: iPad Pro (11-inch) (4th generation)
10+
MAX_VM_IMAGE: macOS-14
11+
MAX_XCODE_VERSION: 15.4
12+
MAX_PLATFORM_VERSION: 17.5
13+
MAX_PLATFORM_VERSION_TV: 17.5
14+
MAX_IPHONE_DEVICE_NAME: iPhone 15 Plus
15+
MAX_TV_DEVICE_NAME: Apple TV 4K (3rd generation)
16+
MAX_IPAD_DEVICE_NAME: iPad Air 11-inch (M2)
1717
DEFAULT_NODE_VERSION: "18.x"
1818

1919
trigger:

.eslintignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

.eslintrc.json

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/functional-test.yml

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,21 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
test_targets:
15-
- XCODE_VERSION: 15.3
16-
IOS_VERSION: 17.4
15+
- HOST_OS: 'macos-15'
16+
XCODE_VERSION: '16.1.0'
17+
IOS_VERSION: '18.1'
18+
IOS_MODEL: iPhone 16 Plus
19+
- HOST_OS: 'macos-14'
20+
XCODE_VERSION: '15.3'
21+
IOS_VERSION: '17.4'
1722
IOS_MODEL: iPhone 15 Plus
18-
- XCODE_VERSION: 14.3.1
19-
IOS_VERSION: 16.4
23+
- HOST_OS: 'macos-13'
24+
XCODE_VERSION: 14.3.1
25+
IOS_VERSION: '16.4'
2026
IOS_MODEL: iPhone 14 Plus
2127

2228
# https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
23-
runs-on: macos-14
29+
runs-on: ${{matrix.test_targets.HOST_OS}}
2430
steps:
2531
- uses: actions/checkout@v3
2632
- uses: actions/setup-node@v3
@@ -34,20 +40,22 @@ jobs:
3440
mkdir -p ./Resources/WebDriverAgent.bundle
3541
name: Install dev dependencies
3642
37-
- uses: futureware-tech/simulator-action@v3
38-
with:
39-
model: ${{matrix.test_targets.IOS_MODEL}}
40-
os: iOS
41-
os_version: ${{matrix.test_targets.IOS_VERSION}}
42-
erase_before_boot: true
43-
# to prevent unexpected shutdown failure error
44-
shutdown_after_job: false
45-
name: Preboot Simulator
43+
- name: Prepare iOS simulator
44+
env:
45+
DEVICE_NAME: ${{matrix.test_targets.IOS_MODEL}}
46+
PLATFORM_VERSION: ${{matrix.test_targets.IOS_VERSION}}
47+
run: |
48+
open -Fn "$(xcode-select -p)/Applications/Simulator.app"
49+
udid=$(xcrun simctl list devices available -j | \
50+
node -p "Object.entries(JSON.parse(fs.readFileSync(0)).devices).filter((x) => x[0].includes('$PLATFORM_VERSION'.replace('.', '-'))).reduce((acc, x) => [...acc, ...x[1]], []).find(({name}) => name === '$DEVICE_NAME').udid")
51+
xcrun simctl bootstatus $udid -b
52+
xcrun simctl shutdown $udid
4653
4754
- run: npm run e2e-test
4855
name: Run functional tests
4956
env:
5057
CI: true
5158
_FORCE_LOGS: 1
59+
_LOG_TIMESTAMP: 1
5260
DEVICE_NAME: ${{matrix.test_targets.IOS_MODEL}}
5361
PLATFORM_VERSION: ${{matrix.test_targets.IOS_VERSION}}

CHANGELOG.md

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,127 @@
1+
## [8.12.1](https://github.com/appium/WebDriverAgent/compare/v8.12.0...v8.12.1) (2025-01-03)
2+
3+
### Miscellaneous Chores
4+
5+
* Bump eslint ([#965](https://github.com/appium/WebDriverAgent/issues/965)) ([17f49ec](https://github.com/appium/WebDriverAgent/commit/17f49ec5a54e97b0ef0d20a3e39fc96b32575e43))
6+
7+
## [8.12.0](https://github.com/appium/WebDriverAgent/compare/v8.11.3...v8.12.0) (2024-12-13)
8+
9+
### Features
10+
11+
* look for critical notification in respectSystemAlerts ([#962](https://github.com/appium/WebDriverAgent/issues/962)) ([916c8c5](https://github.com/appium/WebDriverAgent/commit/916c8c557a9366608df211f33b5b7fbb0354dad3))
12+
13+
## [8.11.3](https://github.com/appium/WebDriverAgent/compare/v8.11.2...v8.11.3) (2024-12-06)
14+
15+
### Miscellaneous Chores
16+
17+
* **deps:** bump @appium/support from 5.1.8 to 6.0.0 ([#960](https://github.com/appium/WebDriverAgent/issues/960)) ([dbeb09c](https://github.com/appium/WebDriverAgent/commit/dbeb09c89f8c02e00a7bdffe7899650d435f3575))
18+
19+
## [8.11.2](https://github.com/appium/WebDriverAgent/compare/v8.11.1...v8.11.2) (2024-12-03)
20+
21+
### Miscellaneous Chores
22+
23+
* **deps-dev:** bump mocha from 10.8.2 to 11.0.1 ([#959](https://github.com/appium/WebDriverAgent/issues/959)) ([55b49c8](https://github.com/appium/WebDriverAgent/commit/55b49c83581c9e88f70806d98015238de3104f19))
24+
25+
## [8.11.1](https://github.com/appium/WebDriverAgent/compare/v8.11.0...v8.11.1) (2024-11-11)
26+
27+
### Miscellaneous Chores
28+
29+
* bump appium-ios-device ([#955](https://github.com/appium/WebDriverAgent/issues/955)) ([021f349](https://github.com/appium/WebDriverAgent/commit/021f34901866f4a7870914c00781b83bd0cbddc4))
30+
31+
## [8.11.0](https://github.com/appium/WebDriverAgent/compare/v8.10.1...v8.11.0) (2024-11-11)
32+
33+
### Features
34+
35+
* Add support for excluded_attributes in JSON source hierarchy ([#953](https://github.com/appium/WebDriverAgent/issues/953)) ([6112223](https://github.com/appium/WebDriverAgent/commit/6112223b21026fae5545fe1b1433a09c67ff524b))
36+
37+
## [8.10.1](https://github.com/appium/WebDriverAgent/compare/v8.10.0...v8.10.1) (2024-11-10)
38+
39+
### Miscellaneous Chores
40+
41+
* remove unnecessary lines ([#954](https://github.com/appium/WebDriverAgent/issues/954)) ([940df80](https://github.com/appium/WebDriverAgent/commit/940df80937381b481a2762fbf86b6249804591bd))
42+
43+
## [8.10.0](https://github.com/appium/WebDriverAgent/compare/v8.9.4...v8.10.0) (2024-11-07)
44+
45+
### Features
46+
47+
* add useClearTextShortcut setting ([#952](https://github.com/appium/WebDriverAgent/issues/952)) ([61bc051](https://github.com/appium/WebDriverAgent/commit/61bc051180d691d26233c66a5a76ed20b7fa09d2))
48+
49+
## [8.9.4](https://github.com/appium/WebDriverAgent/compare/v8.9.3...v8.9.4) (2024-10-17)
50+
51+
### Bug Fixes
52+
53+
* Consider transient overlay windows when respectSystemAlerts is enabled ([#946](https://github.com/appium/WebDriverAgent/issues/946)) ([f0bdce7](https://github.com/appium/WebDriverAgent/commit/f0bdce7eb8fdb13d2309d28e936950c77f006b20))
54+
55+
## [8.9.3](https://github.com/appium/WebDriverAgent/compare/v8.9.2...v8.9.3) (2024-10-07)
56+
57+
### Miscellaneous Chores
58+
59+
* remove unused FBBaseActionsParser and cleanup imports in FBConfiguration ([#943](https://github.com/appium/WebDriverAgent/issues/943)) ([a2173d0](https://github.com/appium/WebDriverAgent/commit/a2173d05df8ef831310e805a8e6a8a8d17725201))
60+
61+
## [8.9.2](https://github.com/appium/WebDriverAgent/compare/v8.9.1...v8.9.2) (2024-09-13)
62+
63+
### Miscellaneous Chores
64+
65+
* **deps-dev:** bump sinon from 18.0.1 to 19.0.1 ([#938](https://github.com/appium/WebDriverAgent/issues/938)) ([3ef0093](https://github.com/appium/WebDriverAgent/commit/3ef009317801dca47efe34bd048d3cab2e644ee2))
66+
67+
## [8.9.1](https://github.com/appium/WebDriverAgent/compare/v8.9.0...v8.9.1) (2024-08-09)
68+
69+
### Bug Fixes
70+
71+
* Update swizzling of waitForQuiescenceIncludingAnimationsIdle: API for Xcode16-beta5 ([#935](https://github.com/appium/WebDriverAgent/issues/935)) ([2ccc436](https://github.com/appium/WebDriverAgent/commit/2ccc436991ca880a1dfdec688dc8167008fe382d))
72+
73+
## [8.9.0](https://github.com/appium/WebDriverAgent/compare/v8.8.0...v8.9.0) (2024-08-07)
74+
75+
### Features
76+
77+
* Add idleTimeoutMs param to the openUrl call ([#933](https://github.com/appium/WebDriverAgent/issues/933)) ([5e98841](https://github.com/appium/WebDriverAgent/commit/5e98841f56eda6454d67d813b921bfcf98f1ff78))
78+
79+
### Bug Fixes
80+
81+
* Revert the logic to open the default URL in Safari via deeplink ([#932](https://github.com/appium/WebDriverAgent/issues/932)) ([7c51145](https://github.com/appium/WebDriverAgent/commit/7c5114518509c9a399845283eca7708248fb838f))
82+
83+
## [8.8.0](https://github.com/appium/WebDriverAgent/compare/v8.7.12...v8.8.0) (2024-08-06)
84+
85+
### Features
86+
87+
* Open the default URL in Safari upon session startup ([#929](https://github.com/appium/WebDriverAgent/issues/929)) ([97cf91d](https://github.com/appium/WebDriverAgent/commit/97cf91de34dc53e5f75f91829dc43224101c1b45))
88+
89+
## [8.7.12](https://github.com/appium/WebDriverAgent/compare/v8.7.11...v8.7.12) (2024-08-02)
90+
91+
### Miscellaneous Chores
92+
93+
* Replace fancy-log dependency with appium logger ([#928](https://github.com/appium/WebDriverAgent/issues/928)) ([5d2ec24](https://github.com/appium/WebDriverAgent/commit/5d2ec249488655451e2d46384e560fee7e08e840))
94+
95+
## [8.7.11](https://github.com/appium/WebDriverAgent/compare/v8.7.10...v8.7.11) (2024-07-29)
96+
97+
### Bug Fixes
98+
99+
* Respond to /health with a proper HTML ([#925](https://github.com/appium/WebDriverAgent/issues/925)) ([42c519f](https://github.com/appium/WebDriverAgent/commit/42c519f9df7beec81175fd38af388975d6f6b800))
100+
101+
## [8.7.10](https://github.com/appium/WebDriverAgent/compare/v8.7.9...v8.7.10) (2024-07-29)
102+
103+
### Miscellaneous Chores
104+
105+
* **deps-dev:** bump @types/node from 20.14.13 to 22.0.0 ([#926](https://github.com/appium/WebDriverAgent/issues/926)) ([1699023](https://github.com/appium/WebDriverAgent/commit/1699023086a243c3d86ddae4da8342c6beda3f48))
106+
107+
## [8.7.9](https://github.com/appium/WebDriverAgent/compare/v8.7.8...v8.7.9) (2024-07-21)
108+
109+
### Miscellaneous Chores
110+
111+
* keep error handling for the future possible usage ([#921](https://github.com/appium/WebDriverAgent/issues/921)) ([2f90739](https://github.com/appium/WebDriverAgent/commit/2f90739340d70073b48c703b36b9a313d3618972))
112+
113+
## [8.7.8](https://github.com/appium/WebDriverAgent/compare/v8.7.7...v8.7.8) (2024-07-18)
114+
115+
### Bug Fixes
116+
117+
* do nothing for an empty array in w3c actions ([#919](https://github.com/appium/WebDriverAgent/issues/919)) ([9e70ec1](https://github.com/appium/WebDriverAgent/commit/9e70ec1dbec1d1844278a58297a5b956ebaeb7fc))
118+
119+
## [8.7.7](https://github.com/appium/WebDriverAgent/compare/v8.7.6...v8.7.7) (2024-07-18)
120+
121+
### Bug Fixes
122+
123+
* Pass-through modifier keys ([#918](https://github.com/appium/WebDriverAgent/issues/918)) ([29d0e5c](https://github.com/appium/WebDriverAgent/commit/29d0e5cb2a19809e1babb06e5adaa49b43c754a5))
124+
1125
## [8.7.6](https://github.com/appium/WebDriverAgent/compare/v8.7.5...v8.7.6) (2024-07-02)
2126

3127
### Miscellaneous Chores

Configurations/IOSSettings.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ RUN_CLANG_STATIC_ANALYZER = YES
2828

2929
GCC_PREPROCESSOR_DEFINITIONS = $(inherited)
3030

31-
WARNING_CFLAGS = $(inherited) -Weverything -Wno-objc-missing-property-synthesis -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-gnu-statement-expression -Wno-language-extension-token -Wno-overriding-method-mismatch -Wno-missing-variable-declarations -Rno-module-build -Wno-auto-import -Wno-objc-interface-ivars -Wno-documentation-unknown-command -Wno-reserved-id-macro -Wno-unused-parameter -Wno-gnu-conditional-omitted-operand -Wno-explicit-ownership-type -Wno-date-time -Wno-cast-align -Wno-cstring-format-directive -Wno-double-promotion -Wno-partial-availability
31+
WARNING_CFLAGS = $(inherited) -Weverything -Wno-objc-missing-property-synthesis -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-gnu-statement-expression -Wno-language-extension-token -Wno-overriding-method-mismatch -Wno-missing-variable-declarations -Rno-module-build -Wno-auto-import -Wno-objc-interface-ivars -Wno-documentation-unknown-command -Wno-reserved-id-macro -Wno-unused-parameter -Wno-gnu-conditional-omitted-operand -Wno-explicit-ownership-type -Wno-date-time -Wno-cast-align -Wno-cstring-format-directive -Wno-double-promotion -Wno-partial-availability -Wno-declaration-after-statement -Wno-objc-messaging-id -Wno-direct-ivar-access -Wno-cast-qual -Wno-deprecated-declarations

Configurations/TVOSSettings.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ RUN_CLANG_STATIC_ANALYZER = YES
2828

2929
GCC_PREPROCESSOR_DEFINITIONS = $(inherited)
3030

31-
WARNING_CFLAGS = $(inherited) -Weverything -Wno-objc-missing-property-synthesis -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-gnu-statement-expression -Wno-language-extension-token -Wno-overriding-method-mismatch -Wno-missing-variable-declarations -Rno-module-build -Wno-auto-import -Wno-objc-interface-ivars -Wno-documentation-unknown-command -Wno-reserved-id-macro -Wno-unused-parameter -Wno-gnu-conditional-omitted-operand -Wno-explicit-ownership-type -Wno-date-time -Wno-cast-align -Wno-cstring-format-directive -Wno-double-promotion -Wno-partial-availability
31+
WARNING_CFLAGS = $(inherited) -Weverything -Wno-objc-missing-property-synthesis -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-gnu-statement-expression -Wno-language-extension-token -Wno-overriding-method-mismatch -Wno-missing-variable-declarations -Rno-module-build -Wno-auto-import -Wno-objc-interface-ivars -Wno-documentation-unknown-command -Wno-reserved-id-macro -Wno-unused-parameter -Wno-gnu-conditional-omitted-operand -Wno-explicit-ownership-type -Wno-date-time -Wno-cast-align -Wno-cstring-format-directive -Wno-double-promotion -Wno-partial-availability -Wno-declaration-after-statement -Wno-objc-messaging-id -Wno-direct-ivar-access -Wno-cast-qual -Wno-deprecated-declarations

PrivateHeaders/XCTest/XCUIApplicationProcess.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,11 @@
6565
- (void)terminate;
6666
- (void)waitForViewControllerViewDidDisappearWithTimeout:(double)arg1;
6767
- (void)waitForAutomationSession;
68+
// Before Xcode16-beta5
6869
- (void)waitForQuiescenceIncludingAnimationsIdle:(BOOL)arg1;
70+
// Since Xcode16-beta5
71+
- (void)waitForQuiescenceIncludingAnimationsIdle:(BOOL)arg1 isPreEvent:(BOOL)arg2;
72+
6973

7074
- (id)shortDescription;
7175
- (id)_queue_description;

Scripts/build-webdriveragent.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ async function buildWebDriverAgent (xcodeVersion) {
3434
await exec('xcodebuild', ['clean', '-derivedDataPath', DERIVED_DATA_PATH, '-scheme', 'WebDriverAgentRunner'], {
3535
cwd: ROOT_DIR
3636
});
37-
} catch (ign) {}
37+
} catch {}
3838

3939
// Get Xcode version
4040
xcodeVersion = xcodeVersion || await xcode.getVersion();

Scripts/fetch-prebuilt-wda.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ async function fetchPrebuiltWebDriverAgentAssets () {
4747
try {
4848
const nameOfAgent = _.last(url.split('/'));
4949
agentsDownloading.push(downloadAgent(url, path.join(webdriveragentsDir, nameOfAgent)));
50-
} catch (ign) { }
50+
} catch { }
5151
}
5252

5353
// Wait for them all to finish

0 commit comments

Comments
 (0)