Permalink
Browse files

chore(*): update dependencies and configuration files

Closes #341
1 parent a50f4c8 commit 239b5157baa9cf2fd99b471ab53580d58aabea9d @gkalpak gkalpak committed with petebacondarwin May 21, 2016
Showing with 54 additions and 40 deletions.
  1. +17 −6 .jshintrc
  2. +1 −1 .travis.yml
  3. +4 −5 bower.json
  4. +3 −0 e2e-tests/protractor.conf.js
  5. +18 −17 karma.conf.js
  6. +11 −11 package.json
View
@@ -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
}
-}
+}
View
@@ -1,6 +1,6 @@
language: node_js
node_js:
- - "0.10"
+ - '4.4'
before_script:
- export DISPLAY=:99.0
View
@@ -6,10 +6,9 @@
"license": "MIT",
"private": true,
"dependencies": {
- "angular": "~1.4.0",
- "angular-route": "~1.4.0",
- "angular-loader": "~1.4.0",
- "angular-mocks": "~1.4.0",
- "html5-boilerplate": "~5.2.0"
+ "angular": "~1.5.0",
+ "angular-route": "~1.5.0",
+ "angular-loader": "~1.5.0",
+ "angular-mocks": "~1.5.0"
}
}
@@ -1,4 +1,6 @@
+//jshint strict: false
exports.config = {
+
allScriptsTimeout: 11000,
specs: [
@@ -16,4 +18,5 @@ exports.config = {
jasmineNodeOpts: {
defaultTimeoutInterval: 30000
}
+
};
View
@@ -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'
}
View
@@ -6,16 +6,16 @@
"repository": "https://github.com/angular/angular-seed",
"license": "MIT",
"devDependencies": {
- "bower": "^1.3.1",
- "http-server": "^0.6.1",
- "jasmine-core": "^2.3.4",
- "karma": "~0.12",
- "karma-chrome-launcher": "^0.1.12",
- "karma-firefox-launcher": "^0.1.6",
- "karma-jasmine": "^0.3.5",
- "karma-junit-reporter": "^0.2.2",
- "protractor": "^2.1.0",
- "shelljs": "^0.2.6"
+ "bower": "^1.7.7",
+ "http-server": "^0.9.0",
+ "jasmine-core": "^2.4.1",
+ "karma": "^0.13.22",
+ "karma-chrome-launcher": "^0.2.3",
+ "karma-firefox-launcher": "^0.1.7",
+ "karma-jasmine": "^0.3.8",
+ "karma-junit-reporter": "^0.4.1",
+ "protractor": "^3.2.2",
+ "shelljs": "^0.6.0"
},
"scripts": {
"postinstall": "bower install",
@@ -25,7 +25,7 @@
"pretest": "npm install",
"test": "karma start karma.conf.js",
- "test-single-run": "karma start karma.conf.js --single-run",
+ "test-single-run": "karma start karma.conf.js --single-run",
"preupdate-webdriver": "npm install",
"update-webdriver": "webdriver-manager update",

0 comments on commit 239b515

Please sign in to comment.