Merge pull request #4 from brunobar79/portal-metamask-lint-fix

Lint fix for Integration ENS with IPFS

3 files changed, 85 insertions, 40 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4d9d01ee6..0ad5cdf53 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,6 +30,15 @@ workflows:
             - prep-deps-npm
             - prep-deps-firefox
             - prep-build
+      - test-e2e-beta-chrome:
+          requires:
+            - prep-deps-npm
+            - prep-build
+      - test-e2e-beta-firefox:
+          requires:
+            - prep-deps-npm
+            - prep-deps-firefox
+            - prep-build
       - test-unit:
           requires:
             - prep-deps-npm
@@ -57,6 +66,8 @@ workflows:
             - test-unit
             - test-e2e-chrome
             - test-e2e-firefox
+            - test-e2e-beta-chrome
+            - test-e2e-beta-firefox
             - test-integration-mascara-chrome
             - test-integration-mascara-firefox
             - test-integration-flat-chrome
@@ -86,7 +97,7 @@ workflows:
 jobs:
   prep-deps-npm:
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
       - restore_cache:
@@ -105,14 +116,12 @@ jobs:
 
   prep-deps-firefox:
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
       - run:
           name: Download Firefox
-          command: >
-            wget https://ftp.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/en-US/firefox-58.0.tar.bz2
-            && tar xjf firefox-58.0.tar.bz2
+          command: ./.circleci/scripts/firefox-download.sh
       - save_cache:
           key: dependency-cache-firefox-{{ .Revision }}
           paths:
@@ -120,7 +129,7 @@ jobs:
 
   prep-build:
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
       - restore_cache:
@@ -139,7 +148,7 @@ jobs:
 
   prep-docs:
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
       - restore_cache:
@@ -154,7 +163,7 @@ jobs:
 
   prep-scss:
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
       - restore_cache:
@@ -173,7 +182,7 @@ jobs:
 
   test-lint:
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
       - restore_cache:
@@ -184,7 +193,7 @@ jobs:
 
   test-deps:
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
       - restore_cache:
@@ -195,7 +204,7 @@ jobs:
 
   test-e2e-chrome:
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
       - restore_cache:
@@ -203,28 +212,22 @@ jobs:
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - run:
-          name: Test
+          name: test:e2e:chrome
           command: npm run test:e2e:chrome
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
 
   test-e2e-firefox:
-    environment:
-      browsers: '["Firefox"]'
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
       - restore_cache:
           key: dependency-cache-firefox-{{ .Revision }}
       - run:
           name: Install firefox
-          command: >
-            sudo rm -r /opt/firefox
-            && sudo mv firefox /opt/firefox58
-            && sudo mv /usr/bin/firefox /usr/bin/firefox-old
-            && sudo ln -s /opt/firefox58/firefox /usr/bin/firefox
+          command: ./.circleci/scripts/firefox-install.sh
       - restore_cache:
           key: dependency-cache-{{ .Revision }}
       - restore_cache:
@@ -236,9 +239,46 @@ jobs:
           path: test-artifacts
           destination: test-artifacts
 
+  test-e2e-beta-chrome:
+    docker:
+      - image: circleci/node:8.11.3-browsers
+    steps:
+      - checkout
+      - restore_cache:
+          key: dependency-cache-{{ .Revision }}
+      - restore_cache:
+          key: build-cache-{{ .Revision }}
+      - run:
+          name: test:e2e:chrome:beta
+          command: npm run test:e2e:chrome:beta
+      - store_artifacts:
+          path: test-artifacts
+          destination: test-artifacts
+
+  test-e2e-beta-firefox:
+    docker:
+      - image: circleci/node:8.11.3-browsers
+    steps:
+      - checkout
+      - restore_cache:
+          key: dependency-cache-firefox-{{ .Revision }}
+      - run:
+          name: Install firefox
+          command: ./.circleci/scripts/firefox-install.sh
+      - restore_cache:
+          key: dependency-cache-{{ .Revision }}
+      - restore_cache:
+          key: build-cache-{{ .Revision }}
+      - run:
+          name: test:e2e:firefox:beta
+          command: npm run test:e2e:firefox:beta
+      - store_artifacts:
+          path: test-artifacts
+          destination: test-artifacts
+
   job-screens:
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
       - restore_cache:
@@ -255,7 +295,7 @@ jobs:
 
   job-publish-prerelease:
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
       - restore_cache:
@@ -282,7 +322,7 @@ jobs:
 
   job-publish-release:
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
       - restore_cache:
@@ -305,7 +345,7 @@ jobs:
 
   test-unit:
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
       - restore_cache:
@@ -318,18 +358,14 @@ jobs:
     environment:
       browsers: '["Firefox"]'
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
       - restore_cache:
           key: dependency-cache-firefox-{{ .Revision }}
       - run:
           name: Install firefox
-          command: >
-            sudo rm -r /opt/firefox
-            && sudo mv firefox /opt/firefox58
-            && sudo mv /usr/bin/firefox /usr/bin/firefox-old
-            && sudo ln -s /opt/firefox58/firefox /usr/bin/firefox
+          command: ./.circleci/scripts/firefox-install.sh
       - restore_cache:
           key: dependency-cache-{{ .Revision }}
       - run:
@@ -346,7 +382,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
       - restore_cache:
@@ -365,18 +401,14 @@ jobs:
     environment:
       browsers: '["Firefox"]'
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
       - restore_cache:
           key: dependency-cache-firefox-{{ .Revision }}
       - run:
           name: Install firefox
-          command: >
-            sudo rm -r /opt/firefox
-            && sudo mv firefox /opt/firefox58
-            && sudo mv /usr/bin/firefox /usr/bin/firefox-old
-            && sudo ln -s /opt/firefox58/firefox /usr/bin/firefox
+          command: ./.circleci/scripts/firefox-install.sh
       - restore_cache:
           key: dependency-cache-{{ .Revision }}
       - run:
@@ -393,7 +425,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
       - restore_cache:
@@ -410,9 +442,8 @@ jobs:
 
   all-tests-pass:
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.11.3-browsers
     steps:
       - run:
           name: All Tests Passed
           command: echo 'weew - everything passed!'
-
diff --git a/.circleci/scripts/firefox-download.sh b/.circleci/scripts/firefox-download.sh
new file mode 100755
index 000000000..c63e8c3df
--- /dev/null
+++ b/.circleci/scripts/firefox-download.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+echo "Downloading firefox..."
+wget https://ftp.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/en-US/firefox-58.0.tar.bz2 \
+&& tar xjf firefox-58.0.tar.bz2
+echo "firefox download complete"
diff --git a/.circleci/scripts/firefox-install.sh b/.circleci/scripts/firefox-install.sh
new file mode 100755
index 000000000..589bcbbb5
--- /dev/null
+++ b/.circleci/scripts/firefox-install.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+echo "Installing firefox..."
+sudo rm -r /opt/firefox
+sudo mv firefox /opt/firefox58
+sudo mv /usr/bin/firefox /usr/bin/firefox-old
+sudo ln -s /opt/firefox58/firefox /usr/bin/firefox
+echo "Firefox installed."