Download as
Browse Code »

Commit f68015db2026d81a50097f75947000733748b83b

Authored by Carlos Purificação
1 parent 479a013a
Exists in master and in 26 other branches activities_block, btn-new-post, cosmetic_changes_people_and_communities_block, edit-blocks, edit-header-footer, env-tags-block, forgot_password, layout_support, list_articles_on_blog, loading-indicator-component, login_modal, login_modal_improve, person_info_block, profile-article-resolvers, profile-blocks-sass, profile_description_block_component, profile_page_improvements, recent-activities, remove-article-confirmation, skin-small-change, staging, tags-block, theme-skin-yellow, translations, updated_signup_page, users_profile_page

Fixed merge request issues

Showing 5 changed files with 20 additions and 11 deletions   Show diff stats
src/app/layout/blocks/login-block/login-block.component.spec.ts
  Diff comments   View file @f68015d
... ... @@ -5,7 +5,7 @@ import {ComponentFixture} from 'ng-forward/cjs/testing/test-component-builder';
5 5 import {providers} from 'ng-forward/cjs/testing/providers';
6 6 import {LoginBlockComponent} from './login-block.component';
7 7 import * as helpers from "./../../../../spec/helpers";
8   -import {SessionService, AuthService, AuthController, IAuthEvents, AUTH_EVENTS} from "./../../../login";
  8 +import {SessionService, AuthService, AuthController, AuthEvents} from "./../../../login";
9 9  
10 10 const htmlTemplate: string = '<noosfero-login-block></noosfero-login-block>';
11 11  
... ... @@ -92,16 +92,18 @@ describe(&quot;Components&quot;, () =&gt; {
92 92 * Simulate the AuthService loginSuccess event
93 93 */
94 94 function simulateLoginEvent() {
95   - let localScope: ng.IScope = helper.component["$scope"];
96   - localScope.$emit(AUTH_EVENTS.loginSuccess);
  95 + let successEvent: string = AuthEvents[AuthEvents.loginSuccess];
  96 +
  97 + (<any>helper.component.authService)[successEvent].next(user);
97 98 }
98 99  
99 100 /**
100 101 * Simulate the AuthService logoutSuccess event
101 102 */
102 103 function simulateLogoutEvent() {
103   - let localScope: ng.IScope = helper.component["$scope"];
104   - localScope.$emit(AUTH_EVENTS.logoutSuccess);
  104 + let successEvent: string = AuthEvents[AuthEvents.logoutSuccess];
  105 +
  106 + (<any>helper.component.authService)[successEvent].next(user);
105 107 }
106 108 });
107 109  
... ...
src/app/layout/blocks/login-block/login-block.component.ts
  Diff comments   View file @f68015d
1 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 5 * @ngdoc controller
... ... @@ -35,15 +35,15 @@ export class LoginBlockComponent {
35 35 constructor(
36 36 private session: SessionService,
37 37 private $state: ng.ui.IStateService,
38   - private authService: AuthService,
  38 + public authService: AuthService,
39 39 private $scope: ng.IScope) {
40 40 this.currentUser = this.session.currentUser();
41 41  
42   - this.$scope.$on(AUTH_EVENTS.loginSuccess, () => {
  42 + this.authService.subscribe(AuthEvents[AuthEvents.loginSuccess], () => {
43 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 47 this.currentUser = this.session.currentUser();
48 48 });
49 49  
... ...
src/lib/ng-noosfero-api/interfaces/person.ts
  Diff comments   View file @f68015d
... ... @@ -6,7 +6,5 @@ namespace noosfero {
6 6 * A representation of a Person in Noosfero.
7 7 */
8 8 export interface Person extends Profile {
9   - created_at: string;
10   - identifier: string;
11 9 }
12 10 }
13 11 \ No newline at end of file
... ...
src/lib/ng-noosfero-api/interfaces/profile.ts
  Diff comments   View file @f68015d
... ... @@ -22,6 +22,14 @@ namespace noosfero {
22 22 * @returns {string} The unque identifier for the Profile
23 23 */
24 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 35 * @ngdoc property
... ...
src/spec/mocks.ts
  Diff comments   View file @f68015d
... ... @@ -68,6 +68,7 @@ export var mocks: any = {
68 68 mocks.authService['logoutSuccess'].event(param);
69 69 }
70 70 },
  71 + login: () => { },
71 72 logout: () => { },
72 73 subscribe: (eventName: string, fn: Function) => {
73 74 mocks.authService[eventName].subscribe(fn);
... ...