From e814b47810eafdb88383554fd9e1f08233d753ba Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Thu, 30 Apr 2020 13:04:29 +0000
Subject: [PATCH 1/2] Switched from Ropsten testnet to Goerli testnet

---
 .env                               |  4 ++--
 test-browser/tests/runAndDeploy.js | 15 +++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.env b/.env
index b08c745d22..ad971047fb 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
 gist_token = <token>
-account_passphrase = <passphrase>
-account_password = <password>
\ No newline at end of file
+account_passphrase = explain uniform adapt basic blue onion rebel pull rice erase volcano couple
+account_password = remix_is_cool
\ No newline at end of file
diff --git a/test-browser/tests/runAndDeploy.js b/test-browser/tests/runAndDeploy.js
index b75d248f36..013f535645 100644
--- a/test-browser/tests/runAndDeploy.js
+++ b/test-browser/tests/runAndDeploy.js
@@ -17,7 +17,6 @@ module.exports = {
 
   'Should load run and deploy tab': function (browser) {
     browser.waitForElementPresent('*[data-id="remixIdeSidePanel"]')
-    .pause(3000)
     .clickLaunchIcon('udapp')
     .waitForElementPresent('*[data-id="sidePanelSwapitTitle"]')
     .assert.containsText('*[data-id="sidePanelSwapitTitle"]', 'DEPLOY & RUN TRANSACTIONS')
@@ -67,11 +66,11 @@ module.exports = {
     })
   },
 
-  'Should connect to Ropsten Test Network using MetaMask': function (browser) {
+  'Should connect to Goerli Test Network using MetaMask': function (browser) {
     browser.waitForElementPresent('*[data-id="remixIdeSidePanel"]')
     .setupMetamask(passphrase, password)
     .click('.network-indicator__down-arrow')
-    .useXpath().click("//span[text()='Ropsten Test Network']")
+    .useXpath().click("//span[text()='Goerli Test Network']")
     .useCss().switchBrowserTab(0)
     .refresh()
     .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
@@ -81,14 +80,14 @@ module.exports = {
     .waitForElementPresent('*[data-id="settingsSelectEnvOptions"]')
     .click('*[data-id="settingsSelectEnvOptions"] option[id="injected-mode"]')
     .waitForElementPresent('*[data-id="settingsNetworkEnv"]')
-    .assert.containsText('*[data-id="settingsNetworkEnv"]', 'Ropsten (3) network')
+    .assert.containsText('*[data-id="settingsNetworkEnv"]', 'Goerli (5) network')
     .switchBrowserTab(2)
     .waitForElementPresent('.page-container__footer-button:nth-of-type(2)')
     .click('.page-container__footer-button:nth-of-type(2)')
     .switchBrowserTab(0)
   },
 
-  'Should deploy contract on Ropsten Test Network using MetaMask': function (browser) {
+  'Should deploy contract on Goerli Test Network using MetaMask': function (browser) {
     browser.waitForElementPresent('*[data-id="runTabSelectAccount"] option')
     .clickLaunchIcon('fileExplorers')
     .switchFile('browser/Greet.sol')
@@ -101,11 +100,11 @@ module.exports = {
     .waitForElementPresent('.page-container__footer-button:nth-of-type(2)')
     .click('.page-container__footer-button:nth-of-type(2)')
     .waitForElementPresent('.transaction-status--submitted')
-    .pause(60000)
+    .pause(30000)
     .switchBrowserTab(0)
   },
 
-  'Should run low level interaction (fallback function) on Ropsten Test Network using MetaMask': function (browser) {
+  'Should run low level interaction (fallback function) on Goerli Test Network using MetaMask': function (browser) {
     browser.waitForElementPresent('*[data-id="remixIdeSidePanel"]')
     .waitForElementPresent('*[data-id="universalDappUiTitleExpander"]')
     .click('*[data-id="universalDappUiTitleExpander"]')
@@ -117,7 +116,7 @@ module.exports = {
     .waitForElementPresent('.page-container__footer-button:nth-of-type(2)')
     .click('.page-container__footer-button:nth-of-type(2)')
     .waitForElementPresent('.transaction-status--submitted')
-    .pause(60000)
+    .pause(30000)
     .switchBrowserTab(0)
   },
 

From 6988926a09cd646b6050cdc9db02441d66d02f1e Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Thu, 30 Apr 2020 13:15:46 +0000
Subject: [PATCH 2/2] Removed test env variables

---
 .env                               | 4 ++--
 test-browser/tests/runAndDeploy.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.env b/.env
index ad971047fb..b08c745d22 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
 gist_token = <token>
-account_passphrase = explain uniform adapt basic blue onion rebel pull rice erase volcano couple
-account_password = remix_is_cool
\ No newline at end of file
+account_passphrase = <passphrase>
+account_password = <password>
\ No newline at end of file
diff --git a/test-browser/tests/runAndDeploy.js b/test-browser/tests/runAndDeploy.js
index 013f535645..b1b8240609 100644
--- a/test-browser/tests/runAndDeploy.js
+++ b/test-browser/tests/runAndDeploy.js
@@ -100,7 +100,7 @@ module.exports = {
     .waitForElementPresent('.page-container__footer-button:nth-of-type(2)')
     .click('.page-container__footer-button:nth-of-type(2)')
     .waitForElementPresent('.transaction-status--submitted')
-    .pause(30000)
+    .pause(25000)
     .switchBrowserTab(0)
   },
 
@@ -116,7 +116,7 @@ module.exports = {
     .waitForElementPresent('.page-container__footer-button:nth-of-type(2)')
     .click('.page-container__footer-button:nth-of-type(2)')
     .waitForElementPresent('.transaction-status--submitted')
-    .pause(30000)
+    .pause(25000)
     .switchBrowserTab(0)
   },