Skip to content

Update to Node.js v12 #8245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kumavis wants to merge 21 commits into from
+145 −91
Closed

Update to Node.js v12 #8245

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a3bb62a
ci - use image circle/node:12-browsers
kumavis Mar 28, 2020
893aaea
deps - remove old sesify deps
kumavis Mar 28, 2020
dfc0694
deps - readd sesify and set deps install to ignore engines field
kumavis Mar 28, 2020
4325799
fix: disable dnode weak on nodejs for node@10 support
kumavis Apr 20, 2020
018861a
deps - use fork of ethereumjs-wallet for node v12 support
kumavis Apr 20, 2020
b9a3914
ci/scripts/deps-install - remove scrypt from whitelist
kumavis Apr 20, 2020
beef044
deps - shim ethereumjs-wallet for node v12 support
kumavis Apr 20, 2020
663de1a
ci/scripts/deps-install - add workaround for scrypt
kumavis Apr 20, 2020
f0a6f30
ci/scripts/deps-install - add workaround for scrypt
kumavis Apr 20, 2020
53befa9
deps - remove old etherscan-link
kumavis Apr 21, 2020
8d645e1
update .nvmrc
rekmarks Apr 21, 2020
71f5720
deps - bump chromedriver to match ci image
kumavis Apr 23, 2020
4f8961b
test/e2e - fix test for contract creation content
kumavis Apr 23, 2020
6a74611
test/e2e - log webdriver options on start
kumavis Apr 23, 2020
157ce70
test/unit/permissions - fix promise await timing
kumavis Apr 24, 2020
ef583c0
deps - update ethUtil for ethereumjs-wallet stub
kumavis Apr 24, 2020
a72b945
Revert "deps - update ethUtil for ethereumjs-wallet stub"
kumavis Apr 24, 2020
b695530
Revert "deps - shim ethereumjs-wallet for node v12 support"
kumavis Apr 24, 2020
a7b20f0
ci/test-e2e-add-default-port-9222
kumavis Apr 24, 2020
c6ecae7
ci/chromedriver - attack wildly
kumavis Apr 24, 2020
87ebea2
ci/chromedriver - attack wildly
kumavis Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test/unit/permissions - fix promise await timing
  • Loading branch information
@kumavis
kumavis committed Apr 24, 2020
commit 157ce70e6e8845afe14234fbeb81678b9766fcec
6 changes: 3 additions & 3 deletions test/unit/app/controllers/permissions/permissions-middleware-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,9 @@ describe('permissions middleware', function () {

await permController.approvePermissionsRequest(approvedReq, ACCOUNT_ARRAYS.a)

// at this point, the permission should have been granted
// wait for permission to be granted
await pendingApproval

const perms = permController.permissions.getPermissionsForDomain(ORIGINS.a)

assert.equal(
Expand All @@ -551,8 +553,6 @@ describe('permissions middleware', function () {
[CAVEATS.eth_accounts(ACCOUNT_ARRAYS.a)]
)

await pendingApproval

// we should also see the accounts on the response
assert.ok(
res.result && !res.error,
Expand Down