m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Fix switch-ethereum-chain handler by passing configuration id to setA… (#18483)

Browse Source 
* Fix switch-ethereum-chain handler by passing configuration id to setActiveNetwork

* fix e2e test

* Fix e2e tests

* Update test/e2e/tests/switch-custom-network.spec.js

Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>

* Revert "Update test/e2e/tests/switch-custom-network.spec.js"

This reverts commit be533ff7f25e1fd42e951d9b817b8438035ae256.

---------

Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
This commit is contained in:
Dan J Miller 2023-04-06 08:07:34 -07:00
parent 0cb53f74f2
commit 43d5bf152c
2 changed files with 103 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/lib/rpc-method-middleware/handlers/switch-ethereum-chain.js
View File

@ -115,7 +115,7 @@ async function switchEthereumChainHandler(
) {
setProviderType(approvedRequestData.type);
} else {
await setActiveNetwork(approvedRequestData);
await setActiveNetwork(approvedRequestData.id);
}
res.result = null;
} catch (error) {

102
test/e2e/tests/switch-custom-network.spec.js Normal file
View File

@ -0,0 +1,102 @@
const { strict: assert } = require('assert');
const FixtureBuilder = require('../fixture-builder');
const { convertToHexValue, withFixtures } = require('../helpers');
describe('Swtich ethereum chain', function () {
const ganacheOptions = {
accounts: [
{
secretKey:
'0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
balance: convertToHexValue(25000000000000000000),
},
],
concurrent: { port: 8546, chainId: 1338, ganacheOptions2: {} },
};
it('should successfully change the network in response to wallet_switchEthereumChain', async function () {
await withFixtures(
{
dapp: true,
fixtures: new FixtureBuilder()
.withPermissionControllerConnectedToTestDapp()
.build(),
ganacheOptions,
title: this.test.title,
failOnConsoleError: false,
},
async ({ driver }) => {
await driver.navigate();
await driver.fill('#password', 'correct horse battery staple');
await driver.press('#password', driver.Key.ENTER);
const windowHandles = await driver.getAllWindowHandles();
const extension = windowHandles[0];
await driver.openNewPage('http://127.0.0.1:8080/');
await driver.clickElement({
tag: 'button',
text: 'Add Localhost 8546',
});
await driver.waitUntilXWindowHandles(3);
await driver.switchToWindowWithTitle(
'MetaMask Notification',
windowHandles,
);
await driver.clickElement({
tag: 'button',
text: 'Approve',
});
await driver.findElement({
tag: 'h3',
text: 'Allow this site to switch the network?',
});
// Don't switch to network now, because we will click the 'Switch to Localhost 8546' button below
await driver.clickElement({
tag: 'button',
text: 'Cancel',
});
await driver.waitUntilXWindowHandles(2);
await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
await driver.clickElement({
tag: 'button',
text: 'Switch to Localhost 8546',
});
await driver.waitUntilXWindowHandles(3);
await driver.switchToWindowWithTitle(
'MetaMask Notification',
windowHandles,
);
await driver.clickElement({
tag: 'button',
text: 'Switch network',
});
await driver.waitUntilXWindowHandles(2);
await driver.switchToWindow(extension);
const currentNetworkName = await driver.findElement({
tag: 'span',
text: 'Localhost 8546',
});
assert.ok(
Boolean(currentNetworkName),
'Failed to switch to custom network',
);
},
);
});
});