Skip to content

Commit

Permalink
Update selenium-webdriver
Browse files Browse the repository at this point in the history
  • Loading branch information
zalmoxisus committed Jan 10, 2017
1 parent f0e2ec8 commit 7415a06
Show file tree
Hide file tree
Showing 4 changed files with 5,686 additions and 16 deletions.
15 changes: 8 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ sudo: required
dist: trusty
language: node_js
node_js:
- "5"
- "6"
cache:
directories:
- $HOME/.yarn-cache
- node_modules
env:
- CXX=g++-4.8
addons:
Expand All @@ -13,19 +17,16 @@ addons:
packages:
- google-chrome-stable
- g++-4.8
cache:
directories:
- node_modules

install:
- "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
- npm install
- npm install -g yarn
- yarn install

before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start &
- sleep 3

script:
- npm run lint
- npm test
- yarn test
13 changes: 6 additions & 7 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
environment:
matrix:
- nodejs_version: '4'
- nodejs_version: '6'

cache:
- node_modules -> package.json
- "%LOCALAPPDATA%/Yarn"
- node_modules

install:
- ps: Install-Product node $env:nodejs_version
- npm -g install npm@2
- set PATH=%APPDATA%\npm;%PATH%
- npm install --msvs_version=2013
- yarn install

test_script:
- node --version
- npm --version
- cmd: npm test
- yarn --version
- yarn test

build: off
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"babel-preset-react": "^6.16.0",
"babel-preset-stage-0": "^6.16.0",
"babel-register": "^6.18.0",
"chromedriver": "^2.25.1",
"chromedriver": "^2.27.1",
"co-mocha": "^1.1.3",
"cross-env": "^1.0.8",
"electron": "^1.4.4",
Expand All @@ -63,7 +63,7 @@
"react-transform-catch-errors": "^1.0.0",
"react-transform-hmr": "^1.0.1",
"rimraf": "^2.5.3",
"selenium-webdriver": "2.53.3",
"selenium-webdriver": "^3.0.1",
"sinon-chrome": "^1.1.2",
"style-loader": "^0.12.4",
"webpack": "^1.13.3"
Expand Down
Loading

0 comments on commit 7415a06

Please sign in to comment.