Fixed merge request issues

Carlos Purificação
1 parent 479a013a
Showing 5 changed files with 20 additions and 11 deletions Show diff stats
src/app/layout/blocks/login-block/login-block.component.spec.ts
src/app/layout/blocks/login-block/login-block.component.ts
src/lib/ng-noosfero-api/interfaces/person.ts
src/lib/ng-noosfero-api/interfaces/profile.ts
src/spec/mocks.ts
@@ -5,7 +5,7 @@ import {ComponentFixture} from &#39;ng-forward/cjs/testing/test-component-builder&#39;;
 import {providers} from 'ng-forward/cjs/testing/providers';
 import {LoginBlockComponent} from './login-block.component';
 import * as helpers from "./../../../../spec/helpers";
-import {SessionService, AuthService, AuthController, IAuthEvents, AUTH_EVENTS} from "./../../../login";
+import {SessionService, AuthService, AuthController, AuthEvents} from "./../../../login";
 const htmlTemplate: string = '<noosfero-login-block></noosfero-login-block>';
@@ -92,16 +92,18 @@ describe(&quot;Components&quot;, () =&gt; {
          * Simulate the AuthService loginSuccess event
          */
         function simulateLoginEvent() {
-            let localScope: ng.IScope = helper.component["$scope"];
-            localScope.$emit(AUTH_EVENTS.loginSuccess);
+            let successEvent: string = AuthEvents[AuthEvents.loginSuccess];
+
+            (<any>helper.component.authService)[successEvent].next(user);
         }
         /**
          * Simulate the AuthService logoutSuccess event
          */
         function simulateLogoutEvent() {
-            let localScope: ng.IScope = helper.component["$scope"];
-            localScope.$emit(AUTH_EVENTS.logoutSuccess);
+            let successEvent: string = AuthEvents[AuthEvents.logoutSuccess];
+
+            (<any>helper.component.authService)[successEvent].next(user);
         }
     });
 import {Input, Inject, Component} from "ng-forward";
-import {SessionService, AuthService, IAuthEvents, AUTH_EVENTS} from "./../../../login";
+import {SessionService, AuthService, AuthEvents} from "./../../../login";
 /**
  * @ngdoc controller
@@ -35,15 +35,15 @@ export class LoginBlockComponent {
     constructor(
         private session: SessionService,
         private $state: ng.ui.IStateService,
-        private authService: AuthService,
+        public authService: AuthService,
         private $scope: ng.IScope) {
         this.currentUser = this.session.currentUser();
-        this.$scope.$on(AUTH_EVENTS.loginSuccess, () => {
+        this.authService.subscribe(AuthEvents[AuthEvents.loginSuccess], () => {
             this.currentUser = this.session.currentUser();
         });
-        this.$scope.$on(AUTH_EVENTS.logoutSuccess, () => {
+        this.authService.subscribe(AuthEvents[AuthEvents.logoutSuccess], () => {
             this.currentUser = this.session.currentUser();
         });
@@ -6,7 +6,5 @@ namespace noosfero {
      *  A representation of a Person in Noosfero.
      */
     export interface Person extends Profile {
-        created_at: string;
-        identifier: string;
     }
 }
 \ No newline at end of file
@@ -22,6 +22,14 @@ namespace noosfero {
          * @returns {string} The unque identifier for the Profile
          */
         identifier: string;
+        
+        /**
+         * @ngdoc property
+         * @name created_at
+         * @propertyOf noofero.Profile
+         * @returns {string} The timestamp this object was created
+         */        
+        created_at: string;
         /**
          * @ngdoc property
@@ -68,6 +68,7 @@ export var mocks: any = {
                 mocks.authService['logoutSuccess'].event(param);
             }
         },
+        login: () => { },
         logout: () => { },
         subscribe: (eventName: string, fn: Function) => {
             mocks.authService[eventName].subscribe(fn);
1	import {Input, Inject, Component} from "ng-forward";	1	import {Input, Inject, Component} from "ng-forward";
2	-import {SessionService, AuthService, IAuthEvents, AUTH_EVENTS} from "./../../../login";	2	+import {SessionService, AuthService, AuthEvents} from "./../../../login";
3		3
4	/**	4	/**
5	* @ngdoc controller	5	* @ngdoc controller
	@@ -35,15 +35,15 @@ export class LoginBlockComponent {		@@ -35,15 +35,15 @@ export class LoginBlockComponent {
35	constructor(	35	constructor(
36	private session: SessionService,	36	private session: SessionService,
37	private $state: ng.ui.IStateService,	37	private $state: ng.ui.IStateService,
38	- private authService: AuthService,	38	+ public authService: AuthService,
39	private $scope: ng.IScope) {	39	private $scope: ng.IScope) {
40	this.currentUser = this.session.currentUser();	40	this.currentUser = this.session.currentUser();
41		41
42	- this.$scope.$on(AUTH_EVENTS.loginSuccess, () => {	42	+ this.authService.subscribe(AuthEvents[AuthEvents.loginSuccess], () => {
43	this.currentUser = this.session.currentUser();	43	this.currentUser = this.session.currentUser();
44	});	44	});
45		45
46	- this.$scope.$on(AUTH_EVENTS.logoutSuccess, () => {	46	+ this.authService.subscribe(AuthEvents[AuthEvents.logoutSuccess], () => {
47	this.currentUser = this.session.currentUser();	47	this.currentUser = this.session.currentUser();
48	});	48	});
49		49
	@@ -22,6 +22,14 @@ namespace noosfero {		@@ -22,6 +22,14 @@ namespace noosfero {
22	* @returns {string} The unque identifier for the Profile	22	* @returns {string} The unque identifier for the Profile
23	*/	23	*/
24	identifier: string;	24	identifier: string;
		25	+
		26	+ /**
		27	+ * @ngdoc property
		28	+ * @name created_at
		29	+ * @propertyOf noofero.Profile
		30	+ * @returns {string} The timestamp this object was created
		31	+ */
		32	+ created_at: string;
25		33
26	/**	34	/**
27	* @ngdoc property	35	* @ngdoc property