diff --git a/.gemini-chrome.yml b/.gemini-chrome.yml new file mode 100644 index 0000000..cb3f50b --- /dev/null +++ b/.gemini-chrome.yml @@ -0,0 +1,16 @@ +rootUrl: http://localhost:8080/components/vaadin-button/test/visual/ +gridUrl: http://localhost:4444/wd/hub +screenshotsDir: ./test/visual/screens + +system: + plugins: + polyserve: + port: 8080 + sauce: true + +browsers: + chrome: + desiredCapabilities: + browserName: "chrome" + version: "61.0" + platform: "Windows 10" \ No newline at end of file diff --git a/.gemini-ie.yml b/.gemini-ie.yml deleted file mode 100644 index d13e636..0000000 --- a/.gemini-ie.yml +++ /dev/null @@ -1,16 +0,0 @@ -rootUrl: http://127.0.0.1:8080/components/vaadin-button/test/visual/ -gridUrl: http://127.0.0.1:4444/wd/hub -screenshotsDir: ./test/visual/screens - -system: - plugins: - polyserve: - port: 8080 - sauce: true - -browsers: - ie: - desiredCapabilities: - browserName: "internet explorer" - version: "11.0" - platform: "Windows 10" diff --git a/.gemini.yml b/.gemini.yml index 2996e4e..31980dd 100644 --- a/.gemini.yml +++ b/.gemini.yml @@ -9,24 +9,29 @@ system: sauce: true browsers: - chrome: - desiredCapabilities: - browserName: "chrome" - version: "59.0" - platform: "Windows 10" - firefox: desiredCapabilities: browserName: "firefox" version: "47.0" platform: "Windows 10" + ie: + desiredCapabilities: + browserName: "internet explorer" + version: "11.0" + platform: "Windows 10" + edge: desiredCapabilities: browserName: "microsoftedge" version: "15" 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 # @@ -46,4 +51,4 @@ browsers: # desiredCapabilities: # browserName: "ipad" # version: "9.2" - # platform: "OS X 10.11" + # platform: "OS X 10.11" \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 554ec01..692cffa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,10 +20,22 @@ before_script: - polymer lint --rules polymer-2 --input ./src/*.html ./theme/**/*.html - xvfb-run -s '-screen 0 1024x768x24' wct +env: + - TEST_SUITE=visual_tests + - TEST_SUITE=unit_tests + script: - if [[ "$TRAVIS_EVENT_TYPE" != "pull_request" && "$TRAVIS_BRANCH" != quick/* ]]; then - wct --env saucelabs; + if [[ "$TEST_SUITE" = "visual_tests" ]]; then + npm i --no-save gemini@^4.0.0 gemini-sauce gemini-polyserve && + gemini test test/visual && gemini test test/visual -c .gemini-chrome.yml; + fi && + if [[ "$TEST_SUITE" = "unit_tests" ]]; then + wct --env saucelabs; + fi; fi - if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then - wct --env saucelabs-cron; + if [[ "$TEST_SUITE" = "unit_tests" ]]; then + wct --env saucelabs-cron; + fi; fi diff --git a/test/visual/colors.html b/test/visual/colors.html new file mode 100644 index 0000000..ec3a7d0 --- /dev/null +++ b/test/visual/colors.html @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + +

Colors

+ + Contrast: + + + Button + + + + Button + + + + Button + + + +
Success: + + + Button + + + + Button + + + + Button + + +
Error: + + + Button + + + + Button + + + + Button + + + \ No newline at end of file diff --git a/test/visual/default.html b/test/visual/default.html index 68c4585..5b3195f 100644 --- a/test/visual/default.html +++ b/test/visual/default.html @@ -17,7 +17,7 @@ - + diff --git a/test/visual/icons.html b/test/visual/icons.html new file mode 100644 index 0000000..2eb05ad --- /dev/null +++ b/test/visual/icons.html @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + +

Icons and size presets

+ + + + + + + + Icon prefix + + + + Icon suffix + + + + + + + + + + Icon prefix + + + + Icon suffix + + + + + + + + + + Icon prefix + + + + Icon suffix + + + \ No newline at end of file diff --git a/test/visual/lumo.html b/test/visual/lumo.html deleted file mode 100644 index c0473c2..0000000 --- a/test/visual/lumo.html +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - -

Sizing and vertical align

- -Plain text - -Default - - - - Fixed width - - - - Fixed height - - - - - - Fixed width and height - - - - - Multiple
lines -
- - - - -

Truncation and expansion

- -Longer text for a button - - - - Longer text for a button - - - - Longer text for a button - - - -Longer text for a button - - - - Longer text for a button - - - - Longer text for a button - - - - - - - - - -

