From dc8d5602fa97ee17fe145d16047f217fc1705cb5 Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Wed, 13 Jan 2021 10:29:26 +0100
Subject: [PATCH] Re-enable e2e tests and disabled metamask test

---
 .circleci/config.yml                         | 80 ++++++++++----------
 apps/remix-ide-e2e/src/tests/runAndDeploy.ts |  1 +
 2 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1bdb4cd959..dc8b75889d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,23 +45,23 @@ jobs:
     parallelism: 20
     steps:
       - checkout
-      # - run: npm install
-      # - run: npm run lint
-      # # - run: npm run lint remix-ide-e2e
-      # - run: npm run build:libs      
-      # - run: npm run build
-      # - run:
-      #     name: Download Selenium
-      #     command: ./node_modules/.bin/selenium-standalone install --drivers.chrome.version=2.39 --drivers.chrome.baseURL=https://chromedriver.storage.googleapis.com
-      # - run:
-      #     name: Start Selenium
-      #     command: ./node_modules/.bin/selenium-standalone start --drivers.chrome.version=2.39 --drivers.chrome.baseURL=https://chromedriver.storage.googleapis.com
-      #     background: true
-      # - run: ./apps/remix-ide/ci/browser_tests_chrome.sh
-      # - store_test_results:
-      #     path: ./reports/tests
-      # - store_artifacts:
-      #     path: ./reports/screenshots
+      - run: npm install
+      - run: npm run lint
+      # - run: npm run lint remix-ide-e2e
+      - run: npm run build:libs      
+      - run: npm run build
+      - run:
+          name: Download Selenium
+          command: ./node_modules/.bin/selenium-standalone install --drivers.chrome.version=2.39 --drivers.chrome.baseURL=https://chromedriver.storage.googleapis.com
+      - run:
+          name: Start Selenium
+          command: ./node_modules/.bin/selenium-standalone start --drivers.chrome.version=2.39 --drivers.chrome.baseURL=https://chromedriver.storage.googleapis.com
+          background: true
+      - run: ./apps/remix-ide/ci/browser_tests_chrome.sh
+      - store_test_results:
+          path: ./reports/tests
+      - store_artifacts:
+          path: ./reports/screenshots
 
   remix-ide-firefox:
     docker:
@@ -82,29 +82,29 @@ jobs:
     parallelism: 20
     steps:
       - checkout
-      # - run: npm install
-      # - run: npm run lint
-      # # - run: npm run lint remix-ide-e2e
-      # - run: npm run build:libs
-      # - run: npm run build
-      # - run:
-      #     name: Download Selenium
-      #     command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide-e2e/seleniumConfig.js
-      # - run:
-      #     name: Start Selenium
-      #     command: ./node_modules/.bin/selenium-standalone start --config=../remix-project/apps/remix-ide-e2e/seleniumConfig.js
-      #     background: true
-      # - run:
-      #     name: Download Latest Firefox
-      #     command: sudo apt-get purge -y firefox && wget https://sourceforge.net/projects/ubuntuzilla/files/mozilla/apt/pool/main/f/firefox-mozilla-build/firefox-mozilla-build_73.0.1-0ubuntu1_amd64.deb
-      # - run:
-      #     name: Install Firefox
-      #     command: sudo dpkg -i firefox-mozilla-build_73.0.1-0ubuntu1_amd64.deb
-      # - run: ./apps/remix-ide/ci/browser_tests_firefox.sh
-      # - store_test_results:
-      #     path: ./reports/tests
-      # - store_artifacts:
-      #     path: ./reports/screenshots
+      - run: npm install
+      - run: npm run lint
+      # - run: npm run lint remix-ide-e2e
+      - run: npm run build:libs
+      - run: npm run build
+      - run:
+          name: Download Selenium
+          command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide-e2e/seleniumConfig.js
+      - run:
+          name: Start Selenium
+          command: ./node_modules/.bin/selenium-standalone start --config=../remix-project/apps/remix-ide-e2e/seleniumConfig.js
+          background: true
+      - run:
+          name: Download Latest Firefox
+          command: sudo apt-get purge -y firefox && wget https://sourceforge.net/projects/ubuntuzilla/files/mozilla/apt/pool/main/f/firefox-mozilla-build/firefox-mozilla-build_73.0.1-0ubuntu1_amd64.deb
+      - run:
+          name: Install Firefox
+          command: sudo dpkg -i firefox-mozilla-build_73.0.1-0ubuntu1_amd64.deb
+      - run: ./apps/remix-ide/ci/browser_tests_firefox.sh
+      - store_test_results:
+          path: ./reports/tests
+      - store_artifacts:
+          path: ./reports/screenshots
 
   remix-ide-run-deploy:
     docker:
diff --git a/apps/remix-ide-e2e/src/tests/runAndDeploy.ts b/apps/remix-ide-e2e/src/tests/runAndDeploy.ts
index d318ea4f9c..5d7218bd2c 100644
--- a/apps/remix-ide-e2e/src/tests/runAndDeploy.ts
+++ b/apps/remix-ide-e2e/src/tests/runAndDeploy.ts
@@ -128,6 +128,7 @@ module.exports = {
     .waitForElementPresent('.transaction-status--submitted')
     .pause(25000)
     .switchBrowserTab(0)
+    .end()
   },
 
   'Should connect to Ethereum Main Network using MetaMask': '' + function (browser: NightwatchBrowser) {