Refactoring ethereum-on.spec.js to use fixtures (#10778)

test/e2e/ethereum-on.spec.js

@@ -1,201 +0,0 @@
-const assert = require('assert');
-const webdriver = require('selenium-webdriver');
-
-const { By, until } = webdriver;
-const enLocaleMessages = require('../../app/_locales/en/messages.json');
-const { regularDelayMs, largeDelayMs } = require('./helpers');
-const { buildWebDriver } = require('./webdriver');
-const Ganache = require('./ganache');
-
-const ganacheServer = new Ganache();
-
-describe('MetaMask', function () {
-  let driver;
-  let publicAddress;
-
-  this.timeout(0);
-  this.bail(true);
-
-  before(async function () {
-    await ganacheServer.start({
-      accounts: [
-        {
-          secretKey:
-            '0x53CB0AB5226EEBF4D872113D98332C1555DC304443BEE1CF759D15798D3C55A9',
-          balance: 25000000000000000000,
-        },
-      ],
-    });
-    const result = await buildWebDriver();
-    driver = result.driver;
-    await driver.navigate();
-  });
-
-  afterEach(async function () {
-    if (process.env.SELENIUM_BROWSER === 'chrome') {
-      const errors = await driver.checkBrowserForConsoleErrors(driver);
-      if (errors.length) {
-        const errorReports = errors.map((err) => err.message);
-        const errorMessage = `Errors found in browser console:\n${errorReports.join(
-          '\n',
-        )}`;
-        console.error(new Error(errorMessage));
-      }
-    }
-    if (this.currentTest.state === 'failed') {
-      await driver.verboseReportOnFailure(this.currentTest.title);
-    }
-  });
-
-  after(async function () {
-    await ganacheServer.quit();
-    await driver.quit();
-  });
-
-  describe('Going through the first time flow, but skipping the seed phrase challenge', function () {
-    it('clicks the continue button on the welcome screen', async function () {
-      await driver.findElement(By.css('.welcome-page__header'));
-      await driver.clickElement(
-        By.xpath(
-          `//button[contains(text(), '${enLocaleMessages.getStarted.message}')]`,
-        ),
-      );
-      await driver.delay(largeDelayMs);
-    });
-
-    it('clicks the "Create New Wallet" option', async function () {
-      await driver.clickElement(
-        By.xpath(`//button[contains(text(), 'Create a Wallet')]`),
-      );
-      await driver.delay(largeDelayMs);
-    });
-
-    it('clicks the "No thanks" option on the metametrics opt-in screen', async function () {
-      await driver.clickElement(By.css('.btn-default'));
-      await driver.delay(largeDelayMs);
-    });
-
-    it('accepts a secure password', async function () {
-      const passwordBox = await driver.findElement(
-        By.css('.first-time-flow__form #create-password'),
-      );
-      const passwordBoxConfirm = await driver.findElement(
-        By.css('.first-time-flow__form #confirm-password'),
-      );
-
-      await passwordBox.sendKeys('correct horse battery staple');
-      await passwordBoxConfirm.sendKeys('correct horse battery staple');
-
-      await driver.clickElement(By.css('.first-time-flow__checkbox'));
-      await driver.clickElement(By.css('.first-time-flow__form button'));
-      await driver.delay(largeDelayMs);
-    });
-
-    it('skips the seed phrase challenge', async function () {
-      await driver.clickElement(
-        By.xpath(
-          `//button[contains(text(), '${enLocaleMessages.remindMeLater.message}')]`,
-        ),
-      );
-      await driver.delay(regularDelayMs);
-
-      await driver.clickElement(
-        By.css('[data-testid="account-options-menu-button"]'),
-      );
-      await driver.clickElement(
-        By.css('[data-testid="account-options-menu__account-details"]'),
-      );
-    });
-
-    it('gets the current accounts address', async function () {
-      const addressInput = await driver.findElement(
-        By.css('.readonly-input__input'),
-      );
-      publicAddress = await addressInput.getAttribute('value');
-      const accountModal = await driver.findElement(By.css('span .modal'));
-
-      await driver.clickElement(By.css('.account-modal__close'));
-
-      await driver.wait(until.stalenessOf(accountModal));
-      await driver.delay(regularDelayMs);
-    });
-  });
-
-  describe('provider listening for events', function () {
-    let extension;
-    let popup;
-    let dapp;
-
-    it('connects to the dapp', async function () {
-      await driver.openNewPage('http://127.0.0.1:8080/');
-      await driver.delay(regularDelayMs);
-
-      await driver.clickElement(
-        By.xpath(`//button[contains(text(), 'Connect')]`),
-      );
-
-      await driver.delay(regularDelayMs);
-
-      await driver.waitUntilXWindowHandles(3);
-      const windowHandles = await driver.getAllWindowHandles();
-
-      extension = windowHandles[0];
-      dapp = await driver.switchToWindowWithTitle(
-        'E2E Test Dapp',
-        windowHandles,
-      );
-      popup = windowHandles.find(
-        (handle) => handle !== extension && handle !== dapp,
-      );
-
-      await driver.switchToWindow(popup);
-
-      await driver.delay(regularDelayMs);
-
-      await driver.clickElement(By.xpath(`//button[contains(text(), 'Next')]`));
-      await driver.clickElement(
-        By.xpath(`//button[contains(text(), 'Connect')]`),
-      );
-
-      await driver.waitUntilXWindowHandles(2);
-      await driver.switchToWindow(dapp);
-      await driver.delay(regularDelayMs);
-    });
-
-    it('has the ganache network id within the dapp', async function () {
-      const networkDiv = await driver.findElement(By.css('#network'));
-      await driver.delay(regularDelayMs);
-      assert.equal(await networkDiv.getText(), '1337');
-    });
-
-    it('changes the network', async function () {
-      await driver.switchToWindow(extension);
-
-      await driver.clickElement(By.css('.network-display'));
-      await driver.delay(regularDelayMs);
-
-      await driver.clickElement(
-        By.xpath(`//span[contains(text(), 'Ropsten')]`),
-      );
-      await driver.delay(largeDelayMs);
-    });
-
-    it('sets the network div within the dapp', async function () {
-      await driver.switchToWindow(dapp);
-      const networkDiv = await driver.findElement(By.css('#network'));
-      assert.equal(await networkDiv.getText(), '3');
-    });
-
-    it('sets the chainId div within the dapp', async function () {
-      await driver.switchToWindow(dapp);
-      const chainIdDiv = await driver.findElement(By.css('#chainId'));
-      assert.equal(await chainIdDiv.getText(), '0x3');
-    });
-
-    it('sets the account div within the dapp', async function () {
-      await driver.switchToWindow(dapp);
-      const accountsDiv = await driver.findElement(By.css('#accounts'));
-      assert.equal(await accountsDiv.getText(), publicAddress.toLowerCase());
-    });
-  });
-});

test/e2e/run-all.sh

@@ -61,13 +61,6 @@ retry concurrently --kill-others \
   --success first \
   'mocha test/e2e/send-edit.spec'
 
-retry concurrently --kill-others \
-  --names 'dapp,e2e' \
-  --prefix '[{time}][{name}]' \
-  --success first \
-  'yarn dapp' \
-  'mocha test/e2e/ethereum-on.spec'
-
 retry concurrently --kill-others \
   --names 'dapp,e2e' \
   --prefix '[{time}][{name}]' \

test/e2e/tests/personal-sign.spec.js

@@ -16,7 +16,7 @@ describe('Personal sign', function () {
     await withFixtures(
       {
         dapp: true,
-        fixtures: 'personal-sign',
+        fixtures: 'connected-state',
         ganacheOptions,
         title: this.test.title,
       },

test/e2e/tests/provider-events.spec.js

@@ -0,0 +1,59 @@
+const { strict: assert } = require('assert');
+const { By, Key } = require('selenium-webdriver');
+const { withFixtures, regularDelayMs } = require('../helpers');
+
+describe('MetaMask', function () {
+  it('provider should inform dapp when switching networks', async function () {
+    const ganacheOptions = {
+      accounts: [
+        {
+          secretKey:
+            '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+          balance: 25000000000000000000,
+        },
+      ],
+    };
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: 'connected-state',
+        ganacheOptions,
+        title: this.test.title,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        const passwordField = await driver.findElement(By.css('#password'));
+        await passwordField.sendKeys('correct horse battery staple');
+        await passwordField.sendKeys(Key.ENTER);
+
+        await driver.openNewPage('http://127.0.0.1:8080/');
+        const networkDiv = await driver.findElement(By.css('#network'));
+        const chainIdDiv = await driver.findElement(By.css('#chainId'));
+        await driver.delay(regularDelayMs);
+        assert.equal(await networkDiv.getText(), '1337');
+        assert.equal(await chainIdDiv.getText(), '0x539');
+
+        const windowHandles = await driver.getAllWindowHandles();
+        await driver.switchToWindow(windowHandles[0]);
+
+        await driver.clickElement(By.css('.network-display'));
+        await driver.clickElement(
+          By.xpath(`//span[contains(text(), 'Ropsten')]`),
+        );
+        await driver.delay(regularDelayMs);
+
+        await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
+        const switchedNetworkDiv = await driver.findElement(By.css('#network'));
+        const switchedChainIdDiv = await driver.findElement(By.css('#chainId'));
+        const accountsDiv = await driver.findElement(By.css('#accounts'));
+
+        assert.equal(await switchedNetworkDiv.getText(), '3');
+        assert.equal(await switchedChainIdDiv.getText(), '0x3');
+        assert.equal(
+          await accountsDiv.getText(),
+          '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+        );
+      },
+    );
+  });
+});