Skip to content

Commit

Permalink
moved spec files, adjusted Cypress config, added/refined some tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Ron Valstar committed Dec 28, 2018
1 parent 6f125bc commit 7bb785b
Show file tree
Hide file tree
Showing 27 changed files with 694 additions and 402 deletions.
3 changes: 2 additions & 1 deletion cypress.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"projectId": "projectInvoice",
"video": false,
"ignoreTestFiles": ["pi.js","example_spec.js"]
"ignoreTestFiles": ["components/*.spec*.js","!*.spec*.js"],
"integrationFolder": "src"
}
66 changes: 0 additions & 66 deletions cypress/integration/pi_page_home.js

This file was deleted.

171 changes: 0 additions & 171 deletions cypress/integration/pi_page_project.js

This file was deleted.

77 changes: 0 additions & 77 deletions cypress/integration/unit/model/client.spec.js

This file was deleted.

62 changes: 43 additions & 19 deletions cypress/plugins/index.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,47 @@
// cypress/plugins/index.js
// tests/e2e/plugins/index.js

// webpack import
const webpack = require('@cypress/webpack-preprocessor')
const webpackOptions = {
module: {
rules: [
{
test: /\.vue$/,
loader: 'vue-loader'
}
]
}
}

const options = {
// send in the options from your webpack.config.js, so it works the same
// as your app's code
webpackOptions,
watchOptions: {}
module.exports = (on, config) => {
on(
'file:preprocessor',
webpack({
webpackOptions: require('@vue/cli-service/webpack.config'),
watchOptions: {}
})
)

return Object.assign({}, config, {
// fixturesFolder: 'tests/e2e/fixtures',
// integrationFolder: 'tests/e2e/specs',
// screenshotsFolder: 'tests/e2e/screenshots',
// videosFolder: 'tests/e2e/videos',
// supportFile: 'tests/e2e/support/index.js'
})
}

module.exports = on => {
on('file:preprocessor', webpack(options))
}

// // cypress/plugins/index.js
// const webpack = require('@cypress/webpack-preprocessor')
// const webpackOptions = {
// module: {
// rules: [
// {
// test: /\.vue$/,
// loader: 'vue-loader'
// }
// ]
// }
// }
//
// const options = {
// // send in the options from your webpack.config.js, so it works the same
// // as your app's code
// webpackOptions,
// watchOptions: {}
// }
//
// module.exports = on => {
// on('file:preprocessor', webpack(options))
// }
Loading

0 comments on commit 7bb785b

Please sign in to comment.