Skip to content
Open
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
17 changes: 16 additions & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@ npm install
```
bower install
```

### To start application in live reload mode

grunt serve

### Jshint
To run verify jshint:
Expand All @@ -89,4 +85,4 @@ To unit tests in development mode:

To run verify jshint, tests and coverage:

npm test
npm test
7 changes: 2 additions & 5 deletions bower.json
Original file line number Diff line number Diff line change
@@ -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"
},
Expand Down
10 changes: 3 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -20,7 +17,6 @@
"load-grunt-tasks": "0.4.0"
},
"scripts": {
"postinstall": "webdriver-manager update --standalone",
"test": "grunt verify --force"
}
}
28 changes: 0 additions & 28 deletions test/.jshintrc

This file was deleted.

4 changes: 0 additions & 4 deletions test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
'use strict';


describe('Service: userService', function () {

'use strict';

var $httpBackend, $cookies, $rootScope, UserService, AuthService;

// load the service's module
Expand Down