From 8464ed150c100d5550e7cc274ac1226c2f7b4bcf Mon Sep 17 00:00:00 2001
From: seaona <54408225+seaona@users.noreply.github.com>
Date: Tue, 16 Aug 2022 17:25:51 +0200
Subject: [PATCH] [e2e] Refactor contract-interactions spec using Ganache
 seeder (#15553)

* Include contract deployment from background on Contract Interactions specs

* Deploy piggy contract

* Fix lint

* Make sure button is clickable

* Wait for deployed contract

* Fix lint

* Changed hardcoded Smart Contract string for imported constant
---
 test/e2e/tests/contract-interactions.spec.js | 56 ++++++--------------
 1 file changed, 17 insertions(+), 39 deletions(-)

diff --git a/test/e2e/tests/contract-interactions.spec.js b/test/e2e/tests/contract-interactions.spec.js
index 3357ace5d..d50ac6cb9 100644
--- a/test/e2e/tests/contract-interactions.spec.js
+++ b/test/e2e/tests/contract-interactions.spec.js
@@ -1,5 +1,6 @@
 const { strict: assert } = require('assert');
 const { convertToHexValue, withFixtures } = require('../helpers');
+const { SMART_CONTRACTS } = require('../seeder/smart-contracts');
 
 describe('Deploy contract and call contract methods', function () {
   const ganacheOptions = {
@@ -11,22 +12,32 @@ describe('Deploy contract and call contract methods', function () {
       },
     ],
   };
+  const smartContract = SMART_CONTRACTS.PIGGYBANK;
   it('should display the correct account balance after contract interactions', async function () {
     await withFixtures(
       {
         dapp: true,
         fixtures: 'connected-state',
         ganacheOptions,
+        smartContract,
         title: this.test.title,
       },
-      async ({ driver }) => {
+      async ({ driver, contractRegistry }) => {
+        const contractAddress = await contractRegistry.getContractAddress(
+          smartContract,
+        );
         await driver.navigate();
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
 
         // deploy contract
-        await driver.openNewPage('http://127.0.0.1:8080/');
-        await driver.clickElement('#deployButton');
+        await driver.openNewPage(
+          `http://127.0.0.1:8080/?contract=${contractAddress}`,
+        );
+
+        // wait for deployed contract, calls and confirms a contract method where ETH is sent
+        await driver.findClickableElement('#deployButton');
+        await driver.clickElement('#depositButton');
         await driver.waitUntilXWindowHandles(3);
         let windowHandles = await driver.getAllWindowHandles();
         const extension = windowHandles[0];
@@ -34,41 +45,7 @@ describe('Deploy contract and call contract methods', function () {
           'E2E Test Dapp',
           windowHandles,
         );
-        // displays the contract creation data
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
-        await driver.clickElement({ text: 'Data', tag: 'button' });
-        await driver.findElement({ text: '127.0.0.1', tag: 'div' });
-        const confirmDataDiv = await driver.findElement(
-          '.confirm-page-container-content__data-box',
-        );
-        const confirmDataText = await confirmDataDiv.getText();
-        assert.ok(confirmDataText.includes('Origin:'));
-        assert.ok(confirmDataText.includes('127.0.0.1'));
-        assert.ok(confirmDataText.includes('Bytes:'));
-        assert.ok(confirmDataText.includes('675'));
 
-        // confirms a deploy contract transaction
-        await driver.clickElement({ text: 'Details', tag: 'button' });
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindow(extension);
-        await driver.clickElement('[data-testid="home__activity-tab"]');
-        await driver.waitForSelector(
-          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
-        );
-        const completedTx = await driver.findElement('.list-item__title');
-        const completedTxText = await completedTx.getText();
-        assert.equal(completedTxText, 'Contract deployment');
-
-        // calls and confirms a contract method where ETH is sent
-        await driver.switchToWindow(dapp);
-        await driver.clickElement('#depositButton');
-        await driver.waitUntilXWindowHandles(3);
-        windowHandles = await driver.getAllWindowHandles();
         await driver.switchToWindowWithTitle(
           'MetaMask Notification',
           windowHandles,
@@ -80,8 +57,9 @@ describe('Deploy contract and call contract methods', function () {
         await driver.clickElement({ text: 'Confirm', tag: 'button' });
         await driver.waitUntilXWindowHandles(2);
         await driver.switchToWindow(extension);
+        await driver.clickElement({ text: 'Activity', tag: 'button' });
         await driver.waitForSelector(
-          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(2)',
+          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
           { timeout: 10000 },
         );
         await driver.waitForSelector(
@@ -109,7 +87,7 @@ describe('Deploy contract and call contract methods', function () {
         await driver.waitUntilXWindowHandles(2);
         await driver.switchToWindow(extension);
         await driver.waitForSelector(
-          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(3)',
+          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(2)',
           { timeout: 10000 },
         );
         await driver.waitForSelector(