Skip to content

Commit

Permalink
fix: Install eslint 4.7.1 before running the functional tests on CI
Browse files Browse the repository at this point in the history
  • Loading branch information
rpl committed Sep 29, 2017
1 parent 88b4ead commit 73809c3
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 2 deletions.
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,14 @@ before_script:

# Keep this in sync with appveyor.yml
script:
## run eslint, flow and the unit test suite.
- COVERAGE=y NODE_ENV=production npm test

## install the eslint version needed by eslint and run functional test suite
## (See #1082 for rationale).
- npm install eslint@4.7.1 && npm test:functional

## lint the github PR title.
- npm run travis-pr-title-lint

after_script: npm run publish-coverage
Expand Down
8 changes: 6 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@ module.exports = function(grunt) {
'webpack:functional_tests',
]);

grunt.registerTask('test', 'run linting and test suites', function() {
grunt.registerTask('test', 'run linting and the unit test suite', function() {
var tasks = [
'lint',
'flowbin:check',
'build-tests',
'mochaTest:unit',
'mochaTest:functional',
];

// TODO: enable the flowbin:check task on AppVeyor (mozilla/web-ext#773)
Expand All @@ -48,6 +47,11 @@ module.exports = function(grunt) {
grunt.task.run(tasks);
});

grunt.registerTask('test:functional', 'run functional test suites', [
'build-tests',
'mochaTest:functional',
]);

grunt.registerTask('develop', [
'flowbin:start',
'watch:develop',
Expand Down
4 changes: 4 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,7 @@ test_script:
- set COVERAGE=y
- set NODE_ENV=production
- npm run test
## install the eslint version needed by eslint and run functional test suite
## (See #1082 for rationale).
- npm install eslint@4.7.1
- npm test:functional
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"flow-check": "grunt flowbin:check",
"lint": "grunt lint",
"test": "grunt test",
"test:functional": "grunt test:functional",
"publish-coverage": "grunt coveralls",
"nsp-check": "nsp check -o summary",
"changelog": "conventional-changelog -p angular -u",
Expand Down

0 comments on commit 73809c3

Please sign in to comment.