diff --git a/.jshintrc b/.jshintrc index f750969..83e1d4b 100644 --- a/.jshintrc +++ b/.jshintrc @@ -18,6 +18,21 @@ "trailing": true, "smarttabs": true, "globals": { - "angular": false + "angular": false, + "describe": true, + "afterEach": true, + "beforeEach": true, + "beforeAll": true, + "afterAll": true, + "it": true, + "by": true, + "expect": true, + "module": true, + "inject": true, + "jasmine": true, + "spyOn": true, + "browser": true, + "element": true, + "require": true } } diff --git a/README.md b/README.md index 83fba2d..197d62e 100644 --- a/README.md +++ b/README.md @@ -70,10 +70,6 @@ npm install ``` bower install ``` - -### To start application in live reload mode - - grunt serve ### Jshint To run verify jshint: @@ -89,4 +85,4 @@ To unit tests in development mode: To run verify jshint, tests and coverage: - npm test \ No newline at end of file + npm test diff --git a/bower.json b/bower.json index a18d14f..c7c8cd3 100644 --- a/bower.json +++ b/bower.json @@ -1,12 +1,9 @@ { - "name": "AuthExercise2", - "version": "1.0.0", + "name": "sign-in-part-2", + "version": "0.0.1", "dependencies": { "angular": "1.4.0", - "bootstrap": "3.2.0", - "angular-ui-router": "0.2.13", "angular-mocks": "1.4.0", - "angular-growl-v2": "0.7.3", "angular-resource": "1.4.0", "angular-cookies": "1.4.0" }, diff --git a/package.json b/package.json index 532d1f2..3508123 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,13 @@ { - "name": "AuthExercise2", - "version": "1.0.0", + "name": "sign-in-part-2", + "version": "0.0.1", + "private": true, "dependencies": {}, "devDependencies": { "grunt": "0.4.5", "grunt-cli": "0.1.13", "grunt-contrib-jshint": "0.11.3", "grunt-karma": "0.10.1", - "protractor": "2.1.0", - "jasmine": "2.3.2", - "jasmine-reporters": "2.0.7", - "jasmine-spec-reporter": "2.4.0", "karma": "0.12.16", "karma-coverage": "0.3.1", "karma-jasmine": "0.1.5", @@ -20,7 +17,6 @@ "load-grunt-tasks": "0.4.0" }, "scripts": { - "postinstall": "webdriver-manager update --standalone", "test": "grunt verify --force" } } diff --git a/test/.jshintrc b/test/.jshintrc deleted file mode 100644 index e2a25d2..0000000 --- a/test/.jshintrc +++ /dev/null @@ -1,28 +0,0 @@ -{ - "node": true, - "browser": true, - "esnext": true, - "bitwise": true, - "camelcase": true, - "curly": true, - "eqeqeq": true, - "immed": true, - "indent": 2, - "latedef": true, - "newcap": true, - "noarg": true, - "quotmark": "single", - "regexp": true, - "undef": true, - "unused": true, - "strict": true, - "trailing": true, - "smarttabs": true, - "jasmine": true, - "globals": { - "angular": false, - "browser": false, - "inject": false - } -} - diff --git a/test/karma.conf.js b/test/karma.conf.js index e8e86b8..b1e39f5 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -20,12 +20,8 @@ module.exports = function (config) // list of files / patterns to load in the browser files: [ // bower:js - 'bower_components/jquery/dist/jquery.js', 'bower_components/angular/angular.js', - 'bower_components/bootstrap/dist/js/bootstrap.js', - 'bower_components/angular-ui-router/release/angular-ui-router.js', 'bower_components/angular-mocks/angular-mocks.js', - 'bower_components/angular-growl-v2/build/angular-growl.js', 'bower_components/angular-resource/angular-resource.js', 'bower_components/angular-cookies/angular-cookies.js', // endbower diff --git a/test/spec/services/auth-interceptor.js b/test/spec/services/auth-interceptor.spec.js similarity index 100% rename from test/spec/services/auth-interceptor.js rename to test/spec/services/auth-interceptor.spec.js diff --git a/test/spec/services/auth-service.js b/test/spec/services/auth-service.spec.js similarity index 100% rename from test/spec/services/auth-service.js rename to test/spec/services/auth-service.spec.js diff --git a/test/spec/services/user-service.js b/test/spec/services/user-service.spec.js similarity index 98% rename from test/spec/services/user-service.js rename to test/spec/services/user-service.spec.js index 5df9a0d..1cda86c 100644 --- a/test/spec/services/user-service.js +++ b/test/spec/services/user-service.spec.js @@ -1,7 +1,9 @@ -'use strict'; + describe('Service: userService', function () { + 'use strict'; + var $httpBackend, $cookies, $rootScope, UserService, AuthService; // load the service's module