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

chore: update config files (.jshintrc, karma.conf.js, protractor.conf.js) #333

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all 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
23 changes: 17 additions & 6 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,13 +1,24 @@
{
"globalstrict": true,
"strict": "global",
"globals": {
// Angular
"angular": false,

// Angular mocks
"module": false,
"inject": false,

// Jasmine
"jasmine": false,
"describe": false,
"it": false,
"expect": false,
"beforeEach": false,
"afterEach": false,
"module": false,
"inject": false
"it": false,
"expect": false,

// Protractor
"browser": false,
"element": false,
"by": false
}
}
}
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- "0.10"
- '4.4'

before_script:
- export DISPLAY=:99.0
Expand Down
3 changes: 3 additions & 0 deletions e2e-tests/protractor.conf.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
//jshint strict: false
exports.config = {

allScriptsTimeout: 11000,

specs: [
Expand All @@ -16,4 +18,5 @@ exports.config = {
jasmineNodeOpts: {
defaultTimeoutInterval: 30000
}

};
35 changes: 18 additions & 17 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
module.exports = function(config){
//jshint strict: false
module.exports = function(config) {
config.set({

basePath : './',
basePath: './app',

files : [
'app/bower_components/angular/angular.js',
'app/bower_components/angular-route/angular-route.js',
'app/bower_components/angular-mocks/angular-mocks.js',
'app/components/**/*.js',
'app/view*/**/*.js'
files: [
'bower_components/angular/angular.js',
'bower_components/angular-route/angular-route.js',
'bower_components/angular-mocks/angular-mocks.js',
'components/**/*.js',
'view*/**/*.js'
],

autoWatch : true,
autoWatch: true,

frameworks: ['jasmine'],

browsers : ['Chrome'],
browsers: ['Chrome'],

plugins : [
'karma-chrome-launcher',
'karma-firefox-launcher',
'karma-jasmine',
'karma-junit-reporter'
],
plugins: [
'karma-chrome-launcher',
'karma-firefox-launcher',
'karma-jasmine',
'karma-junit-reporter'
],

junitReporter : {
junitReporter: {
outputFile: 'test_out/unit.xml',
suite: 'unit'
}
Expand Down