Skip to content

Commit

Permalink
Merge branch 'master' into p3-preview
Browse files Browse the repository at this point in the history
  • Loading branch information
manolo committed Jun 15, 2018
2 parents 9c007cd + 4336a09 commit 8c173b9
Show file tree
Hide file tree
Showing 18 changed files with 297 additions and 41 deletions.
16 changes: 16 additions & 0 deletions .gemini-chrome.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
rootUrl: http://localhost:8080/components/vaadin-notification/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"
8 changes: 1 addition & 7 deletions .gemini.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ system:
sauce: true

browsers:
chrome:
desiredCapabilities:
browserName: "chrome"
version: "59.0"
platform: "Windows 10"

firefox:
desiredCapabilities:
browserName: "firefox"
Expand Down Expand Up @@ -57,4 +51,4 @@ browsers:
# desiredCapabilities:
# browserName: "ipad"
# version: "9.2"
# platform: "OS X 10.11"
# platform: "OS X 10.11"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
bower_components
node_modules
package-lock.json
coverage
40 changes: 21 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,40 +11,42 @@ addons:
firefox: latest
chrome: stable

before_script:
- npm install -g bower polymer-cli
- bower install

env:
- POLYMER=2
- POLYMER=2 TEST_SUITE=unit_tests
- POLYMER=2 TEST_SUITE=visual_tests
- POLYMER=3

script:
- if [[ "$POLYMER" = "2" ]]; then
npm install &&
npm -q i && npm i -q --no-save bower polymer-cli && bower -q i &&
gulp lint version:check &&
polymer lint --rules polymer-2 --input ./src/*.html ./theme/**/*.html &&
if [[ "$TRAVIS_EVENT_TYPE" = "pull_request" ]]; then
xvfb-run -s '-screen 0 1024x768x24' polymer test;
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;
else
wct --env saucelabs;
fi;
else
polymer test --env saucelabs;
xvfb-run -s '-screen 0 1024x768x24' wct;
fi &&
if [[ "$TRAVIS_EVENT_TYPE" = "cron" && "$TEST_SUITE" = "unit_tests" ]]; then
wct --env saucelabs-cron;
fi;
fi

