Skip to content

Commit

Permalink
Merge pull request vuelidate#232 from 38elements/puppeteer
Browse files Browse the repository at this point in the history
Use Puppeteer
  • Loading branch information
Frizi authored Dec 15, 2017
2 parents b65cbf4 + 084d55d commit efa9c5a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"connect-history-api-fallback": "^1.1.0",
"copy-webpack-plugin": "^4.0.0",
"css-loader": "^0.25.0",
"es6-promise": "^4.0.5",
"eslint": "^3.7.1",
"eslint-config-standard": "^6.1.0",
"eslint-friendly-formatter": "^2.0.5",
Expand All @@ -54,16 +53,15 @@
"express": "^4.13.3",
"extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.9.0",
"function-bind": "^1.0.2",
"html-webpack-plugin": "^2.8.1",
"http-proxy-middleware": "^0.17.2",
"inject-loader": "^2.0.1",
"isparta-loader": "^2.0.0",
"json-loader": "^0.5.4",
"karma": "^1.3.0",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage": "^1.1.1",
"karma-mocha": "^1.2.0",
"karma-phantomjs-launcher": "^1.0.0",
"karma-sinon-chai": "^1.2.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-spec-reporter": "0.0.26",
Expand All @@ -73,9 +71,9 @@
"node-sass": "^3.4.2",
"opn": "^4.0.2",
"ora": "^0.3.0",
"phantomjs-prebuilt": "^2.1.3",
"pug": "2.0.0-beta6",
"pug-loader": "^2.3.0",
"puppeteer": "^0.13.0",
"raw-loader": "^0.5.1",
"sass-loader": "^3.2.0",
"semver": "^5.3.0",
Expand Down
5 changes: 0 additions & 5 deletions test/unit/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
// Polyfill fn.bind() for PhantomJS
/* eslint-disable no-extend-native */
Function.prototype.bind = require('function-bind')
require('es6-promise').polyfill()

import Vue from 'vue'
import Validation from '../../src/index'
Vue.use(Validation)
Expand Down
4 changes: 3 additions & 1 deletion test/unit/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,15 @@ webpackConfig.module.loaders.some(function (loader, i) {
}
})

process.env.CHROME_BIN = require('puppeteer').executablePath()

module.exports = function (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'],
browsers: ['ChromeHeadless'],
frameworks: ['mocha', 'sinon-chai'],
reporters: ['spec', 'coverage'],
files: ['./index.js'],
Expand Down

0 comments on commit efa9c5a

Please sign in to comment.