migrated navbar for ng-forward syntax. added test for navbar

Evandro Junior
1 parent d003d3ce
Showing 7 changed files with 132 additions and 3 deletions Show diff stats
src/app/components/auth/index.ts
src/app/components/navbar/index.ts
src/app/components/navbar/navbar.spec.ts
src/app/components/navbar/navbar.ts
src/app/components/noosfero-blocks/link-list/index.ts
src/app/index.ts
src/app/main/main.component.ts
-/* Module Index Entry - generated using the script npm run generate-indexes */
+/* Module Index Entry - generated using the script npm run generate-index */
 export * from "./auth_controller";
 export * from "./auth_events";
 export * from "./auth_service";
 /* Module Index Entry - generated using the script npm run generate-index */
+export * from "./navbar";
@@ -0,0 +1,56 @@
+import {createComponentFromClass, quickCreateComponent} from "./../../../spec/helpers";
+import {Navbar} from "./";
+import {AUTH_EVENTS} from "./../auth";
+import {User} from "./../../models/interfaces";
+import {Injectable, Provider, provide} from "ng-forward";
+
+
+
+describe("Navbar Component", () => {
+
+    let $rootScope: ng.IRootScopeService;
+    let user = <User>{
+        id: 1,
+        login: "user"
+    };
+    
+    beforeEach(angular.mock.module("templates"));
+    
+    // beforeEach(inject((_$rootScope_: ng.IRootScopeService) => {
+    //     $rootScope = _$rootScope_;
+    // }));
+
+    it('should get the loggedIn user', (done: Function) => {
+      
+        
+        let scope = jasmine.createSpyObj("scope", ["$on"]);
+        
+        let providers = [
+            
+            
+            new Provider('moment', { useValue: {} }),
+            new Provider('$modal', { useValue: {} }),
+            new Provider('AuthService', { useValue: {} }),
+            new Provider('Session', { useValue: {
+                getCurrentUser: () => { return user}
+            } }),
+            new Provider('$scope', { useValue: scope }),
+            new Provider('$state', { useValue: {} }),
+            new Provider('AUTH_EVENTS', { useValue: {AUTH_EVENTS} })
+        ];
+        
+        
+        
+        quickCreateComponent({
+            providers: providers,
+            template: "<acme-navbar></acme-navbar>",
+            directives: [Navbar]
+        }).then(fixture => {
+            let navbarInstance: Navbar = fixture.debugElement.componentViewChildren[0].componentInstance;
+            expect(navbarInstance).toBeDefined();
+            expect(navbarInstance["currentUser"]).toEqual(user)
+            done();
+        })
+    });
+
+});
 \ No newline at end of file
@@ -0,0 +1,68 @@
+import {Component, Inject} from "ng-forward";
+
+
+import {Session, AuthService, IAuthEvents} from "./../auth";
+import {User} from "./../../models/interfaces";
+
+@Component({
+    selector: "acme-navbar",
+    templateUrl: "app/components/navbar/navbar.html"
+})
+@Inject("moment", "$modal", "AuthService", "Session", "$scope", "$state", "AUTH_EVENTS")
+export class Navbar {
+
+    private currentUser: User;
+    private modalInstance: any = null;
+    /**
+     *
+     */
+    constructor(
+        private moment: moment.MomentStatic,
+        private $modal: any,
+        private authService: AuthService,
+        private session: Session,
+        private $scope: ng.IScope,
+        private $state: ng.ui.IStateService,
+        private AUTH_EVENTS: IAuthEvents
+    ) {
+
+        this.currentUser = session.getCurrentUser();
+
+        $scope.$on(AUTH_EVENTS.loginSuccess, function() {
+            if (this.modalInstance) {
+                this.modalInstance.close();
+                this.modalInstance = null;
+            }
+
+            this.$state.go(this.$state.current, {}, { reload: true }); //TODO move to auth
+        });
+
+        $scope.$on(AUTH_EVENTS.logoutSuccess, () => {
+            this.currentUser = this.session.getCurrentUser();
+        });
+
+    }
+
+    openLogin() {
+        this.modalInstance = this.$modal.open({
+            templateUrl: 'app/components/auth/login.html',
+            controller: 'AuthController',
+            controllerAs: 'vm',
+            bindToController: true
+        });
+    };
+
+    logout() {
+        this.authService.logout();
+        this.$state.go(this.$state.current, {}, { reload: true });  //TODO move to auth
+    };
+
+
+
+    activate() {
+        if (!this.currentUser) {
+            this.openLogin();
+        }
+    }
+
+}
 \ No newline at end of file
 /* Module Index Entry - generated using the script npm run generate-index */