- if [[ "$POLYMER" = "3" ]]; then
npm install -g yarn magi-cli &&
(cd .. && git clone --depth 1 -b vaadin-components-rc git://github.com/web-padawan/polymer-modulizer.git && cd polymer-modulizer && npm link) &&
npm --no-save -q install -g yarn bower magi-cli web-component-tester &&
(cd .. && git clone --depth 1 -b vaadin-components-rc git://github.com/web-padawan/polymer-modulizer.git && cd polymer-modulizer && npm -q link) &&
rm -rf node_modules &&
magi p3-convert --out . --import-style=name &&
yarn install --flat &&
if [[ "$TRAVIS_EVENT_TYPE" = "pull_request" ]]; then
xvfb-run -s '-screen 0 1024x768x24' polymer test --module-resolution=node --npm;
if [[ "$TRAVIS_EVENT_TYPE" != "pull_request" && "$TRAVIS_BRANCH" != quick/* ]]; then
wct --module-resolution=node --npm --env saucelabs;
else
polymer test --module-resolution=node --npm --env saucelabs;
xvfb-run -s '-screen 0 1024x768x24' wct --module-resolution=node --npm;
fi;
fi

- if [[ "$TRAVIS_EVENT_TYPE" = "cron" ]]; then
npm install &&
polymer test --env saucelabs-cron;
fi
after_success:
- "cat ${TRAVIS_BUILD_DIR}/coverage/lcov.info | coveralls"
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
![Bower version](https://img.shields.io/bower/v/vaadin-notification.svg)
[![npm version](https://badge.fury.io/js/%40vaadin%2Fvaadin-notification.svg)](https://badge.fury.io/js/%40vaadin%2Fvaadin-notification)
[![Published on webcomponents.org](https://img.shields.io/badge/webcomponents.org-published-blue.svg)](https://www.webcomponents.org/element/vaadin/vaadin-notification)
[![Build Status](https://travis-ci.org/vaadin/vaadin-notification.svg?branch=master)](https://travis-ci.org/vaadin/vaadin-notification)
[![Coverage Status](https://coveralls.io/repos/github/vaadin/vaadin-notification/badge.svg?branch=master)](https://coveralls.io/github/vaadin/vaadin-notification?branch=master)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/vaadin/web-components?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)

[![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0.svg)](https://vaadin.com/directory/component/vaadinvaadin-notification)
[![Stars on vaadin.com/directory](https://img.shields.io/vaadin-directory/star/vaadinvaadin-notification.svg)](https://vaadin.com/directory/component/vaadinvaadin-notification)

# <vaadin-notification>

[Live Demo ↗](https://vaadin.com/components/vaadin-notification/html-examples)
Expand Down
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"polymer": "^2.0.0",
"vaadin-themable-mixin": "vaadin/vaadin-themable-mixin#p3-preview",
"vaadin-element-mixin": "vaadin/vaadin-element-mixin#p3-preview",
"vaadin-lumo-styles": "vaadin/vaadin-lumo-styles#p3-preview"
"vaadin-lumo-styles": "vaadin/vaadin-lumo-styles#p3-preview",
"vaadin-material-styles": "vaadin/vaadin-material-styles#^1.0.0"
},
"devDependencies": {
"iron-component-page": "^3.0.0",
Expand Down
15 changes: 10 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vaadin/vaadin-notification",
"version": "1.0.0-pre.3",
"version": "1.1.0-alpha1",
"description": "vaadin-notification",
"main": "vaadin-notification.html",
"repository": "vaadin/vaadin-notification",
Expand All @@ -22,21 +22,26 @@
"preversion": "gulp version:update"
},
"devDependencies": {
"bower": "latest",
"coveralls": "^3.0.1",
"eslint": "^4.0.0",
"eslint-config-vaadin": "latest",
"eslint-plugin-html": "^4.0.0",
"gulp": "latest",
"gulp-eslint": "^4.0.0",
"gulp-html-extract": "^0.3.0",
"gulp-stylelint": "^7.0.0",
"gulp-clip-empty-files": "^0.1.2",
"gulp-eslint": "^4.0.0",
"gulp-expect-file": "0.0.7",
"gulp-find": "0.0.10",
"gulp-git": "^2.4.2",
"gulp-grep-contents": "0.0.1",
"gulp-html-extract": "^0.3.0",
"gulp-replace": "^0.6.1",
"gulp-stylelint": "^7.0.0",
"polymer-cli": "^1.6.0",
"stylelint": "^9.0.0",
"stylelint-config-vaadin": "latest",
"web-component-tester": "^6.1.5"
"wct-istanbul": "^0.14.3",
"web-component-tester": "^6.1.5",
"yargs": "^8.0.0"
}
}
2 changes: 1 addition & 1 deletion src/vaadin-notification.html
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
}

static get version() {
return '1.0.0-pre.3';
return '1.1.0-alpha1';
}

static get properties() {
Expand Down
63 changes: 60 additions & 3 deletions test/visual/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,72 @@
<meta charset="UTF-8">
<title></title>
<script src="../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>

<dom-module id="test-card" theme-for="vaadin-notification-card">
<template>
<style>
:host([opening]) {
animation: none !important;
}
</style>
</template>
</dom-module>
<link href="../../vaadin-notification.html" rel="import">
</head>

<body>
<body style="height: 100vh;">
<vaadin-notification opened duration="0" position="top-stretch">
<template>
top-strech
</template>
</vaadin-notification>

<vaadin-notification opened>
<vaadin-notification opened duration="0" position="top-start">
<template>
Your work has been saved
top-start
</template>
</vaadin-notification>

<vaadin-notification opened duration="0" position="top-center">
<template>
top-start
</template>
</vaadin-notification>

<vaadin-notification opened duration="0" position="top-end">
<template>
top-start
</template>
</vaadin-notification>

<vaadin-notification opened duration="0" position="middle">
<template>
middle
</template>
</vaadin-notification>

<vaadin-notification opened duration="0" position="bottom-start">
<template>
bottom-start
</template>
</vaadin-notification>

<vaadin-notification opened duration="0" position="bottom-center">
<template>
bottom-center
</template>
</vaadin-notification>

<vaadin-notification opened duration="0" position="bottom-end">
<template>
bottom-end
</template>
</vaadin-notification>

<vaadin-notification opened duration="0" position="bottom-stretch">
<template>
bottom-stretch
</template>
</vaadin-notification>

</body>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions test/visual/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ gemini.suite('vaadin-notification', function(rootSuite) {

gemini.suite('default-tests', function(suite) {
suite
.setUrl('/default.html')
.setCaptureElements('#default-tests')
.capture('normal-button');
.setUrl('default.html')
.setCaptureElements('body')
.capture('default');
});

});
Loading

0 comments on commit 8c173b9

Please sign in to comment.