Browse Source

Remove chrome & zuul now that we're using Firefox for Travis

https://docs.travis-ci.com/user/gui-and-headless-browsers/#Using-xvfb-to
-Run-Tests-That-Require-a-GUI
Kevin van Zonneveld 9 years ago
parent
commit
eb4e1ed337
4 changed files with 1 additions and 51 deletions
  1. 0 1
      .travis.yml
  2. 0 8
      .zuul.yml
  3. 0 41
      bin/install-chromedriver
  4. 1 1
      package.json

+ 0 - 1
.travis.yml

@@ -15,7 +15,6 @@ cache:
   - node_modules
   - node_modules
   - website/node_modules
   - website/node_modules
 before_script:
 before_script:
-- export CHROME_BIN=chromium-browser
 - export PATH=${PATH}:${HOME}/bin
 - export PATH=${PATH}:${HOME}/bin
 - export DISPLAY=:99.0
 - export DISPLAY=:99.0
 - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile
 - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile

+ 0 - 8
.zuul.yml

@@ -1,8 +0,0 @@
-ui: tape
-browsers:
-  - name: chrome
-    version: 27..latest
-  - name: ie
-    version: latest
-  - name: iphone
-    version: 6.1

+ 0 - 41
bin/install-chromedriver

@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-set -o pipefail
-set -o errexit
-set -o nounset
-# set -o xtrace
-
-# Set magic variables for current file & dir
-__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-__file="${__dir}/$(basename "${BASH_SOURCE[0]}")"
-__base="$(basename ${__file} .sh)"
-
-colorRed='\033[0;31m'
-colorGreen='\033[0;32m'
-colorReset='\033[0m'
-
-export PATH="${PATH}:${HOME}/bin"
-
-echo -n "--> Checking for chromedriver: "
-if which chromedriver >/dev/null 2>&1; then
-  echo -e "${colorGreen}✓${colorReset}"
-else
-  echo -e "${colorRed}✗${colorReset}"
-  echo "--> Installing chromedriver"
-  if [[ "${OSTYPE}" == "darwin"* ]]; then
-    brew install chromedriver
-  else
-    mkdir -p "${HOME}/bin"
-    cd "${HOME}/bin"
-    wget 'http://chromedriver.storage.googleapis.com/2.21/chromedriver_linux64.zip'
-    unzip -o chromedriver_linux64.zip && rm -f chromedriver_linux64.zip
-    chmod 755 chromedriver
-  fi
-  echo -n "--> Verifying chromedriver: "
-  if chromedriver -v >/dev/null 2>&1; then
-    echo -e "${colorGreen}✓${colorReset}"
-  else
-    echo -e "${colorRed}✗${colorReset}"
-    chromedriver -v
-    exit 1
-  fi
-fi

+ 1 - 1
package.json

@@ -13,7 +13,7 @@
     "build": "npm run build:lib && npm run build:bundle && npm run build:bundle:min && npm run build:css",
     "build": "npm run build:lib && npm run build:bundle && npm run build:bundle:min && npm run build:css",
     "clean": "rm -rf lib && rm -rf dist",
     "clean": "rm -rf lib && rm -rf dist",
     "docs": "cd website && documentation readme ../src/index.js --readme-file=src/api/docs.md --section 'Uppy Core & Plugins' -q --github -c doc-order.json",
     "docs": "cd website && documentation readme ../src/index.js --readme-file=src/api/docs.md --section 'Uppy Core & Plugins' -q --github -c doc-order.json",
-    "install": "npm run web:install && bin/install-chromedriver",
+    "install": "npm run web:install",
     "lint:fix": "eslint . --fix",
     "lint:fix": "eslint . --fix",
     "lint": "eslint .",
     "lint": "eslint .",
     "release:major": "env SEMANTIC=major npm run release",
     "release:major": "env SEMANTIC=major npm run release",