Skip to content
This repository has been archived by the owner on May 24, 2021. It is now read-only.

Commit

Permalink
chore(integration-tests): Upgrades cypress
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexander-heimbuch
alexander-heimbuch committed Jun 5, 2018
1 parent b33297a commit e2441e4
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 41 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ jobs:
steps:
- attach_workspace:
at: ~/podlove-web-player
- run: yarn run test:integration
- run: yarn test:integration
- store_test_results:
path: reports
- store_artifacts:
Expand Down
4 changes: 2 additions & 2 deletions build/webpack.config.base.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ module.exports = {
},
styles: {
name: 'style',
test: module => module.nameForCondition && /\.(s?css|vue)$/.test(module.nameForCondition()) && !/^javascript/.test(module.type),
test: /\.(s?css|vue)$/,
enforce: true,
chunks: chunk => ~['window', 'share', 'vendor'].indexOf(chunk.name),
chunks: chunk => chunk.name !== 'embed',
minChunks: 1
}
}
Expand Down
1 change: 1 addition & 0 deletions cypress/testbed/test.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@

<script src="vendor.js"></script>
<script src="window.js"></script>
<script src="style.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions docs/test-standalone.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,5 +284,6 @@

<script src="{{ site.baseurl }}/vendor.js"></script>
<script src="{{ site.baseurl }}/window.js"></script>
<script src="{{ site.baseurl }}/style.js"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"cypress:dev": "npm run cypress:assets && cypress open",
"cypress:ci": "npm run test:prepare && cypress run --record --key 54ef8855-9428-4b03-92db-fe0d853c4c41 --reporter junit --reporter-options 'mochaFile=reports/junit.xml'",
"cypress:server": "http-server -p 8080 dist/ > http.log 2>&1 &",
"test:integration": "npm run cypress:assets && npm run build && npm run cypress:server && npm run cypress:ci"
"test:integration": "cypress install && npm run cypress:assets && npm run build && npm run cypress:server && npm run cypress:ci"
},
"files": [
"dist/"
Expand Down Expand Up @@ -102,7 +102,7 @@
"conventional-changelog-lint": "2.1.1",
"cross-env": "5.1.6",
"css-loader": "0.28.11",
"cypress": "^2.1.0",
"cypress": "3.0.1",
"cz-conventional-changelog": "2.1.0",
"eslint": "4.19.1",
"eslint-plugin-html": "4.0.3",
Expand Down
1 change: 0 additions & 1 deletion src/components/tabs/Tabs.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ export default {
methods: {
toggleTab (tab) {
return () => {
!this.tabs[tab] && this.$refs[tab].$el.focus()
store.dispatch(store.actions.toggleTab(tab))
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/embed/embed.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ const createPlayerDom = config => [
type: 'text/javascript',
src: `${get(config.reference, 'base', BASE)}/window.js`
}),
tag('script', '', {
type: 'text/javascript',
src: `${get(config.reference, 'base', BASE)}/style.js`
}),

// iFrameResizer
tag('script', iframeResizerContentWindow)
Expand Down
1 change: 1 addition & 0 deletions src/statics/share.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
<PodlovePlayer></PodlovePlayer>
<script src="vendor.js"></script>
<script src="share.js"></script>
<script src="style.js"></script>
</body>
</html>
66 changes: 31 additions & 35 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,11 @@
date-fns "^1.27.2"
figures "^1.7.0"

"@cypress/xvfb@1.1.3":
version "1.1.3"
resolved "https://registry.yarnpkg.com/@cypress/xvfb/-/xvfb-1.1.3.tgz#6294a7d1feb751f12302248f2089fc534c4acb7f"
"@cypress/xvfb@1.2.3":
version "1.2.3"
resolved "https://registry.yarnpkg.com/@cypress/xvfb/-/xvfb-1.2.3.tgz#6319afdcdcff7d1505daeeaa84484d0596189860"
dependencies:
debug "^3.1.0"
lodash.once "^4.1.1"

"@ladjs/time-require@^0.1.4":
Expand Down Expand Up @@ -2111,7 +2112,7 @@ cacheable-request@^2.1.1:
normalize-url "2.0.1"
responselike "1.0.2"

cachedir@^1.1.0:
cachedir@1.2.0, cachedir@^1.1.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-1.2.0.tgz#e9a0a25bb21a2b7a0f766f07c41eb7a311919b97"
dependencies:
Expand Down Expand Up @@ -2240,13 +2241,13 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
strip-ansi "^3.0.0"
supports-color "^2.0.0"

chalk@2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
chalk@2.4.1, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
dependencies:
ansi-styles "^3.1.0"
ansi-styles "^3.2.1"
escape-string-regexp "^1.0.5"
supports-color "^4.0.0"
supports-color "^5.3.0"

chalk@^0.4.0, chalk@~0.4.0:
version "0.4.0"
Expand All @@ -2256,14 +2257,6 @@ chalk@^0.4.0, chalk@~0.4.0:
has-color "~0.1.0"
strip-ansi "~0.1.0"

chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
dependencies:
ansi-styles "^3.2.1"
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"

chardet@^0.4.0:
version "0.4.2"
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
Expand Down Expand Up @@ -3180,12 +3173,12 @@ cyclist@~0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"

cypress@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/cypress/-/cypress-2.1.0.tgz#a8bd7d9b89c38a1e380db83b57d9bba0dbb95ba4"
cypress@3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.0.1.tgz#6a8938ce8a551e4ae1bd5fb2ceab038d4ad39c4d"
dependencies:
"@cypress/listr-verbose-renderer" "0.4.1"
"@cypress/xvfb" "1.1.3"
"@cypress/xvfb" "1.2.3"
"@types/blob-util" "1.3.3"
"@types/bluebird" "3.5.18"
"@types/chai" "4.0.8"
Expand All @@ -3197,11 +3190,13 @@ cypress@^2.1.0:
"@types/sinon" "4.0.0"
"@types/sinon-chai" "2.7.29"
bluebird "3.5.0"
chalk "2.1.0"
cachedir "1.2.0"
chalk "2.4.1"
check-more-types "2.24.0"
commander "2.11.0"
common-tags "1.4.0"
debug "3.1.0"
executable "4.1.1"
extract-zip "1.6.6"
fs-extra "4.0.1"
getos "2.8.4"
Expand All @@ -3211,6 +3206,7 @@ cypress@^2.1.0:
lazy-ass "1.6.0"
listr "0.12.0"
lodash "4.17.4"
log-symbols "2.2.0"
minimist "1.2.0"
progress "1.1.8"
ramda "0.24.1"
Expand Down Expand Up @@ -4101,6 +4097,12 @@ execa@^0.7.0:
signal-exit "^3.0.0"
strip-eof "^1.0.0"

executable@4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
dependencies:
pify "^2.2.0"

exit-hook@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
Expand Down Expand Up @@ -6627,18 +6629,18 @@ lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.2,
version "4.17.10"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"

log-symbols@2.2.0, log-symbols@^2.1.0, log-symbols@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
dependencies:
chalk "^2.0.1"

log-symbols@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
dependencies:
chalk "^1.0.0"

log-symbols@^2.1.0, log-symbols@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
dependencies:
chalk "^2.0.1"

log-update@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1"
Expand Down Expand Up @@ -7932,7 +7934,7 @@ performance-now@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"

pify@^2.0.0, pify@^2.3.0:
pify@^2.0.0, pify@^2.2.0, pify@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"

Expand Down Expand Up @@ -9991,12 +9993,6 @@ supports-color@^3.1.2, supports-color@^3.2.3:
dependencies:
has-flag "^1.0.0"

supports-color@^4.0.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
dependencies:
has-flag "^2.0.0"

supports-color@^5.0.0, supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0:
version "5.4.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
Expand Down

0 comments on commit e2441e4

Please sign in to comment.