diff --git a/.babelrc b/.babelrc deleted file mode 100644 index 801edec9..00000000 --- a/.babelrc +++ /dev/null @@ -1,18 +0,0 @@ -{ - "presets": [ - ["env", { - "modules": false, - "targets": { - "browsers": ["> 1%", "last 2 versions", "not ie <= 8"] - } - }], - "stage-2" - ], - "plugins": ["transform-vue-jsx", "transform-runtime"], - "env": { - "test": { - "presets": ["env", "stage-2"], - "plugins": ["transform-vue-jsx", "istanbul"] - } - } -} diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 9d08a1a8..00000000 --- a/.editorconfig +++ /dev/null @@ -1,9 +0,0 @@ -root = true - -[*] -charset = utf-8 -indent_style = space -indent_size = 2 -end_of_line = lf -insert_final_newline = true -trim_trailing_whitespace = true diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 0a20f515..00000000 --- a/.eslintignore +++ /dev/null @@ -1,6 +0,0 @@ -/build/ -/config/ -/dist/ -/*.js -/test/unit/coverage/ -/test/e2e/specs/ diff --git a/.eslintrc.js b/.eslintrc.js index b1619fad..20034fd2 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,29 +1,17 @@ -// http://eslint.org/docs/user-guide/configuring - module.exports = { root: true, - parserOptions: { - parser: 'babel-eslint' - }, env: { - browser: true, + node: true }, - extends: [ - // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention - // consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules. + 'extends': [ 'plugin:vue/essential', - // https://github.com/standard/standard/blob/master/docs/RULES-en.md - 'standard' - ], - // required to lint *.vue files - plugins: [ - 'vue' + 'eslint:recommended' ], - // add your custom rules here rules: { - // allow async-await - 'generator-star-spacing': 'off', - // allow debugger during development + 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' + }, + parserOptions: { + parser: 'babel-eslint' } -} +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 86dc11c1..c02b27f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,19 @@ .DS_Store -node_modules/ -/dist/ +node_modules +package-lock.json +/dist + +/tests/e2e/reports/ +selenium-debug.log + +# local env files +.env.local +.env.*.local + +# Log files npm-debug.log* yarn-debug.log* yarn-error.log* -/test/unit/coverage/ -/test/e2e/reports/ -selenium-debug.log -package-lock.json # Editor directories and files .idea @@ -16,3 +22,4 @@ package-lock.json *.ntvs* *.njsproj *.sln +*.sw* diff --git a/.postcssrc.js b/.postcssrc.js index eee3e92d..100cc012 100644 --- a/.postcssrc.js +++ b/.postcssrc.js @@ -1,10 +1,5 @@ -// https://github.com/michael-ciniawsky/postcss-load-config - module.exports = { - "plugins": { - "postcss-import": {}, - "postcss-url": {}, - // to edit target browsers: use "browserslist" field in package.json - "autoprefixer": {} + plugins: { + autoprefixer: {} } -} +} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index bbe256e4..903529fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ ## [vue](./README.md) version `changelog` +##### `v2.0.0-beta.5` +- chore: move tooling to `vue-cli v3.0.0-rc.2` +- refactor: move from `static/img` to `public/img` dir +- refactor: move `index.thml` to `public` dir +- refactor: move to Jest testing +- tests: fix e2e, unit + +##### `v2.0.0-beta.4` +- chore: dependencies update + ##### `v2.0.0-beta.3` - refactor: `getStyles()` back to `@coreui/coreui` version `^2.0.2` - fix(Dashboard): `width` card-line*-chart-example `ie` issue diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 0e8afdb3..00000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2018 creativeLabs Łukasz Holeczek. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/babel.config.js b/babel.config.js new file mode 100644 index 00000000..b89d655b --- /dev/null +++ b/babel.config.js @@ -0,0 +1,5 @@ +module.exports = { + presets: [ + '@vue/app' + ] +} \ No newline at end of file diff --git a/build/build.js b/build/build.js deleted file mode 100644 index 8f2ad8ad..00000000 --- a/build/build.js +++ /dev/null @@ -1,41 +0,0 @@ -'use strict' -require('./check-versions')() - -process.env.NODE_ENV = 'production' - -const ora = require('ora') -const rm = require('rimraf') -const path = require('path') -const chalk = require('chalk') -const webpack = require('webpack') -const config = require('../config') -const webpackConfig = require('./webpack.prod.conf') - -const spinner = ora('building for production...') -spinner.start() - -rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { - if (err) throw err - webpack(webpackConfig, (err, stats) => { - spinner.stop() - if (err) throw err - process.stdout.write(stats.toString({ - colors: true, - modules: false, - children: false, // If you are using ts-loader, setting this to true will make TypeScript errors show up during build. - chunks: false, - chunkModules: false - }) + '\n\n') - - if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) - process.exit(1) - } - - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( - ' Tip: built files are meant to be served over an HTTP server.\n' + - ' Opening index.html over file:// won\'t work.\n' - )) - }) -}) diff --git a/build/check-versions.js b/build/check-versions.js deleted file mode 100644 index 3ef972a0..00000000 --- a/build/check-versions.js +++ /dev/null @@ -1,54 +0,0 @@ -'use strict' -const chalk = require('chalk') -const semver = require('semver') -const packageConfig = require('../package.json') -const shell = require('shelljs') - -function exec (cmd) { - return require('child_process').execSync(cmd).toString().trim() -} - -const versionRequirements = [ - { - name: 'node', - currentVersion: semver.clean(process.version), - versionRequirement: packageConfig.engines.node - } -] - -if (shell.which('npm')) { - versionRequirements.push({ - name: 'npm', - currentVersion: exec('npm --version'), - versionRequirement: packageConfig.engines.npm - }) -} - -module.exports = function () { - const warnings = [] - - for (let i = 0; i < versionRequirements.length; i++) { - const mod = versionRequirements[i] - - if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) { - warnings.push(mod.name + ': ' + - chalk.red(mod.currentVersion) + ' should be ' + - chalk.green(mod.versionRequirement) - ) - } - } - - if (warnings.length) { - console.log('') - console.log(chalk.yellow('To use this template, you must update following to modules:')) - console.log() - - for (let i = 0; i < warnings.length; i++) { - const warning = warnings[i] - console.log(' ' + warning) - } - - console.log() - process.exit(1) - } -} diff --git a/build/logo.png b/build/logo.png deleted file mode 100644 index f3d2503f..00000000 Binary files a/build/logo.png and /dev/null differ diff --git a/build/utils.js b/build/utils.js deleted file mode 100644 index e534fb0f..00000000 --- a/build/utils.js +++ /dev/null @@ -1,101 +0,0 @@ -'use strict' -const path = require('path') -const config = require('../config') -const ExtractTextPlugin = require('extract-text-webpack-plugin') -const packageConfig = require('../package.json') - -exports.assetsPath = function (_path) { - const assetsSubDirectory = process.env.NODE_ENV === 'production' - ? config.build.assetsSubDirectory - : config.dev.assetsSubDirectory - - return path.posix.join(assetsSubDirectory, _path) -} - -exports.cssLoaders = function (options) { - options = options || {} - - const cssLoader = { - loader: 'css-loader', - options: { - sourceMap: options.sourceMap - } - } - - const postcssLoader = { - loader: 'postcss-loader', - options: { - sourceMap: options.sourceMap - } - } - - // generate loader string to be used with extract text plugin - function generateLoaders (loader, loaderOptions) { - const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader] - - if (loader) { - loaders.push({ - loader: loader + '-loader', - options: Object.assign({}, loaderOptions, { - sourceMap: options.sourceMap - }) - }) - } - - // Extract CSS when that option is specified - // (which is the case during production build) - if (options.extract) { - return ExtractTextPlugin.extract({ - use: loaders, - fallback: 'vue-style-loader' - }) - } else { - return ['vue-style-loader'].concat(loaders) - } - } - - // https://vue-loader.vuejs.org/en/configurations/extract-css.html - return { - css: generateLoaders(), - postcss: generateLoaders(), - less: generateLoaders('less'), - sass: generateLoaders('sass', { indentedSyntax: true }), - scss: generateLoaders('sass'), - stylus: generateLoaders('stylus'), - styl: generateLoaders('stylus') - } -} - -// Generate loaders for standalone style files (outside of .vue) -exports.styleLoaders = function (options) { - const output = [] - const loaders = exports.cssLoaders(options) - - for (const extension in loaders) { - const loader = loaders[extension] - output.push({ - test: new RegExp('\\.' + extension + '$'), - use: loader - }) - } - - return output -} - -exports.createNotifierCallback = () => { - const notifier = require('node-notifier') - - return (severity, errors) => { - if (severity !== 'error') return - - const error = errors[0] - const filename = error.file && error.file.split('!').pop() - - notifier.notify({ - title: packageConfig.name, - message: severity + ': ' + error.name, - subtitle: filename || '', - icon: path.join(__dirname, 'logo.png') - }) - } -} diff --git a/build/vue-loader.conf.js b/build/vue-loader.conf.js deleted file mode 100644 index 33ed58bc..00000000 --- a/build/vue-loader.conf.js +++ /dev/null @@ -1,22 +0,0 @@ -'use strict' -const utils = require('./utils') -const config = require('../config') -const isProduction = process.env.NODE_ENV === 'production' -const sourceMapEnabled = isProduction - ? config.build.productionSourceMap - : config.dev.cssSourceMap - -module.exports = { - loaders: utils.cssLoaders({ - sourceMap: sourceMapEnabled, - extract: isProduction - }), - cssSourceMap: sourceMapEnabled, - cacheBusting: config.dev.cacheBusting, - transformToRequire: { - video: ['src', 'poster'], - source: 'src', - img: 'src', - image: 'xlink:href' - } -} diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js deleted file mode 100644 index 1f4f47e4..00000000 --- a/build/webpack.base.conf.js +++ /dev/null @@ -1,92 +0,0 @@ -'use strict' -const path = require('path') -const utils = require('./utils') -const config = require('../config') -const vueLoaderConfig = require('./vue-loader.conf') - -function resolve (dir) { - return path.join(__dirname, '..', dir) -} - -const createLintingRule = () => ({ - test: /\.(js|vue)$/, - loader: 'eslint-loader', - enforce: 'pre', - include: [resolve('src'), resolve('test')], - options: { - formatter: require('eslint-friendly-formatter'), - emitWarning: !config.dev.showEslintErrorsInOverlay - } -}) - -module.exports = { - context: path.resolve(__dirname, '../'), - entry: { - app: './src/main.js' - }, - output: { - path: config.build.assetsRoot, - filename: '[name].js', - publicPath: process.env.NODE_ENV === 'production' - ? config.build.assetsPublicPath - : config.dev.assetsPublicPath - }, - resolve: { - extensions: ['.js', '.vue', '.json'], - alias: { - 'vue$': 'vue/dist/vue.esm.js', - '@': resolve('src'), - } - }, - module: { - rules: [ - ...(config.dev.useEslint ? [createLintingRule()] : []), - { - test: /\.vue$/, - loader: 'vue-loader', - options: vueLoaderConfig - }, - { - test: /\.js$/, - loader: 'babel-loader', - include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')] - }, - { - test: /\.(png|jpe?g|gif|svg)(\?.*)?$/, - loader: 'url-loader', - options: { - limit: 10000, - name: utils.assetsPath('img/[name].[hash:7].[ext]') - } - }, - { - test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/, - loader: 'url-loader', - options: { - limit: 10000, - name: utils.assetsPath('media/[name].[hash:7].[ext]') - } - }, - { - test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/, - loader: 'url-loader', - options: { - limit: 10000, - name: utils.assetsPath('fonts/[name].[hash:7].[ext]') - } - } - ] - }, - node: { - // prevent webpack from injecting useless setImmediate polyfill because Vue - // source contains it (although only uses it if it's native). - setImmediate: false, - // prevent webpack from injecting mocks to Node native modules - // that does not make sense for the client - dgram: 'empty', - fs: 'empty', - net: 'empty', - tls: 'empty', - child_process: 'empty' - } -} diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js deleted file mode 100644 index 070ae221..00000000 --- a/build/webpack.dev.conf.js +++ /dev/null @@ -1,95 +0,0 @@ -'use strict' -const utils = require('./utils') -const webpack = require('webpack') -const config = require('../config') -const merge = require('webpack-merge') -const path = require('path') -const baseWebpackConfig = require('./webpack.base.conf') -const CopyWebpackPlugin = require('copy-webpack-plugin') -const HtmlWebpackPlugin = require('html-webpack-plugin') -const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') -const portfinder = require('portfinder') - -const HOST = process.env.HOST -const PORT = process.env.PORT && Number(process.env.PORT) - -const devWebpackConfig = merge(baseWebpackConfig, { - module: { - rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true }) - }, - // cheap-module-eval-source-map is faster for development - devtool: config.dev.devtool, - - // these devServer options should be customized in /config/index.js - devServer: { - clientLogLevel: 'warning', - historyApiFallback: { - rewrites: [ - { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') }, - ], - }, - hot: true, - contentBase: false, // since we use CopyWebpackPlugin. - compress: true, - host: HOST || config.dev.host, - port: PORT || config.dev.port, - open: config.dev.autoOpenBrowser, - overlay: config.dev.errorOverlay - ? { warnings: false, errors: true } - : false, - publicPath: config.dev.assetsPublicPath, - proxy: config.dev.proxyTable, - quiet: true, // necessary for FriendlyErrorsPlugin - watchOptions: { - poll: config.dev.poll, - } - }, - plugins: [ - new webpack.DefinePlugin({ - 'process.env': require('../config/dev.env') - }), - new webpack.HotModuleReplacementPlugin(), - new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update. - new webpack.NoEmitOnErrorsPlugin(), - // https://github.com/ampedandwired/html-webpack-plugin - new HtmlWebpackPlugin({ - filename: 'index.html', - template: 'index.html', - inject: true - }), - // copy custom static assets - new CopyWebpackPlugin([ - { - from: path.resolve(__dirname, '../static'), - to: config.dev.assetsSubDirectory, - ignore: ['.*'] - } - ]) - ] -}) - -module.exports = new Promise((resolve, reject) => { - portfinder.basePort = process.env.PORT || config.dev.port - portfinder.getPort((err, port) => { - if (err) { - reject(err) - } else { - // publish the new Port, necessary for e2e tests - process.env.PORT = port - // add port to devServer config - devWebpackConfig.devServer.port = port - - // Add FriendlyErrorsPlugin - devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({ - compilationSuccessInfo: { - messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`], - }, - onErrors: config.dev.notifyOnErrors - ? utils.createNotifierCallback() - : undefined - })) - - resolve(devWebpackConfig) - } - }) -}) diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js deleted file mode 100644 index 2f172596..00000000 --- a/build/webpack.prod.conf.js +++ /dev/null @@ -1,149 +0,0 @@ -'use strict' -const path = require('path') -const utils = require('./utils') -const webpack = require('webpack') -const config = require('../config') -const merge = require('webpack-merge') -const baseWebpackConfig = require('./webpack.base.conf') -const CopyWebpackPlugin = require('copy-webpack-plugin') -const HtmlWebpackPlugin = require('html-webpack-plugin') -const ExtractTextPlugin = require('extract-text-webpack-plugin') -const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin') -const UglifyJsPlugin = require('uglifyjs-webpack-plugin') - -const env = process.env.NODE_ENV === 'testing' - ? require('../config/test.env') - : require('../config/prod.env') - -const webpackConfig = merge(baseWebpackConfig, { - module: { - rules: utils.styleLoaders({ - sourceMap: config.build.productionSourceMap, - extract: true, - usePostCSS: true - }) - }, - devtool: config.build.productionSourceMap ? config.build.devtool : false, - output: { - path: config.build.assetsRoot, - filename: utils.assetsPath('js/[name].[chunkhash].js'), - chunkFilename: utils.assetsPath('js/[id].[chunkhash].js') - }, - plugins: [ - // http://vuejs.github.io/vue-loader/en/workflow/production.html - new webpack.DefinePlugin({ - 'process.env': env - }), - new UglifyJsPlugin({ - uglifyOptions: { - compress: { - warnings: false - } - }, - sourceMap: config.build.productionSourceMap, - parallel: true - }), - // extract css into its own file - new ExtractTextPlugin({ - filename: utils.assetsPath('css/[name].[contenthash].css'), - // Setting the following option to `false` will not extract CSS from codesplit chunks. - // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack. - // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, - // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110 - allChunks: true, - }), - // Compress extracted CSS. We are using this plugin so that possible - // duplicated CSS from different components can be deduped. - new OptimizeCSSPlugin({ - cssProcessorOptions: config.build.productionSourceMap - ? { safe: true, map: { inline: false } } - : { safe: true } - }), - // generate dist index.html with correct asset hash for caching. - // you can customize output by editing /index.html - // see https://github.com/ampedandwired/html-webpack-plugin - new HtmlWebpackPlugin({ - filename: process.env.NODE_ENV === 'testing' - ? 'index.html' - : config.build.index, - template: 'index.html', - inject: true, - minify: { - removeComments: true, - collapseWhitespace: true, - removeAttributeQuotes: true - // more options: - // https://github.com/kangax/html-minifier#options-quick-reference - }, - // necessary to consistently work with multiple chunks via CommonsChunkPlugin - chunksSortMode: 'dependency' - }), - // keep module.id stable when vendor modules does not change - new webpack.HashedModuleIdsPlugin(), - // enable scope hoisting - new webpack.optimize.ModuleConcatenationPlugin(), - // split vendor js into its own file - new webpack.optimize.CommonsChunkPlugin({ - name: 'vendor', - minChunks (module) { - // any required modules inside node_modules are extracted to vendor - return ( - module.resource && - /\.js$/.test(module.resource) && - module.resource.indexOf( - path.join(__dirname, '../node_modules') - ) === 0 - ) - } - }), - // extract webpack runtime and module manifest to its own file in order to - // prevent vendor hash from being updated whenever app bundle is updated - new webpack.optimize.CommonsChunkPlugin({ - name: 'manifest', - minChunks: Infinity - }), - // This instance extracts shared chunks from code splitted chunks and bundles them - // in a separate chunk, similar to the vendor chunk - // see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk - new webpack.optimize.CommonsChunkPlugin({ - name: 'app', - async: 'vendor-async', - children: true, - minChunks: 3 - }), - - // copy custom static assets - new CopyWebpackPlugin([ - { - from: path.resolve(__dirname, '../static'), - to: config.build.assetsSubDirectory, - ignore: ['.*'] - } - ]) - ] -}) - -if (config.build.productionGzip) { - const CompressionWebpackPlugin = require('compression-webpack-plugin') - - webpackConfig.plugins.push( - new CompressionWebpackPlugin({ - asset: '[path].gz[query]', - algorithm: 'gzip', - test: new RegExp( - '\\.(' + - config.build.productionGzipExtensions.join('|') + - ')$' - ), - threshold: 10240, - minRatio: 0.8 - }) - ) -} - -if (config.build.bundleAnalyzerReport) { - const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin - webpackConfig.plugins.push(new BundleAnalyzerPlugin()) -} - -module.exports = webpackConfig diff --git a/build/webpack.test.conf.js b/build/webpack.test.conf.js deleted file mode 100644 index 0d658d9e..00000000 --- a/build/webpack.test.conf.js +++ /dev/null @@ -1,32 +0,0 @@ -'use strict' -// This is the webpack config used for unit tests. - -const utils = require('./utils') -const webpack = require('webpack') -const merge = require('webpack-merge') -const baseWebpackConfig = require('./webpack.base.conf') - -const webpackConfig = merge(baseWebpackConfig, { - // use inline sourcemap for karma-sourcemap-loader - module: { - rules: utils.styleLoaders() - }, - devtool: '#inline-source-map', - resolveLoader: { - alias: { - // necessary to to make lang="scss" work in test when using vue-loader's ?inject option - // see discussion at https://github.com/vuejs/vue-loader/issues/724 - 'scss-loader': 'sass-loader' - } - }, - plugins: [ - new webpack.DefinePlugin({ - 'process.env': require('../config/test.env') - }) - ] -}) - -// no need for app entry during tests -delete webpackConfig.entry - -module.exports = webpackConfig diff --git a/config/dev.env.js b/config/dev.env.js deleted file mode 100644 index 1e22973a..00000000 --- a/config/dev.env.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict' -const merge = require('webpack-merge') -const prodEnv = require('./prod.env') - -module.exports = merge(prodEnv, { - NODE_ENV: '"development"' -}) diff --git a/config/index.js b/config/index.js deleted file mode 100644 index 926ab364..00000000 --- a/config/index.js +++ /dev/null @@ -1,76 +0,0 @@ -'use strict' -// Template version: 1.3.1 -// see http://vuejs-templates.github.io/webpack for documentation. - -const path = require('path') - -module.exports = { - dev: { - - // Paths - assetsSubDirectory: 'static', - assetsPublicPath: '/', - proxyTable: {}, - - // Various Dev Server settings - host: 'localhost', // can be overwritten by process.env.HOST - port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined - autoOpenBrowser: false, - errorOverlay: true, - notifyOnErrors: true, - poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- - - // Use Eslint Loader? - // If true, your code will be linted during bundling and - // linting errors and warnings will be shown in the console. - useEslint: true, - // If true, eslint errors and warnings will also be shown in the error overlay - // in the browser. - showEslintErrorsInOverlay: false, - - /** - * Source Maps - */ - - // https://webpack.js.org/configuration/devtool/#development - devtool: 'cheap-module-eval-source-map', - - // If you have problems debugging vue-files in devtools, - // set this to false - it *may* help - // https://vue-loader.vuejs.org/en/options.html#cachebusting - cacheBusting: true, - - cssSourceMap: true - }, - - build: { - // Template for index.html - index: path.resolve(__dirname, '../dist/index.html'), - - // Paths - assetsRoot: path.resolve(__dirname, '../dist'), - assetsSubDirectory: 'static', - assetsPublicPath: '/', - - /** - * Source Maps - */ - - productionSourceMap: true, - // https://webpack.js.org/configuration/devtool/#production - devtool: '#source-map', - - // Gzip off by default as many popular static hosts such as - // Surge or Netlify already gzip all static assets for you. - // Before setting to `true`, make sure to: - // npm install --save-dev compression-webpack-plugin - productionGzip: false, - productionGzipExtensions: ['js', 'css'], - - // Run the build command with an extra argument to - // View the bundle analyzer report after build finishes: - // `npm run build --report` - // Set to `true` or `false` to always turn it on or off - bundleAnalyzerReport: process.env.npm_config_report - } -} diff --git a/config/prod.env.js b/config/prod.env.js deleted file mode 100644 index a6f99761..00000000 --- a/config/prod.env.js +++ /dev/null @@ -1,4 +0,0 @@ -'use strict' -module.exports = { - NODE_ENV: '"production"' -} diff --git a/config/test.env.js b/config/test.env.js deleted file mode 100644 index c2824a30..00000000 --- a/config/test.env.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict' -const merge = require('webpack-merge') -const devEnv = require('./dev.env') - -module.exports = merge(devEnv, { - NODE_ENV: '"testing"' -}) diff --git a/jest.config.js b/jest.config.js new file mode 100644 index 00000000..d4f0822e --- /dev/null +++ b/jest.config.js @@ -0,0 +1,22 @@ +module.exports = { + moduleFileExtensions: [ + 'js', + 'jsx', + 'json', + 'vue' + ], + transform: { + '^.+\\.vue$': 'vue-jest', + '.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub', + '^.+\\.jsx?$': 'babel-jest' + }, + moduleNameMapper: { + '^@/(.*)$': '/src/$1' + }, + snapshotSerializers: [ + 'jest-serializer-vue' + ], + testMatch: [ + '/(tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx))' + ] +} \ No newline at end of file diff --git a/package.json b/package.json index 52cd4377..879eed7e 100644 --- a/package.json +++ b/package.json @@ -1,20 +1,17 @@ { "name": "@coreui/coreui-free-vue-admin-template", - "version": "2.0.0-beta.4", + "version": "2.0.0-beta.5", "description": "Open Source Bootstrap Admin Template", "author": "Łukasz Holeczek", "homepage": "http://coreui.io", "copyright": "Copyright 2018 creativeLabs Łukasz Holeczek", "license": "MIT", - "private": true, "scripts": { - "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", - "start": "npm run dev", - "unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run", - "e2e": "node test/e2e/runner.js", - "test": "npm run unit && npm run e2e", - "lint": "eslint --ext .js,.vue src test/unit test/e2e/specs", - "build": "node build/build.js" + "serve": "vue-cli-service serve", + "build": "vue-cli-service build", + "lint": "vue-cli-service lint", + "test:unit": "vue-cli-service test:unit", + "test:e2e": "vue-cli-service test:e2e" }, "dependencies": { "@coreui/coreui": "^2.0.2", @@ -36,83 +33,25 @@ "vue-router": "^3.0.1" }, "devDependencies": { - "autoprefixer": "^8.6.0", - "babel-core": "^6.26.3", - "babel-eslint": "^8.2.3", - "babel-helper-vue-jsx-merge-props": "^2.0.3", - "babel-loader": "^7.1.4", - "babel-plugin-istanbul": "^4.1.6", - "babel-plugin-syntax-jsx": "^6.18.0", - "babel-plugin-transform-runtime": "^6.23.0", - "babel-plugin-transform-vue-jsx": "^3.7.0", - "babel-preset-env": "^1.7.0", - "babel-preset-stage-2": "^6.24.1", - "babel-register": "^6.26.0", - "chai": "^4.1.2", - "chalk": "^2.4.1", - "chromedriver": "^2.39.0", - "copy-webpack-plugin": "^4.5.1", - "cross-env": "^5.1.6", - "cross-spawn": "^6.0.5", - "css-loader": "^0.28.11", - "eslint": "^4.19.1", - "eslint-config-standard": "^11.0.0", - "eslint-friendly-formatter": "^3.0.0", - "eslint-loader": "^2.0.0", - "eslint-plugin-import": "^2.12.0", - "eslint-plugin-node": "^6.0.1", - "eslint-plugin-promise": "^3.8.0", - "eslint-plugin-standard": "^3.0.1", - "eslint-plugin-vue": "^4.4.0", - "extract-text-webpack-plugin": "^3.0.2", - "file-loader": "^1.1.11", - "friendly-errors-webpack-plugin": "^1.7.0", - "html-webpack-plugin": "^2.30.1", - "inject-loader": "^3.0.1", - "karma": "^2.0.2", - "karma-coverage": "^1.1.2", - "karma-mocha": "^1.3.0", - "karma-phantomjs-launcher": "^1.0.4", - "karma-phantomjs-shim": "^1.5.0", - "karma-sinon-chai": "^1.3.4", - "karma-sourcemap-loader": "^0.3.7", - "karma-spec-reporter": "^0.0.32", - "karma-webpack": "^2.0.9", - "mocha": "^5.2.0", - "nightwatch": "^1.0.6", - "node-notifier": "^5.1.2", + "@vue/cli-plugin-babel": "^3.0.0-rc.2", + "@vue/cli-plugin-e2e-nightwatch": "^3.0.0-rc.2", + "@vue/cli-plugin-eslint": "^3.0.0-rc.2", + "@vue/cli-plugin-unit-jest": "^3.0.0-rc.2", + "@vue/cli-service": "^3.0.0-rc.2", + "@vue/test-utils": "^1.0.0-beta.19", + "babel-core": "^7.0.0-bridge.0", + "babel-jest": "^23.0.1", "node-sass": "^4.9.0", - "optimize-css-assets-webpack-plugin": "^3.2.0", - "ora": "^2.1.0", - "phantomjs-prebuilt": "^2.1.16", - "portfinder": "^1.0.13", - "postcss-import": "^11.1.0", - "postcss-loader": "^2.1.5", - "postcss-url": "^7.3.2", - "rimraf": "^2.6.2", - "sass-loader": "^6.0.7", - "selenium-server": "^3.12.0", - "semver": "^5.5.0", - "shelljs": "^0.8.2", - "sinon": "^4.5.0", - "sinon-chai": "^2.14.0", - "uglifyjs-webpack-plugin": "^1.2.5", - "url-loader": "^1.0.1", - "vue-loader": "^14.2.2", - "vue-style-loader": "^4.1.0", - "vue-template-compiler": "^2.5.16", - "webpack": "^3.12.0", - "webpack-bundle-analyzer": "^2.13.1", - "webpack-dev-server": "^2.11.2", - "webpack-merge": "^4.1.2" - }, - "engines": { - "node": ">= 8.9.4", - "npm": ">= 5.6.0" + "sass-loader": "^7.0.3", + "vue-template-compiler": "^2.5.16" }, "browserslist": [ "> 1%", "last 2 versions", "not ie <= 9" - ] + ], + "engines": { + "node": ">= 8.10.x", + "npm": ">= 5.6.0" + } } diff --git a/static/favicon.ico b/public/favicon.ico similarity index 100% rename from static/favicon.ico rename to public/favicon.ico diff --git a/static/img/avatars/1.jpg b/public/img/avatars/1.jpg similarity index 100% rename from static/img/avatars/1.jpg rename to public/img/avatars/1.jpg diff --git a/static/img/avatars/2.jpg b/public/img/avatars/2.jpg similarity index 100% rename from static/img/avatars/2.jpg rename to public/img/avatars/2.jpg diff --git a/static/img/avatars/3.jpg b/public/img/avatars/3.jpg similarity index 100% rename from static/img/avatars/3.jpg rename to public/img/avatars/3.jpg diff --git a/static/img/avatars/4.jpg b/public/img/avatars/4.jpg similarity index 100% rename from static/img/avatars/4.jpg rename to public/img/avatars/4.jpg diff --git a/static/img/avatars/5.jpg b/public/img/avatars/5.jpg similarity index 100% rename from static/img/avatars/5.jpg rename to public/img/avatars/5.jpg diff --git a/static/img/avatars/6.jpg b/public/img/avatars/6.jpg similarity index 100% rename from static/img/avatars/6.jpg rename to public/img/avatars/6.jpg diff --git a/static/img/avatars/7.jpg b/public/img/avatars/7.jpg similarity index 100% rename from static/img/avatars/7.jpg rename to public/img/avatars/7.jpg diff --git a/static/img/avatars/8.jpg b/public/img/avatars/8.jpg similarity index 100% rename from static/img/avatars/8.jpg rename to public/img/avatars/8.jpg diff --git a/static/img/brand/logo.svg b/public/img/brand/logo.svg similarity index 100% rename from static/img/brand/logo.svg rename to public/img/brand/logo.svg diff --git a/static/img/brand/sygnet.svg b/public/img/brand/sygnet.svg similarity index 100% rename from static/img/brand/sygnet.svg rename to public/img/brand/sygnet.svg diff --git a/static/img/favicon.png b/public/img/favicon.png similarity index 100% rename from static/img/favicon.png rename to public/img/favicon.png diff --git a/static/img/logo-symbol.png b/public/img/logo-symbol.png similarity index 100% rename from static/img/logo-symbol.png rename to public/img/logo-symbol.png diff --git a/static/img/logo.png b/public/img/logo.png similarity index 100% rename from static/img/logo.png rename to public/img/logo.png diff --git a/index.html b/public/index.html similarity index 75% rename from index.html rename to public/index.html index d3847ce6..97c83a62 100644 --- a/index.html +++ b/public/index.html @@ -3,10 +3,9 @@ - - CoreUI - Open Source Bootstrap Admin Template - - + + + CoreUI - Vue Open Source Bootstrap Admin Template - +
diff --git a/src/App.vue b/src/App.vue index e748b179..9c72da81 100644 --- a/src/App.vue +++ b/src/App.vue @@ -10,7 +10,7 @@ export default { diff --git a/src/containers/DafaultAside.vue b/src/containers/DafaultAside.vue index a6fffce9..f32da5b1 100644 --- a/src/containers/DafaultAside.vue +++ b/src/containers/DafaultAside.vue @@ -10,7 +10,7 @@
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
Meeting with Lucas @@ -24,7 +24,7 @@
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
Skype with Megan
@@ -42,19 +42,19 @@   creativeLabs HQ
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
@@ -69,25 +69,25 @@   creativeLabs HQ
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
@@ -101,7 +101,7 @@
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
@@ -116,7 +116,7 @@
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
@@ -131,7 +131,7 @@
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
@@ -146,7 +146,7 @@
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
@@ -161,7 +161,7 @@
- admin@bootstrapmaster.com + admin@bootstrapmaster.com
diff --git a/src/containers/DefaultContainer.vue b/src/containers/DefaultContainer.vue index e83d35b2..5dcec3fc 100644 --- a/src/containers/DefaultContainer.vue +++ b/src/containers/DefaultContainer.vue @@ -3,8 +3,8 @@ - CoreUI Logo - CoreUI Logo + CoreUI Logo + CoreUI Logo diff --git a/src/containers/DefaultHeaderDropdownAccnt.vue b/src/containers/DefaultHeaderDropdownAccnt.vue index 1fffa9b0..ecd5e3cc 100644 --- a/src/containers/DefaultHeaderDropdownAccnt.vue +++ b/src/containers/DefaultHeaderDropdownAccnt.vue @@ -2,7 +2,7 @@ \ diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue index 1a2c3214..d18eb291 100644 --- a/src/views/Dashboard.vue +++ b/src/views/Dashboard.vue @@ -475,7 +475,7 @@ export default { selected: 'Month', tableItems: [ { - avatar: { url: 'static/img/avatars/1.jpg', status: 'success' }, + avatar: { url: 'img/avatars/1.jpg', status: 'success' }, user: { name: 'Yiorgos Avraamu', new: true, registered: 'Jan 1, 2015' }, country: { name: 'USA', flag: 'us' }, usage: { value: 50, period: 'Jun 11, 2015 - Jul 10, 2015' }, @@ -483,7 +483,7 @@ export default { activity: '10 sec ago' }, { - avatar: { url: 'static/img/avatars/2.jpg', status: 'danger' }, + avatar: { url: 'img/avatars/2.jpg', status: 'danger' }, user: { name: 'Avram Tarasios', new: false, registered: 'Jan 1, 2015' }, country: { name: 'Brazil', flag: 'br' }, usage: { value: 22, period: 'Jun 11, 2015 - Jul 10, 2015' }, @@ -491,7 +491,7 @@ export default { activity: '5 minutes ago' }, { - avatar: { url: 'static/img/avatars/3.jpg', status: 'warning' }, + avatar: { url: 'img/avatars/3.jpg', status: 'warning' }, user: { name: 'Quintin Ed', new: true, registered: 'Jan 1, 2015' }, country: { name: 'India', flag: 'in' }, usage: { value: 74, period: 'Jun 11, 2015 - Jul 10, 2015' }, @@ -499,7 +499,7 @@ export default { activity: '1 hour ago' }, { - avatar: { url: 'static/img/avatars/4.jpg', status: '' }, + avatar: { url: 'img/avatars/4.jpg', status: '' }, user: { name: 'Enéas Kwadwo', new: true, registered: 'Jan 1, 2015' }, country: { name: 'France', flag: 'fr' }, usage: { value: 98, period: 'Jun 11, 2015 - Jul 10, 2015' }, @@ -507,7 +507,7 @@ export default { activity: 'Last month' }, { - avatar: { url: 'static/img/avatars/5.jpg', status: 'success' }, + avatar: { url: 'img/avatars/5.jpg', status: 'success' }, user: { name: 'Agapetus Tadeáš', new: true, registered: 'Jan 1, 2015' }, country: { name: 'Spain', flag: 'es' }, usage: { value: 22, period: 'Jun 11, 2015 - Jul 10, 2015' }, @@ -515,7 +515,7 @@ export default { activity: 'Last week' }, { - avatar: { url: 'static/img/avatars/6.jpg', status: 'danger' }, + avatar: { url: 'img/avatars/6.jpg', status: 'danger' }, user: { name: 'Friderik Dávid', new: true, registered: 'Jan 1, 2015' }, country: { name: 'Poland', flag: 'pl' }, usage: { value: 43, period: 'Jun 11, 2015 - Jul 10, 2015' }, diff --git a/src/views/base/Carousels.vue b/src/views/base/Carousels.vue index d5813f05..e7907bb9 100644 --- a/src/views/base/Carousels.vue +++ b/src/views/base/Carousels.vue @@ -85,9 +85,11 @@ export default { }, methods: { onSlideStart (slide) { + console.log('onSlideStart', slide) this.sliding = true }, onSlideEnd (slide) { + console.log('onSlideEnd', slide) this.sliding = false } } diff --git a/static/.gitkeep b/static/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/test/e2e/custom-assertions/elementCount.js b/test/e2e/custom-assertions/elementCount.js deleted file mode 100644 index c0d5fe00..00000000 --- a/test/e2e/custom-assertions/elementCount.js +++ /dev/null @@ -1,26 +0,0 @@ -// A custom Nightwatch assertion. -// the name of the method is the filename. -// can be used in tests like this: -// -// browser.assert.elementCount(selector, count) -// -// for how to write custom assertions see -// http://nightwatchjs.org/guide#writing-custom-assertions -exports.assertion = function (selector, count) { - this.message = 'Testing if element <' + selector + '> has count: ' + count - this.expected = count - this.pass = function (val) { - return val === this.expected - } - this.value = function (res) { - return res.value - } - this.command = function (cb) { - var self = this - return this.api.execute(function (selector) { - return document.querySelectorAll(selector).length - }, [selector], function (res) { - cb.call(self, res) - }) - } -} diff --git a/test/e2e/nightwatch.conf.js b/test/e2e/nightwatch.conf.js deleted file mode 100644 index f019c0ac..00000000 --- a/test/e2e/nightwatch.conf.js +++ /dev/null @@ -1,46 +0,0 @@ -require('babel-register') -var config = require('../../config') - -// http://nightwatchjs.org/gettingstarted#settings-file -module.exports = { - src_folders: ['test/e2e/specs'], - output_folder: 'test/e2e/reports', - custom_assertions_path: ['test/e2e/custom-assertions'], - - selenium: { - start_process: true, - server_path: require('selenium-server').path, - host: '127.0.0.1', - port: 4444, - cli_args: { - 'webdriver.chrome.driver': require('chromedriver').path - } - }, - - test_settings: { - default: { - selenium_port: 4444, - selenium_host: 'localhost', - silent: true, - globals: { - devServerURL: 'http://localhost:' + (process.env.PORT || config.dev.port) - } - }, - - chrome: { - desiredCapabilities: { - browserName: 'chrome', - javascriptEnabled: true, - acceptSslCerts: true - } - }, - - firefox: { - desiredCapabilities: { - browserName: 'firefox', - javascriptEnabled: true, - acceptSslCerts: true - } - } - } -} diff --git a/test/e2e/runner.js b/test/e2e/runner.js deleted file mode 100644 index 27220329..00000000 --- a/test/e2e/runner.js +++ /dev/null @@ -1,48 +0,0 @@ -// 1. start the dev server using production config -process.env.NODE_ENV = 'testing' - -const webpack = require('webpack') -const DevServer = require('webpack-dev-server') - -const webpackConfig = require('../../build/webpack.prod.conf') -const devConfigPromise = require('../../build/webpack.dev.conf') - -let server - -devConfigPromise.then(devConfig => { - const devServerOptions = devConfig.devServer - const compiler = webpack(webpackConfig) - server = new DevServer(compiler, devServerOptions) - const port = devServerOptions.port - const host = devServerOptions.host - return server.listen(port, host) -}) -.then(() => { - // 2. run the nightwatch test suite against it - // to run in additional browsers: - // 1. add an entry in test/e2e/nightwatch.conf.js under "test_settings" - // 2. add it to the --env flag below - // or override the environment flag, for example: `npm run e2e -- --env chrome,firefox` - // For more information on Nightwatch's config file, see - // http://nightwatchjs.org/guide#settings-file - let opts = process.argv.slice(2) - if (opts.indexOf('--config') === -1) { - opts = opts.concat(['--config', 'test/e2e/nightwatch.conf.js']) - } - if (opts.indexOf('--env') === -1) { - opts = opts.concat(['--env', 'chrome']) - } - - const spawn = require('cross-spawn') - const runner = spawn('./node_modules/.bin/nightwatch', opts, { stdio: 'inherit' }) - - runner.on('exit', function (code) { - server.close() - process.exit(code) - }) - - runner.on('error', function (err) { - server.close() - throw err - }) -}) diff --git a/test/unit/.eslintrc b/test/unit/.eslintrc deleted file mode 100644 index 959a4f4b..00000000 --- a/test/unit/.eslintrc +++ /dev/null @@ -1,9 +0,0 @@ -{ - "env": { - "mocha": true - }, - "globals": { - "expect": true, - "sinon": true - } -} diff --git a/test/unit/index.js b/test/unit/index.js deleted file mode 100644 index c69f33fd..00000000 --- a/test/unit/index.js +++ /dev/null @@ -1,13 +0,0 @@ -import Vue from 'vue' - -Vue.config.productionTip = false - -// require all test files (files that ends with .spec.js) -const testsContext = require.context('./specs', true, /\.spec$/) -testsContext.keys().forEach(testsContext) - -// require all src files except main.js for coverage. -// you can also change this to match only the subset of files that -// you want coverage for. -const srcContext = require.context('../../src', true, /^\.\/(?!main(\.js)?$)/) -srcContext.keys().forEach(srcContext) diff --git a/test/unit/karma.conf.js b/test/unit/karma.conf.js deleted file mode 100644 index 5d3966d2..00000000 --- a/test/unit/karma.conf.js +++ /dev/null @@ -1,33 +0,0 @@ -// This is a karma config file. For more details see -// http://karma-runner.github.io/0.13/config/configuration-file.html -// we are also using it with karma-webpack -// https://github.com/webpack/karma-webpack - -var webpackConfig = require('../../build/webpack.test.conf') - -module.exports = function karmaConfig (config) { - config.set({ - // to run in additional browsers: - // 1. install corresponding karma launcher - // http://karma-runner.github.io/0.13/config/browsers.html - // 2. add it to the `browsers` array below. - browsers: ['PhantomJS'], - frameworks: ['mocha', 'sinon-chai', 'phantomjs-shim'], - reporters: ['spec', 'coverage'], - files: ['./index.js'], - preprocessors: { - './index.js': ['webpack', 'sourcemap'] - }, - webpack: webpackConfig, - webpackMiddleware: { - noInfo: true - }, - coverageReporter: { - dir: './coverage', - reporters: [ - { type: 'lcov', subdir: '.' }, - { type: 'text-summary' } - ] - } - }) -} diff --git a/test/unit/specs/Dashboard.spec.js b/test/unit/specs/Dashboard.spec.js deleted file mode 100644 index bdbfacfd..00000000 --- a/test/unit/specs/Dashboard.spec.js +++ /dev/null @@ -1,22 +0,0 @@ -import Vue from 'vue' -import BootstrapVue from 'bootstrap-vue' -import Dashboard from '@/views/Dashboard' - -Vue.use(BootstrapVue) - -describe('Dashboard', () => { - it('has a created hook', () => { - expect(typeof Dashboard.data).to.equal('function') - }) - it('sets the correct default data', () => { - expect(typeof Dashboard.data).to.equal('function') - const defaultData = Dashboard.data() - expect(defaultData.selected).to.equal('Month') - }) - it('should render correct contents', () => { - const Constructor = Vue.extend(Dashboard) - const vm = new Constructor().$mount() - expect(vm.$el.querySelector('#traffic').textContent) - .to.equal('Traffic') - }) -}) diff --git a/tests/e2e/custom-assertions/elementCount.js b/tests/e2e/custom-assertions/elementCount.js new file mode 100644 index 00000000..52883038 --- /dev/null +++ b/tests/e2e/custom-assertions/elementCount.js @@ -0,0 +1,19 @@ +// A custom Nightwatch assertion. +// The assertion name is the filename. +// Example usage: +// +// browser.assert.elementCount(selector, count) +// +// For more information on custom assertions see: +// http://nightwatchjs.org/guide#writing-custom-assertions + +exports.assertion = function elementCount (selector, count) { + this.message = `Testing if element <${selector}> has count: ${count}` + this.expected = count + this.pass = val => val === count + this.value = res => res.value + function evaluator (_selector) { + return document.querySelectorAll(_selector).length + } + this.command = cb => this.api.execute(evaluator, [selector], cb) +} diff --git a/test/e2e/specs/test.js b/tests/e2e/specs/test.js similarity index 81% rename from test/e2e/specs/test.js rename to tests/e2e/specs/test.js index 531a4871..9882cbad 100644 --- a/test/e2e/specs/test.js +++ b/tests/e2e/specs/test.js @@ -4,11 +4,11 @@ module.exports = { before: function (browser) { - console.log('Setting up...') + console.log('Setting up... browser', typeof browser) }, after: function (browser) { - console.log('Closing down...') + console.log('Closing down... browser', typeof browser) }, 'CoreUI Vue e2e tests': function (browser) { @@ -16,11 +16,13 @@ module.exports = { // default: http://localhost:8080 // see nightwatch.conf.js - const devServer = browser.globals.devServerURL + // const devServer = browser.globals.devServerURL + const devServer = process.env.VUE_DEV_SERVER_URL + browser.url(devServer).pause(500).expect.element('body').to.be.present - browser.waitForElementVisible('.app > .app', 3000) + browser.waitForElementVisible('.app', 10000) .assert.elementPresent('.app-header') .assert.elementPresent('.app-header > .navbar-brand') .assert.elementPresent('.app-body') @@ -36,6 +38,7 @@ module.exports = { .pause(500) browser.click('body > div > header > button.d-none.d-lg-block.navbar-toggler', function (response) { + console.log('response', typeof response) this.assert.ok(browser === this, 'Check if the context is right.') this.assert.cssClassPresent('body', 'aside-menu-show') }) @@ -43,6 +46,7 @@ module.exports = { browser.pause(500) browser.click('body > div > header > button.d-none.d-lg-block.navbar-toggler', function (response) { + console.log('response', typeof response) this.assert.cssClassNotPresent('body', 'aside-menu-show') }) @@ -51,29 +55,33 @@ module.exports = { browser .useXpath() .click('/html/body/div/header/button[2]', function (response) { + console.log('response', typeof response) this.assert.cssClassNotPresent('/html/body', 'sidebar-lg-show') }) browser .pause(500) .click('/html/body/div/header/button[2]', function (response) { + console.log('response', typeof response) this.assert.cssClassPresent('/html/body', 'sidebar-lg-show') }) browser .pause(500) .click('/html/body/div/div/div/button', function (response) { + console.log('response', typeof response) this.assert.cssClassPresent('/html/body', 'sidebar-minimized') this.assert.cssClassPresent('/html/body', 'brand-minimized') }) .pause(500) .click('/html/body/div/div/div/button', function (response) { + console.log('response', typeof response) this.assert.cssClassNotPresent('/html/body', 'sidebar-minimized') this.assert.cssClassNotPresent('/html/body', 'brand-minimized') }) browser - .pause(3000) + .pause(5000) .end() } } diff --git a/tests/unit/.eslintrc.js b/tests/unit/.eslintrc.js new file mode 100644 index 00000000..4e51c63f --- /dev/null +++ b/tests/unit/.eslintrc.js @@ -0,0 +1,8 @@ +module.exports = { + env: { + jest: true + }, + rules: { + 'import/no-extraneous-dependencies': 'off' + } +} \ No newline at end of file diff --git a/tests/unit/Dashboard.spec.js b/tests/unit/Dashboard.spec.js new file mode 100644 index 00000000..78fc09ed --- /dev/null +++ b/tests/unit/Dashboard.spec.js @@ -0,0 +1,29 @@ +import Vue from 'vue' +import { shallowMount } from '@vue/test-utils' +import BootstrapVue from 'bootstrap-vue' +import Dashboard from '@/views/Dashboard' + +Vue.use(BootstrapVue) + +describe('Dashboard.vue', () => { + it('has a created hook', () => { + expect(typeof Dashboard.data).toMatch('function') + }) + it('sets the correct default data', () => { + expect(typeof Dashboard.data).toMatch('function') + const defaultData = Dashboard.data() + expect(defaultData.selected).toMatch('Month') + }) + it('is Vue instance', () => { + const wrapper = shallowMount(Dashboard) + expect(wrapper.isVueInstance()).toBe(true) + }) + it('is Dashboard', () => { + const wrapper = shallowMount(Dashboard) + expect(wrapper.is(Dashboard)).toBe(true) + }) + // it('should render correct content', () => { + // const wrapper = shallowMount(Dashboard) + // expect(wrapper.find('h4 > #traffic').text()).toMatch('Traffic') + // }) +}) diff --git a/vue.config.js b/vue.config.js new file mode 100644 index 00000000..1eaa50ca --- /dev/null +++ b/vue.config.js @@ -0,0 +1,4 @@ +module.exports = { + lintOnSave: false, + runtimeCompiler: true +}