From 3bb615be7cdff017735d4fd41339e3f0de9d8604 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Fri, 10 Jan 2020 15:32:57 -0400
Subject: [PATCH] Re-arrange transaction navigation test actions (#7806)

These tests were updated in #7473 to navigate in a different order,
because the transaction order changed. Unfortunately this meant that
a second contract deployment was being confirmed, where it was
previously being rejected.

This updates the test to ensure the same transaction is rejected and
confirmed as prior to the change in #7473
---
 test/e2e/metamask-ui.spec.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js
index c12f1762fafe..28c8dc85fbf2 100644
--- a/test/e2e/metamask-ui.spec.js
+++ b/test/e2e/metamask-ui.spec.js
@@ -1036,11 +1036,11 @@ describe('MetaMask', function () {
       )
     })
 
-    it('confirms a transaction', async () => {
+    it('rejects a transaction', async () => {
       await delay(tinyDelayMs)
       const confirmButton = await findElement(
         driver,
-        By.xpath(`//button[contains(text(), 'Confirm')]`),
+        By.xpath(`//button[contains(text(), 'Reject')]`),
         10000
       )
       await confirmButton.click()
@@ -1052,14 +1052,14 @@ describe('MetaMask', function () {
       )
       await delay(tinyDelayMs)
       const navigationText = await navigationElement.getText()
-      assert.equal(navigationText.includes('4'), true, 'transaction confirmed')
+      assert.equal(navigationText.includes('4'), true, 'transaction rejected')
     })
 
-    it('rejects a transaction', async () => {
+    it('confirms a transaction', async () => {
       await delay(tinyDelayMs / 2)
       const rejectButton = await findElement(
         driver,
-        By.xpath(`//button[contains(text(), 'Reject')]`),
+        By.xpath(`//button[contains(text(), 'Confirm')]`),
         10000
       )
       await delay(tinyDelayMs / 2)
@@ -1073,7 +1073,7 @@ describe('MetaMask', function () {
       await delay(tinyDelayMs / 2)
       const navigationText = await navigationElement.getText()
       await delay(tinyDelayMs / 2)
-      assert.equal(navigationText.includes('3'), true, 'transaction rejected')
+      assert.equal(navigationText.includes('3'), true, 'transaction confirmed')
     })
 
     it('rejects the rest of the transactions', async () => {
@@ -1362,11 +1362,11 @@ describe('MetaMask', function () {
       )
       await delay(regularDelayMs)
       await driver.wait(
-        until.elementTextMatches(balance, /^90.*\s*ETH.*$/),
+        until.elementTextMatches(balance, /^87.*\s*ETH.*$/),
         10000
       )
       const tokenAmount = await balance.getText()
-      assert.ok(/^90.*\s*ETH.*$/.test(tokenAmount))
+      assert.ok(/^87.*\s*ETH.*$/.test(tokenAmount))
       await delay(regularDelayMs)
     })
   })