Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit 8fd55c3

Browse files
committed
chore: update several config files (e.g. for jshint, Travis, Karma, Protractor)
This brings the config files on par with the tutorial (see angular/angular-phonecat#326). It also updates the version of Node used on Travis to `4.4`. Related to #329.
1 parent a50f4c8 commit 8fd55c3

File tree

4 files changed

+39
-24
lines changed

4 files changed

+39
-24
lines changed

.jshintrc

+17-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
{
2-
"globalstrict": true,
2+
"strict": "global",
33
"globals": {
4+
// Angular
45
"angular": false,
6+
7+
// Angular mocks
8+
"module": false,
9+
"inject": false,
10+
11+
// Jasmine
12+
"jasmine": false,
513
"describe": false,
6-
"it": false,
7-
"expect": false,
814
"beforeEach": false,
915
"afterEach": false,
10-
"module": false,
11-
"inject": false
16+
"it": false,
17+
"expect": false,
18+
19+
// Protractor
20+
"browser": false,
21+
"element": false,
22+
"by": false
1223
}
13-
}
24+
}

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: node_js
22
node_js:
3-
- "0.10"
3+
- '4.4'
44

55
before_script:
66
- export DISPLAY=:99.0

e2e-tests/protractor.conf.js

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
//jshint strict: false
12
exports.config = {
3+
24
allScriptsTimeout: 11000,
35

46
specs: [
@@ -16,4 +18,5 @@ exports.config = {
1618
jasmineNodeOpts: {
1719
defaultTimeoutInterval: 30000
1820
}
21+
1922
};

karma.conf.js

+18-17
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
1-
module.exports = function(config){
1+
//jshint strict: false
2+
module.exports = function(config) {
23
config.set({
34

4-
basePath : './',
5+
basePath: './app',
56

6-
files : [
7-
'app/bower_components/angular/angular.js',
8-
'app/bower_components/angular-route/angular-route.js',
9-
'app/bower_components/angular-mocks/angular-mocks.js',
10-
'app/components/**/*.js',
11-
'app/view*/**/*.js'
7+
files: [
8+
'bower_components/angular/angular.js',
9+
'bower_components/angular-route/angular-route.js',
10+
'bower_components/angular-mocks/angular-mocks.js',
11+
'components/**/*.js',
12+
'view*/**/*.js'
1213
],
1314

14-
autoWatch : true,
15+
autoWatch: true,
1516

1617
frameworks: ['jasmine'],
1718

18-
browsers : ['Chrome'],
19+
browsers: ['Chrome'],
1920

20-
plugins : [
21-
'karma-chrome-launcher',
22-
'karma-firefox-launcher',
23-
'karma-jasmine',
24-
'karma-junit-reporter'
25-
],
21+
plugins: [
22+
'karma-chrome-launcher',
23+
'karma-firefox-launcher',
24+
'karma-jasmine',
25+
'karma-junit-reporter'
26+
],
2627

27-
junitReporter : {
28+
junitReporter: {
2829
outputFile: 'test_out/unit.xml',
2930
suite: 'unit'
3031
}

0 commit comments

Comments
 (0)