Merge remote-tracking branch 'origin' into terminalwrapper

.circleci/config.yml

@@ -388,16 +388,25 @@ jobs:
       - run: yarn install --cwd ./apps/remix-ide-e2e --modules-folder ../../node_modules
       - run: mkdir node_modules/hardhat && wget https://unpkg.com/hardhat/console.sol -O node_modules/hardhat/console.sol
       - run: ls -la ./dist/apps/remix-ide/assets/js
-      - run: yarn run selenium-install || yarn run selenium-install
+      - run: yarn run selenium-install --singleDriverInstall=firefox
       - when:
           condition:
               equal: [ "chrome", << parameters.browser >> ]
           steps:
+            - run: mkdir -p node_modules/selenium-standalone/.selenium/chromedriver/latest-x64/
             - run: cp ~/bin/chromedriver /home/circleci/remix-project/node_modules/selenium-standalone/.selenium/chromedriver/latest-x64/
-      - run:
+            - run: 
-          name: Start Selenium
+                name: run selenium
-          command: yarn run selenium
+                command: yarn selenium-standalone start --singleDriverStart=chrome
-          background: true
+                background: true
+      - when:
+          condition:
+              equal: [ "firefox", << parameters.browser >> ]
+          steps:
+            - run: 
+                name: run selenium
+                command: yarn selenium-standalone start --singleDriverStart=firefox
+                background: true
       - run: ./apps/remix-ide/ci/<< parameters.script >> << parameters.browser >> << parameters.jobsize >> << parameters.job >>
       - store_test_results:
           path: ./reports/tests
@@ -439,11 +448,12 @@ jobs:
       - run: unzip ./persist/dist.zip
       - run: unzip ./persist/plugin-<< parameters.plugin >>.zip
       - run: yarn install --cwd ./apps/remix-ide-e2e --modules-folder ../../node_modules
-      - run: yarn run selenium-install || yarn run selenium-install
+      - run: yarn run selenium-install --singleDriverInstall=firefox
+      - run: mkdir -p node_modules/selenium-standalone/.selenium/chromedriver/latest-x64/
       - run: cp ~/bin/chromedriver /home/circleci/remix-project/node_modules/selenium-standalone/.selenium/chromedriver/latest-x64/
       - run:
           name: Start Selenium
-          command: yarn run selenium
+          command: yarn run selenium --singleDriverStart=chrome
           background: true
       - run: ./apps/remix-ide/ci/browser_test_plugin.sh << parameters.plugin >>
       - store_test_results: