Skip to content

Commit

Permalink
Merge 62d42b6 into 19bc182
Browse files Browse the repository at this point in the history
  • Loading branch information
manolo committed Jul 2, 2018
2 parents 19bc182 + 62d42b6 commit 738e891
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 55 deletions.
16 changes: 0 additions & 16 deletions .gemini-chrome.yml

This file was deleted.

44 changes: 6 additions & 38 deletions .gemini.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,46 +9,14 @@ system:
sauce: true

browsers:
firefox:
chrome:
desiredCapabilities:
browserName: "firefox"
version: "47.0"
platform: "Windows 10"

ie:
desiredCapabilities:
browserName: "internet explorer"
version: "11.0"
browserName: "chrome"
version: "67.0"
platform: "Windows 10"

edge:
firefox:
desiredCapabilities:
browserName: "microsoftedge"
version: "15"
browserName: "firefox"
version: "47.0"
platform: "Windows 10"

android:
desiredCapabilities:
browserName: "chrome"
platform: "Android"

# The following setups don't currently work due to Selenium SafariDriver issue
# https://github.com/vaadin/vaadin-element-skeleton/issues/19
#
# safari:
# desiredCapabilities:
# browserName: "safari"
# version: "10.0"
# platform: "OS X 10.11"
#
# iphone:
# desiredCapabilities:
# browserName: "iphone"
# version: "9.2"
# platform: "OS X 10.11"
#
# ipad:
# desiredCapabilities:
# browserName: "ipad"
# version: "9.2"
# platform: "OS X 10.11"
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ script:
if [[ "$TRAVIS_EVENT_TYPE" != "pull_request" && "$TRAVIS_BRANCH" != quick/* ]]; then
if [[ "$TEST_SUITE" = "visual_tests" ]]; then
npm i -q --no-save gemini@^4.0.0 gemini-sauce gemini-polyserve &&
gemini test test/visual && gemini test test/visual -c .gemini-chrome.yml;
gemini test test/visual;
else
wct --env saucelabs;
fi;
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.

0 comments on commit 738e891

Please sign in to comment.