Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch from PhantomJS to Chrome Headless via Puppeteer #269

Merged
merged 17 commits into from
May 20, 2018
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"extends": "eslint:recommended",
"parserOptions": {
"ecmaVersion": 2017
},
"env": {
"browser": true,
"node": true,
"jasmine": true,
"es6": true
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ junit
.DS_Store
.grunt
/_SpecRunner.html
.custom
13 changes: 0 additions & 13 deletions .jshintrc

This file was deleted.

2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ sudo: false
language: node_js

node_js:
- "4"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can probably drop 4, it's EOL

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably drop 6 then also?

- "6"
- "8"
- "9"

matrix:
fast_finish: true
Expand Down
20 changes: 6 additions & 14 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
module.exports = function(grunt) {

grunt.initConfig({

connect: {
return500: {
options: {
Expand All @@ -25,15 +24,15 @@ module.exports = function(grunt) {
}
}
},
jshint: {
eslint: {
all: [
'Gruntfile.js',
'tasks/**/*.js',
'test/*.js',
'test/selfTest/*.js'
],
options: {
jshintrc: '.jshintrc'
configFile: '.eslintrc'
}
},
watch: {
Expand All @@ -51,13 +50,8 @@ module.exports = function(grunt) {
summary: true,
junit: {
path: 'junit'
}
}
},
phantomPolyfills: {
src: 'test/fixtures/phantom-polyfills/src/**/*.js',
options: {
specs: 'test/fixtures/phantom-polyfills/spec/**/*.js'
},
display: 'full'
}
},
consoleDisplayOptions: {
Expand Down Expand Up @@ -126,21 +120,19 @@ module.exports = function(grunt) {
}
}
},


nodeunit: {
tasks: ['test/*_test.js']
}
});

grunt.loadTasks('tasks');

grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-eslint');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-nodeunit');
grunt.loadNpmTasks('grunt-contrib-internal');
grunt.loadNpmTasks('grunt-contrib-connect');

grunt.registerTask('test', ['jshint', 'connect:return500', 'jasmine', 'nodeunit']);
grunt.registerTask('test', ['eslint', 'connect:return500', 'jasmine', 'nodeunit']);
grunt.registerTask('default', ['test', 'build-contrib']);
};
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# grunt-contrib-jasmine v1.1.0 [![Build Status: Linux](https://travis-ci.org/gruntjs/grunt-contrib-jasmine.svg?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-jasmine) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/5985958by5rhnh31/branch/master?svg=true)](https://ci.appveyor.com/project/gruntjs/grunt-contrib-jasmine/branch/master)
# grunt-contrib-jasmine v1.2.0 [![Build Status: Linux](https://travis-ci.org/gruntjs/grunt-contrib-jasmine.svg?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-jasmine) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/5985958by5rhnh31/branch/master?svg=true)](https://ci.appveyor.com/project/gruntjs/grunt-contrib-jasmine/branch/master)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can just v2 this probably due to major change?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is a major change but it doesn’t break the current api.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll revert this and let the versioning get handled by the merging folks.


> Run jasmine specs headlessly through PhantomJS

Expand Down Expand Up @@ -358,4 +358,4 @@ grunt.initConfig({

Task submitted by [Jarrod Overson](http://jarrodoverson.com)

*This file was generated on Thu Jan 12 2017 13:09:46.*
*This file was generated on Mon May 14 2018 15:35:38.*
8 changes: 6 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@ version: "{build}"
# What combinations to test
environment:
matrix:
- nodejs_version: "6"
- nodejs_version: "4"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same, drop 4

platform: x64
- nodejs_version: "4"
platform: x86
- nodejs_version: "6"
platform: x64
platform: x86
- nodejs_version: "8"
platform: x86
- nodejs_version: "9"
platform: x86

install:
- ps: Install-Product node $env:nodejs_version $env:platform
Expand Down
Loading