Skip to content

Commit 52be58b

Browse files
Merge pull request #140 from braintree/DTBTWEB-850-update-wdio
fix failing functional/smoke tests
2 parents 7cb83b8 + f02e0e2 commit 52be58b

File tree

15 files changed

+8006
-9680
lines changed

15 files changed

+8006
-9680
lines changed

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
- [ ] Tested and confirmed flows affected by this change are functioning as expected
1010

1111
## Authors
12-
>
12+
1313
> List GitHub usernames for everyone who contributed to this pull request.
1414
1515
### Reviewers

.github/workflows/ci-functional-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: "Functional Tests"
33
on:
44
push:
55
branches:
6-
- 'main'
6+
- "main"
77
workflow_dispatch:
88
pull_request:
99
branches:
10-
- '*'
10+
- "*"
1111

1212
jobs:
1313
build:

.github/workflows/ci-unit-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ name: "Unit Tests"
33
on:
44
push:
55
branches:
6-
- 'main'
6+
- "main"
77
workflow_dispatch:
88
workflow_call:
99
pull_request:
1010
branches:
11-
- '*'
11+
- "*"
1212

1313
jobs:
1414
build:

.github/workflows/publish.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
# This workflow will run tests using node, bump the npm version, deploy to npm, and create a release with notes
1+
# This workflow will run tests using node, bump the npm version, deploy to npm, and create a release with notes
22

3-
name: Publish to npm
3+
name: Publish to npm
44
run-name: Deploy ${{ github.repository }} to npmjs by @${{ github.actor }}
55
on:
6-
workflow_dispatch:
7-
inputs:
8-
version_type:
9-
description: "Version bump type (major, minor, patch)"
10-
required: true
11-
type: choice
12-
options:
13-
- major
14-
- minor
15-
- patch
6+
workflow_dispatch:
7+
inputs:
8+
version_type:
9+
description: "Version bump type (major, minor, patch)"
10+
required: true
11+
type: choice
12+
options:
13+
- major
14+
- minor
15+
- patch
1616

1717
env:
18-
NPM_REGISTRY: https://registry.npmjs.org/
18+
NPM_REGISTRY: https://registry.npmjs.org/
1919

2020
concurrency: # prevent concurrent releases
21-
group: npm-publish
21+
group: npm-publish
2222
cancel-in-progress: true
2323

2424
jobs:
25-
ci-unit-tests:
25+
ci-unit-tests:
2626
uses: ./.github/workflows/ci-unit-tests.yml
2727
bump-version:
2828
needs: ci-unit-tests
@@ -37,11 +37,11 @@ jobs:
3737
- uses: actions/setup-node@v4
3838
with:
3939
node-version-file: .nvmrc
40-
registry-url: ${{ env.NPM_REGISTRY }}
40+
registry-url: ${{ env.NPM_REGISTRY }}
4141
- run: npm ci
4242
- run: npm publish --provenance
4343
env:
4444
NODE_AUTH_TOKEN: ${{ secrets.BRAINTREE_NPM_ACCESS_TOKEN }}
4545
publish-release:
4646
needs: publish-npm
47-
uses: ./.github/workflows/release-notes.yml
47+
uses: ./.github/workflows/release-notes.yml

.github/workflows/release-notes.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# This workflow will create a release for the most recent deploy
1+
# This workflow will create a release for the most recent deploy
22

3-
name: Create release
4-
run-name: Running github release
3+
name: Create release
4+
run-name: Running github release
55
on:
66
workflow_dispatch:
77
workflow_call:
@@ -36,4 +36,4 @@ jobs:
3636
release_name: v${{ env.latest_version }}
3737
body: "${{ env.release_details }}"
3838
draft: false
39-
prerelease: false
39+
prerelease: false

.github/workflows/version-bump.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ jobs:
5151
run: |
5252
new_version=$(npm version ${{ inputs.version_type }})
5353
echo "new_version=$(echo $new_version | sed 's/v//')" >> $GITHUB_ENV
54-
54+
5555
- name: Update changelog
5656
run: |
57-
today=$(date +'%Y-%m-%d')
58-
sed -i "s/## unreleased/## ${{ env.new_version }} (${today})/i" CHANGELOG.md
57+
today=$(date +'%Y-%m-%d')
58+
sed -i "s/## unreleased/## ${{ env.new_version }} (${today})/i" CHANGELOG.md
5959
6060
- name: Commit and push changes
6161
run: |

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v18
1+
v24

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,26 @@
11
# CHANGELOG
22

3+
## UNRELEASED
4+
5+
- Fix failing functional/smoke tests
6+
- Update to node v24
7+
- Update dev dependencies
8+
- @wdio/cli to 9.21.1
9+
- @wdio/local-runner to 9.21.0
10+
- @wdio/mocha-framework to 9.21.0
11+
- @wdio/spec-reporter to 9.20.0
12+
- chromedriver to 143.0.1
13+
- removed @wdio/sync
14+
- updated tests to be asynchronous
15+
316
## 6.0.3
417

518
- Fix a bug with not being able to remove handlers when targetFrames are used.
619

720
## 6.0.2
821

922
- Update (sub-)dependencies
23+
1024
- axios to 1.7.7
1125
- body-parse to 1.20.3
1226
- cookie to 0.7.1
@@ -20,6 +34,7 @@
2034
- express to 4.20.1
2135

2236
## 6.0.1
37+
2338
- Update @braintree/uuid to v1.0.0
2439
- Update dev dependencies:
2540
- chromedriver to v125.0.3

0 commit comments

Comments
 (0)