Icons and size presets

- - - - - - - - Icon prefix - - - - Icon suffix - - - - - - - - - - Icon prefix - - - - Icon suffix - - - - - - - - - - Icon prefix - - - - Icon suffix - - - - - -

Types

- -Primary: - - - Button - - - - - Icon prefix - - - - Icon suffix - - - -
Tertiary: - - - Button - - - - - Icon prefix - - - - Icon suffix - - - -
Tertiary inline: - - - Button - -and - - - Icon prefix - -and - - Icon suffix - - - - - - - - - -

Colors

- -Contrast: - - - Button - - - - Button - - - - Button - - - -
Success: - - - Button - - - - Button - - - - Button - - -
Error: - - - Button - - - - Button - - - - Button - diff --git a/test/visual/screens/vaadin-button/colors/default/android.png b/test/visual/screens/vaadin-button/colors/default/android.png new file mode 100644 index 0000000..3481f08 Binary files /dev/null and b/test/visual/screens/vaadin-button/colors/default/android.png differ diff --git a/test/visual/screens/vaadin-button/colors/default/chrome.png b/test/visual/screens/vaadin-button/colors/default/chrome.png new file mode 100644 index 0000000..825e6ee Binary files /dev/null and b/test/visual/screens/vaadin-button/colors/default/chrome.png differ diff --git a/test/visual/screens/vaadin-button/colors/default/edge.png b/test/visual/screens/vaadin-button/colors/default/edge.png new file mode 100644 index 0000000..5a194e7 Binary files /dev/null and b/test/visual/screens/vaadin-button/colors/default/edge.png differ diff --git a/test/visual/screens/vaadin-button/colors/default/firefox.png b/test/visual/screens/vaadin-button/colors/default/firefox.png new file mode 100644 index 0000000..136fcb1 Binary files /dev/null and b/test/visual/screens/vaadin-button/colors/default/firefox.png differ diff --git a/test/visual/screens/vaadin-button/colors/default/ie.png b/test/visual/screens/vaadin-button/colors/default/ie.png new file mode 100644 index 0000000..c746afb Binary files /dev/null and b/test/visual/screens/vaadin-button/colors/default/ie.png differ diff --git a/test/visual/screens/vaadin-button/default-tests/default/android.png b/test/visual/screens/vaadin-button/default-tests/default/android.png new file mode 100644 index 0000000..f2383f4 Binary files /dev/null and b/test/visual/screens/vaadin-button/default-tests/default/android.png differ diff --git a/test/visual/screens/vaadin-button/default-tests/default/chrome.png b/test/visual/screens/vaadin-button/default-tests/default/chrome.png index 8e10cd8..b3d38d2 100644 Binary files a/test/visual/screens/vaadin-button/default-tests/default/chrome.png and b/test/visual/screens/vaadin-button/default-tests/default/chrome.png differ diff --git a/test/visual/screens/vaadin-button/default-tests/default/edge.png b/test/visual/screens/vaadin-button/default-tests/default/edge.png index 12865b6..c346552 100644 Binary files a/test/visual/screens/vaadin-button/default-tests/default/edge.png and b/test/visual/screens/vaadin-button/default-tests/default/edge.png differ diff --git a/test/visual/screens/vaadin-button/default-tests/default/firefox.png b/test/visual/screens/vaadin-button/default-tests/default/firefox.png index d9b400a..8770222 100644 Binary files a/test/visual/screens/vaadin-button/default-tests/default/firefox.png and b/test/visual/screens/vaadin-button/default-tests/default/firefox.png differ diff --git a/test/visual/screens/vaadin-button/default-tests/default/ie.png b/test/visual/screens/vaadin-button/default-tests/default/ie.png index 4ad1d7b..9da79a0 100644 Binary files a/test/visual/screens/vaadin-button/default-tests/default/ie.png and b/test/visual/screens/vaadin-button/default-tests/default/ie.png differ diff --git a/test/visual/screens/vaadin-button/icons/default/android.png b/test/visual/screens/vaadin-button/icons/default/android.png new file mode 100644 index 0000000..395e14f Binary files /dev/null and b/test/visual/screens/vaadin-button/icons/default/android.png differ diff --git a/test/visual/screens/vaadin-button/icons/default/chrome.png b/test/visual/screens/vaadin-button/icons/default/chrome.png new file mode 100644 index 0000000..8755655 Binary files /dev/null and b/test/visual/screens/vaadin-button/icons/default/chrome.png differ diff --git a/test/visual/screens/vaadin-button/icons/default/edge.png b/test/visual/screens/vaadin-button/icons/default/edge.png new file mode 100644 index 0000000..b9d4c39 Binary files /dev/null and b/test/visual/screens/vaadin-button/icons/default/edge.png differ diff --git a/test/visual/screens/vaadin-button/icons/default/firefox.png b/test/visual/screens/vaadin-button/icons/default/firefox.png new file mode 100644 index 0000000..aa207cf Binary files /dev/null and b/test/visual/screens/vaadin-button/icons/default/firefox.png differ diff --git a/test/visual/screens/vaadin-button/icons/default/ie.png b/test/visual/screens/vaadin-button/icons/default/ie.png new file mode 100644 index 0000000..2800ea8 Binary files /dev/null and b/test/visual/screens/vaadin-button/icons/default/ie.png differ diff --git a/test/visual/screens/vaadin-button/sizing/default/android.png b/test/visual/screens/vaadin-button/sizing/default/android.png new file mode 100644 index 0000000..52ffca1 Binary files /dev/null and b/test/visual/screens/vaadin-button/sizing/default/android.png differ diff --git a/test/visual/screens/vaadin-button/sizing/default/chrome.png b/test/visual/screens/vaadin-button/sizing/default/chrome.png new file mode 100644 index 0000000..fdceeb3 Binary files /dev/null and b/test/visual/screens/vaadin-button/sizing/default/chrome.png differ diff --git a/test/visual/screens/vaadin-button/sizing/default/edge.png b/test/visual/screens/vaadin-button/sizing/default/edge.png new file mode 100644 index 0000000..448744d Binary files /dev/null and b/test/visual/screens/vaadin-button/sizing/default/edge.png differ diff --git a/test/visual/screens/vaadin-button/sizing/default/firefox.png b/test/visual/screens/vaadin-button/sizing/default/firefox.png new file mode 100644 index 0000000..3399f0c Binary files /dev/null and b/test/visual/screens/vaadin-button/sizing/default/firefox.png differ diff --git a/test/visual/screens/vaadin-button/sizing/default/ie.png b/test/visual/screens/vaadin-button/sizing/default/ie.png new file mode 100644 index 0000000..a23570c Binary files /dev/null and b/test/visual/screens/vaadin-button/sizing/default/ie.png differ diff --git a/test/visual/screens/vaadin-button/styling/default/chrome.png b/test/visual/screens/vaadin-button/styling/default/chrome.png deleted file mode 100644 index 3675661..0000000 Binary files a/test/visual/screens/vaadin-button/styling/default/chrome.png and /dev/null differ diff --git a/test/visual/screens/vaadin-button/styling/default/edge.png b/test/visual/screens/vaadin-button/styling/default/edge.png deleted file mode 100644 index 0909c7e..0000000 Binary files a/test/visual/screens/vaadin-button/styling/default/edge.png and /dev/null differ diff --git a/test/visual/screens/vaadin-button/styling/default/firefox.png b/test/visual/screens/vaadin-button/styling/default/firefox.png deleted file mode 100644 index 0cbe3b9..0000000 Binary files a/test/visual/screens/vaadin-button/styling/default/firefox.png and /dev/null differ diff --git a/test/visual/screens/vaadin-button/styling/default/ie.png b/test/visual/screens/vaadin-button/styling/default/ie.png deleted file mode 100644 index 44afb0b..0000000 Binary files a/test/visual/screens/vaadin-button/styling/default/ie.png and /dev/null differ diff --git a/test/visual/screens/vaadin-button/truncation-expansion/default/android.png b/test/visual/screens/vaadin-button/truncation-expansion/default/android.png new file mode 100644 index 0000000..9aad59f Binary files /dev/null and b/test/visual/screens/vaadin-button/truncation-expansion/default/android.png differ diff --git a/test/visual/screens/vaadin-button/truncation-expansion/default/chrome.png b/test/visual/screens/vaadin-button/truncation-expansion/default/chrome.png new file mode 100644 index 0000000..d634b9b Binary files /dev/null and b/test/visual/screens/vaadin-button/truncation-expansion/default/chrome.png differ diff --git a/test/visual/screens/vaadin-button/truncation-expansion/default/edge.png b/test/visual/screens/vaadin-button/truncation-expansion/default/edge.png new file mode 100644 index 0000000..418a20c Binary files /dev/null and b/test/visual/screens/vaadin-button/truncation-expansion/default/edge.png differ diff --git a/test/visual/screens/vaadin-button/truncation-expansion/default/firefox.png b/test/visual/screens/vaadin-button/truncation-expansion/default/firefox.png new file mode 100644 index 0000000..471cd6a Binary files /dev/null and b/test/visual/screens/vaadin-button/truncation-expansion/default/firefox.png differ diff --git a/test/visual/screens/vaadin-button/truncation-expansion/default/ie.png b/test/visual/screens/vaadin-button/truncation-expansion/default/ie.png new file mode 100644 index 0000000..3f9afbe Binary files /dev/null and b/test/visual/screens/vaadin-button/truncation-expansion/default/ie.png differ diff --git a/test/visual/screens/vaadin-button/types/default/android.png b/test/visual/screens/vaadin-button/types/default/android.png new file mode 100644 index 0000000..f011bef Binary files /dev/null and b/test/visual/screens/vaadin-button/types/default/android.png differ diff --git a/test/visual/screens/vaadin-button/types/default/chrome.png b/test/visual/screens/vaadin-button/types/default/chrome.png new file mode 100644 index 0000000..5f1f304 Binary files /dev/null and b/test/visual/screens/vaadin-button/types/default/chrome.png differ diff --git a/test/visual/screens/vaadin-button/types/default/edge.png b/test/visual/screens/vaadin-button/types/default/edge.png new file mode 100644 index 0000000..07caf63 Binary files /dev/null and b/test/visual/screens/vaadin-button/types/default/edge.png differ diff --git a/test/visual/screens/vaadin-button/types/default/firefox.png b/test/visual/screens/vaadin-button/types/default/firefox.png new file mode 100644 index 0000000..7fcc7a7 Binary files /dev/null and b/test/visual/screens/vaadin-button/types/default/firefox.png differ diff --git a/test/visual/screens/vaadin-button/types/default/ie.png b/test/visual/screens/vaadin-button/types/default/ie.png new file mode 100644 index 0000000..1ef777a Binary files /dev/null and b/test/visual/screens/vaadin-button/types/default/ie.png differ diff --git a/test/visual/sizing.html b/test/visual/sizing.html new file mode 100644 index 0000000..544d93f --- /dev/null +++ b/test/visual/sizing.html @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + +

