Added tests for new methods

Author: neroniaky

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## v0.1.0
+**Features:**
+- Added tests
+
 ## v0.0.6 & v0.0.5
 **Features:**
 - Added `resetPassword()` for user password reset

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular2-token",
-  "version": "0.0.6",
+  "version": "0.1.0",
   "description": "Angular2 service for token based authentication",
   "main": "./angular2-token.js",
   "typings": "./angular2-token.d.ts",

src/angular2-token.service.ts

@@ -76,7 +76,7 @@ export class Angular2TokenService {
 
     // Delete Account
     deleteAccount(): Observable<Response> {
-        return this.delete(this._constructUserPath() + this._options.registerAccountPath).map(res => res.json());
+        return this.delete(this._constructUserPath() + this._options.deleteAccountPath).map(res => res.json());
     }
 
     // Sign in request and set storage
@@ -246,21 +246,23 @@ export class Angular2TokenService {
     // Try to get auth data from url parameters. Return null if parameter is missing.
     private _getAuthDataFromParams() {
 
-        this._router.routerState.queryParams.subscribe(params => {
-
-            let authData: AuthData = {
-                accessToken: params['token'],
-                client: params['client_id'],
-                expiry: params['expiry'],
-                tokenType: 'Bearer',
-                uid: params['uid']
-            };
-
-            if (this._checkIfComplete(authData))
-                this._currentAuthData = authData;
-            else
-                this._currentAuthData = null;
-        });
+        if (this._router.routerState != null) { // Fix for Testing, has to be removed later
+            this._router.routerState.queryParams.subscribe(params => {
+
+                let authData: AuthData = {
+                    accessToken: params['token'],
+                    client: params['client_id'],
+                    expiry: params['expiry'],
+                    tokenType: 'Bearer',
+                    uid: params['uid']
+                };
+
+                if (this._checkIfComplete(authData))
+                    this._currentAuthData = authData;
+                else
+                    this._currentAuthData = null;
+            });
+        }
     }
 
 

src/angular2-token.spec.ts

@@ -2,7 +2,7 @@ import { Http, BaseRequestOptions, Response, ResponseOptions, Headers, RequestMe
 import { MockBackend } from '@angular/http/testing';
 import { provide } from '@angular/core';
 import { inject, addProviders } from '@angular/core/testing';
-import { Router } from '@angular/router';
+import { Router, ActivatedRoute, RouterOutletMap, RouterState } from '@angular/router';
 
 import { Angular2TokenService } from './';
 
@@ -39,19 +39,19 @@ describe('Angular2TokenService', () => {
 		confirm_success_url: window.location.href
 	}
 
+	class Mock { }
+
 	beforeEach(() => {
 		// Inject HTTP and Angular2TokenService
 		addProviders([
 			BaseRequestOptions,
 			MockBackend,
-			Router,
-			provide(Http, {
-				useFactory:
-				function (backend, defaultOptions) {
-					return new Http(backend, defaultOptions);
-				},
+			{ provide: Router, useClass: Mock },
+			{
+				provide: Http,
+				useFactory: (backend, defaultOptions) => { return new Http(backend, defaultOptions) },
 				deps: [MockBackend, BaseRequestOptions]
-			}),
+			},
 			Angular2TokenService
 		]);
 
@@ -115,18 +115,78 @@ describe('Angular2TokenService', () => {
 		tokenService.registerAccount(registerData.email, registerData.password, registerData.password_confirmation);
 	}));
 
-	// Testing Configured Configuration
+	// Testing Custom Configuration
 
-	it('signIn method should send to configured api path', inject([Angular2TokenService, MockBackend], (tokenService, mockBackend) => {
+	it('Methods should send to configured path', inject([Angular2TokenService, MockBackend], (tokenService, mockBackend) => {
 
 		mockBackend.connections.subscribe(
-			c => expect(c.request.url).toEqual('myapi/auth/sign_in')
+			c => expect(c.request.url).toEqual('myapi/myauth/mysignin')
 		);
 
-		tokenService.init({ apiPath: 'myapi' });
+		tokenService.init({ apiPath: 'myapi', signInPath: 'myauth/mysignin' });
 		tokenService.signIn(signInData.email, signInData.password);
 	}));
 
+	it('signOut should send to configured path', inject([Angular2TokenService, MockBackend], (tokenService, mockBackend) => {
+
+		mockBackend.connections.subscribe(
+			c => expect(c.request.url).toEqual('myapi/myauth/mysignout')
+		);
+
+		tokenService.init({ apiPath: 'myapi', signOutPath: 'myauth/mysignout' });
+		tokenService.signOut();
+	}));
+
+	it('registerAccount should send to configured path', inject([Angular2TokenService, MockBackend], (tokenService, mockBackend) => {
+
+		mockBackend.connections.subscribe(
+			c => expect(c.request.url).toEqual('myapi/myauth/myregister')
+		);
+
+		tokenService.init({ apiPath: 'myapi', registerAccountPath: 'myauth/myregister' });
+		tokenService.registerAccount('example@example.org', 'password', 'password');
+	}));
+
+	it('deleteAccount should send to configured path', inject([Angular2TokenService, MockBackend], (tokenService, mockBackend) => {
+
+		mockBackend.connections.subscribe(
+			c => expect(c.request.url).toEqual('myapi/myauth/mydelete')
+		);
+
+		tokenService.init({ apiPath: 'myapi', deleteAccountPath: 'myauth/mydelete' });
+		tokenService.deleteAccount();
+	}));
+
+	it('validateToken should send to configured path', inject([Angular2TokenService, MockBackend], (tokenService, mockBackend) => {
+
+		mockBackend.connections.subscribe(
+			c => expect(c.request.url).toEqual('myapi/myauth/myvalidate')
+		);
+
+		tokenService.init({ apiPath: 'myapi', validateTokenPath: 'myauth/myvalidate' });
+		tokenService.validateToken();
+	}));
+
+	it('updatePasswordPath should send to configured path', inject([Angular2TokenService, MockBackend], (tokenService, mockBackend) => {
+
+		mockBackend.connections.subscribe(
+			c => expect(c.request.url).toEqual('myapi/myauth/myupdate')
+		);
+
+		tokenService.init({ apiPath: 'myapi', updatePasswordPath: 'myauth/myupdate' });
+		tokenService.updatePassword('password', 'password');
+	}));
+
+	it('resetPasswordPath should send to configured path', inject([Angular2TokenService, MockBackend], (tokenService, mockBackend) => {
+
+		mockBackend.connections.subscribe(
+			c => expect(c.request.url).toEqual('myapi/myauth/myreset')
+		);
+
+		tokenService.init({ apiPath: 'myapi', resetPasswordPath: 'myauth/myreset' });
+		tokenService.resetPassword('emxaple@example.org');
+	}));
+
 	// Testing Token handling
 
 	it('signIn method should receive headers and set local storage', inject([Angular2TokenService, MockBackend], (tokenService, mockBackend) => {