From 52b213d18b675b13ab0148d9be4d95b1480170f1 Mon Sep 17 00:00:00 2001 From: Georgios Kalpakas Date: Sat, 21 May 2016 14:56:45 +0300 Subject: [PATCH 1/3] chore(*): update dependencies and configuration files --- .jshintrc | 23 +++++++++++++++++------ .travis.yml | 2 +- bower.json | 9 ++++----- e2e-tests/protractor.conf.js | 3 +++ karma.conf.js | 35 ++++++++++++++++++----------------- package.json | 22 +++++++++++----------- 6 files changed, 54 insertions(+), 40 deletions(-) diff --git a/.jshintrc b/.jshintrc index 6f00218e37..60f49fd369 100644 --- a/.jshintrc +++ b/.jshintrc @@ -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 } -} \ No newline at end of file +} diff --git a/.travis.yml b/.travis.yml index cce5c682a8..a549d113c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: - - "0.10" + - '4.4' before_script: - export DISPLAY=:99.0 diff --git a/bower.json b/bower.json index 5234f47856..ffbbeccaca 100644 --- a/bower.json +++ b/bower.json @@ -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" } } diff --git a/e2e-tests/protractor.conf.js b/e2e-tests/protractor.conf.js index b45a117aa5..00893f98ef 100644 --- a/e2e-tests/protractor.conf.js +++ b/e2e-tests/protractor.conf.js @@ -1,4 +1,6 @@ +//jshint strict: false exports.config = { + allScriptsTimeout: 11000, specs: [ @@ -16,4 +18,5 @@ exports.config = { jasmineNodeOpts: { defaultTimeoutInterval: 30000 } + }; diff --git a/karma.conf.js b/karma.conf.js index 44bb29f1ab..7271e9fef8 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -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' } diff --git a/package.json b/package.json index d0edbc8b61..8d4ee1f79d 100644 --- a/package.json +++ b/package.json @@ -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", From ada1896aa625d3aab81361dd603adcc974ddf1d2 Mon Sep 17 00:00:00 2001 From: Georgios Kalpakas Date: Sun, 22 May 2016 00:14:04 +0300 Subject: [PATCH 2/3] chore(*): serve from the `app/` directory --- README.md | 2 +- e2e-tests/protractor.conf.js | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e7aece1083..c0deb480c9 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ this server is: npm start ``` -Now browse to the app at `http://localhost:8000/app/index.html`. +Now browse to the app at `http://localhost:8000/index.html`. diff --git a/e2e-tests/protractor.conf.js b/e2e-tests/protractor.conf.js index 00893f98ef..13c5cb6266 100644 --- a/e2e-tests/protractor.conf.js +++ b/e2e-tests/protractor.conf.js @@ -11,7 +11,7 @@ exports.config = { 'browserName': 'chrome' }, - baseUrl: 'http://localhost:8000/app/', + baseUrl: 'http://localhost:8000/', framework: 'jasmine', diff --git a/package.json b/package.json index 8d4ee1f79d..81b7aaf285 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "postinstall": "bower install", "prestart": "npm install", - "start": "http-server -a localhost -p 8000 -c-1", + "start": "http-server -a localhost -p 8000 -c-1 ./app", "pretest": "npm install", "test": "karma start karma.conf.js", From 636552427d0c7d92fbf217837ee9dc6a334356e9 Mon Sep 17 00:00:00 2001 From: Georgios Kalpakas Date: Sun, 22 May 2016 00:29:15 +0300 Subject: [PATCH 3/3] chore(*): use `!` as hash-prefix --- app/app.js | 4 +++- app/index-async.html | 4 ++-- app/index.html | 4 ++-- bower.json | 3 ++- e2e-tests/scenarios.js | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/app.js b/app/app.js index 21eccdb8ea..6ea2401bcd 100644 --- a/app/app.js +++ b/app/app.js @@ -7,6 +7,8 @@ angular.module('myApp', [ 'myApp.view2', 'myApp.version' ]). -config(['$routeProvider', function($routeProvider) { +config(['$locationProvider', '$routeProvider', function($locationProvider, $routeProvider) { + $locationProvider.hashPrefix('!'); + $routeProvider.otherwise({redirectTo: '/view1'}); }]); diff --git a/app/index-async.html b/app/index-async.html index a559b7168e..39a592fb57 100644 --- a/app/index-async.html +++ b/app/index-async.html @@ -46,8 +46,8 @@
diff --git a/app/index.html b/app/index.html index 3c4bb6b02e..ec9da03650 100644 --- a/app/index.html +++ b/app/index.html @@ -16,8 +16,8 @@