Sizing and vertical align

+ + + + Fixed width + + + + Fixed height + + + + + + Fixed width and height + + + + + Multiple
lines +
+ \ No newline at end of file diff --git a/test/visual/styling.html b/test/visual/styling.html deleted file mode 100644 index eb5e125..0000000 --- a/test/visual/styling.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - Button - - diff --git a/test/visual/test.js b/test/visual/test.js index 910cec4..ffc34bc 100644 --- a/test/visual/test.js +++ b/test/visual/test.js @@ -16,15 +16,43 @@ gemini.suite('vaadin-button', function(rootSuite) { gemini.suite('default-tests', function(suite) { suite - .setUrl('/default.html') - .setCaptureElements('#default-tests') + .setUrl('default.html') + .setCaptureElements('body') .capture('default'); }); - gemini.suite('styling', function(suite) { + gemini.suite('colors', function(suite) { suite - .setUrl('styling.html') - .setCaptureElements('vaadin-button') + .setUrl('colors.html') + .setCaptureElements('body') + .capture('default'); + }); + + gemini.suite('icons', function(suite) { + suite + .setUrl('icons.html') + .setCaptureElements('body') + .capture('default'); + }); + + gemini.suite('sizing', function(suite) { + suite + .setUrl('sizing.html') + .setCaptureElements('body') + .capture('default'); + }); + + gemini.suite('truncation-expansion', function(suite) { + suite + .setUrl('truncation-expansion.html') + .setCaptureElements('body') + .capture('default'); + }); + + gemini.suite('types', function(suite) { + suite + .setUrl('types.html') + .setCaptureElements('body') .capture('default'); }); diff --git a/test/visual/truncation-expansion.html b/test/visual/truncation-expansion.html new file mode 100644 index 0000000..5716710 --- /dev/null +++ b/test/visual/truncation-expansion.html @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + +

Truncation and expansion

+ + Longer text for a button + + + + Longer text for a button + + + + Longer text for a button + + + + Longer text for a button + + + + Longer text for a button + + + + Longer text for a button + + + \ No newline at end of file diff --git a/test/visual/types.html b/test/visual/types.html new file mode 100644 index 0000000..9a4efd6 --- /dev/null +++ b/test/visual/types.html @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + +

Types

+ + Primary: + + + Button + + + + + Icon prefix + + + + Icon suffix + + + +
Tertiary: + + + Button + + + + + Icon prefix + + + + Icon suffix + + + +
Tertiary inline: + + + Button + + and + + + Icon prefix + + and + + Icon suffix + + + \ No newline at end of file diff --git a/test/visual/vaadin-logo.svg b/test/visual/vaadin-logo.svg new file mode 100644 index 0000000..0a067da --- /dev/null +++ b/test/visual/vaadin-logo.svg @@ -0,0 +1,21 @@ + + vaadinlogo + + + + + + + + + +