+export * from "./link-list.component";
@@ -19,6 +19,8 @@ import {bootstrap, bundle} from &quot;ng-forward&quot;;
 import {AUTH_EVENTS} from "./components/auth/auth_events";
 import {AuthController} from "./components/auth/auth_controller";
+import {Navbar} from "./components/navbar";
+
 declare var moment: any;
 let noosferoApp: any = bundle("noosferoApp", Main, ["ngAnimate", "ngCookies", "ngStorage", "ngTouch",
@@ -41,7 +43,6 @@ NoosferoApp.run(noosferoAngularRunBlock);
 NoosferoApp.addController("AuthController", AuthController);
-require("./components/navbar/navbar.directive.js");
 require("./components/noosfero-activities/activities.component.js");
 require("./components/noosfero-activities/activity/activity.component.js");
 require("./components/noosfero-blocks/main-block/main-block.component.js");
@@ -12,6 +12,8 @@ import {LinkListBlock} from &quot;../components/noosfero-blocks/link-list/link-list.c
 import {AuthService} from "./../components/auth/auth_service";
 import {Session} from "./../components/auth/session";
+import {Navbar} from "../components/navbar";
+
 @Component({
     selector: 'main-content',
     templateUrl: "app/main/main.html",
@@ -24,7 +26,7 @@ export class MainContent {
 @Component({
     selector: 'main',
     template: '<div ng-view></div>',
-    directives: [NoosferoArticleBlog, ArticleView, Boxes, Block, LinkListBlock],
+    directives: [NoosferoArticleBlog, ArticleView, Boxes, Block, LinkListBlock, Navbar],
     providers: [AuthService, Session]
 })
 @StateConfig([
1	-/* Module Index Entry - generated using the script npm run generate-indexes */	1	+/* Module Index Entry - generated using the script npm run generate-index */
2	export * from "./auth_controller";	2	export * from "./auth_controller";
3	export * from "./auth_events";	3	export * from "./auth_events";
4	export * from "./auth_service";	4	export * from "./auth_service";
1	/* Module Index Entry - generated using the script npm run generate-index */	1	/* Module Index Entry - generated using the script npm run generate-index */
		2	+export * from "./navbar";
	@@ -0,0 +1,56 @@		@@ -0,0 +1,56 @@
		1	+import {createComponentFromClass, quickCreateComponent} from "./../../../spec/helpers";
		2	+import {Navbar} from "./";
		3	+import {AUTH_EVENTS} from "./../auth";
		4	+import {User} from "./../../models/interfaces";
		5	+import {Injectable, Provider, provide} from "ng-forward";
		6	+
		7	+
		8	+
		9	+describe("Navbar Component", () => {
		10	+
		11	+ let $rootScope: ng.IRootScopeService;
		12	+ let user = <User>{
		13	+ id: 1,
		14	+ login: "user"
		15	+ };
		16	+
		17	+ beforeEach(angular.mock.module("templates"));
		18	+
		19	+ // beforeEach(inject((_$rootScope_: ng.IRootScopeService) => {
		20	+ // $rootScope = _$rootScope_;
		21	+ // }));
		22	+
		23	+ it('should get the loggedIn user', (done: Function) => {
		24	+
		25	+
		26	+ let scope = jasmine.createSpyObj("scope", ["$on"]);
		27	+
		28	+ let providers = [
		29	+
		30	+
		31	+ new Provider('moment', { useValue: {} }),
		32	+ new Provider('$modal', { useValue: {} }),
		33	+ new Provider('AuthService', { useValue: {} }),
		34	+ new Provider('Session', { useValue: {
		35	+ getCurrentUser: () => { return user}
		36	+ } }),
		37	+ new Provider('$scope', { useValue: scope }),
		38	+ new Provider('$state', { useValue: {} }),
		39	+ new Provider('AUTH_EVENTS', { useValue: {AUTH_EVENTS} })
		40	+ ];
		41	+
		42	+
		43	+
		44	+ quickCreateComponent({
		45	+ providers: providers,
		46	+ template: "<acme-navbar></acme-navbar>",
		47	+ directives: [Navbar]
		48	+ }).then(fixture => {
		49	+ let navbarInstance: Navbar = fixture.debugElement.componentViewChildren[0].componentInstance;
		50	+ expect(navbarInstance).toBeDefined();
		51	+ expect(navbarInstance["currentUser"]).toEqual(user)
		52	+ done();
		53	+ })
		54	+ });
		55	+
		56	+});
0	\ No newline at end of file	57	\ No newline at end of file
	@@ -0,0 +1,68 @@		@@ -0,0 +1,68 @@
		1	+import {Component, Inject} from "ng-forward";
		2	+
		3	+
		4	+import {Session, AuthService, IAuthEvents} from "./../auth";
		5	+import {User} from "./../../models/interfaces";
		6	+
		7	+@Component({
		8	+ selector: "acme-navbar",
		9	+ templateUrl: "app/components/navbar/navbar.html"
		10	+})
		11	+@Inject("moment", "$modal", "AuthService", "Session", "$scope", "$state", "AUTH_EVENTS")
		12	+export class Navbar {
		13	+
		14	+ private currentUser: User;
		15	+ private modalInstance: any = null;
		16	+ /**
		17	+ *
		18	+ */
		19	+ constructor(
		20	+ private moment: moment.MomentStatic,
		21	+ private $modal: any,
		22	+ private authService: AuthService,
		23	+ private session: Session,
		24	+ private $scope: ng.IScope,
		25	+ private $state: ng.ui.IStateService,
		26	+ private AUTH_EVENTS: IAuthEvents
		27	+ ) {
		28	+
		29	+ this.currentUser = session.getCurrentUser();
		30	+
		31	+ $scope.$on(AUTH_EVENTS.loginSuccess, function() {
		32	+ if (this.modalInstance) {
		33	+ this.modalInstance.close();
		34	+ this.modalInstance = null;
		35	+ }
		36	+
		37	+ this.$state.go(this.$state.current, {}, { reload: true }); //TODO move to auth
		38	+ });
		39	+
		40	+ $scope.$on(AUTH_EVENTS.logoutSuccess, () => {
		41	+ this.currentUser = this.session.getCurrentUser();
		42	+ });
		43	+
		44	+ }
		45	+
		46	+ openLogin() {
		47	+ this.modalInstance = this.$modal.open({
		48	+ templateUrl: 'app/components/auth/login.html',
		49	+ controller: 'AuthController',
		50	+ controllerAs: 'vm',
		51	+ bindToController: true
		52	+ });
		53	+ };
		54	+
		55	+ logout() {
		56	+ this.authService.logout();
		57	+ this.$state.go(this.$state.current, {}, { reload: true }); //TODO move to auth
		58	+ };
		59	+
		60	+
		61	+
		62	+ activate() {
		63	+ if (!this.currentUser) {
		64	+ this.openLogin();
		65	+ }
		66	+ }
		67	+
		68	+}
0	\ No newline at end of file	69	\ No newline at end of file
1	/* Module Index Entry - generated using the script npm run generate-index */	1	/* Module Index Entry - generated using the script npm run generate-index */
		2	+export * from "./link-list.component";