Merge branch 'ngforward' of softwarepublico.gov.br:noosfero-themes/angular-theme into ngforward

Victor Costa
2 parents 102c26aa 921551c2
Showing 2 changed files with 137 additions and 119 deletions Show diff stats
src/app/components/navbar/navbar.spec.ts
src/app/components/noosfero-articles/blog/blog.component.spec.ts
@@ -18,54 +18,55 @@ import {
     provide
 } from "ng-forward";
+import {Session, AuthService, AuthController, IAuthEvents} from "./../auth";
 describe("Components", () => {
-
     describe("Navbar Component", () => {
-        let $rootScope: ng.IRootScopeService;
-        let user = <User>{
-            id: 1,
-            login: "user"
-        };
-
+            let $rootScope: ng.IRootScopeService;
+            
+            let user = <User>{
+                id: 1,
+                login: "user"
+            };
+
+            let scope = {
+                eventCalledHook: () => { },
+                $on: (eventName: string, func: Function) => {
+                    this.eventCalledHook = func;
+                }
+            }
-        let scope = {
-            eventCalledHook: () => { },
-            $on: (eventName: string, func: Function) => {
-                this.eventCalledHook = func;
+            let modalInstance = {
+                close: () => { }
             }
-        }
-        let modalInstance = {
-            close: () => { }
-        }
+            let $modal = {
+                open: (args: {}) => {
+                    return modalInstance;
+                }
+            }
-        let $modal = {
-            open: (args: {}) => {
-                return modalInstance;
+            let authService = {
+                logout: () => { }
             }
-        }
-
-        let authService = {
-            logout: () => { }
-        }
-
-        let stateService = jasmine.createSpyObj("$state", ["go"]);
-        let providers = [
-            new Provider('moment', { useValue: {} }),
-            new Provider('$modal', { useValue: $modal }),
-            new Provider('AuthService', { useValue: authService }),
-            new Provider('Session', {
-                useValue: {
-                    currentUser: () => { return user }
-                }
-            }),
-            new Provider('$scope', { useValue: scope }),
-            new Provider('$state', { useValue: stateService }),
-            new Provider('AUTH_EVENTS', { useValue: { AUTH_EVENTS } })
-        ];
+
+            let stateService = jasmine.createSpyObj("$state", ["go"]);
+            let providers = [
+                new Provider('moment', { useValue: {} }),
+                new Provider('$modal', { useValue: $modal }),
+                new Provider('AuthService', { useValue: authService }),
+                new Provider('Session', {
+                    useValue: {
+                        currentUser: () => { return user }
+                    }
+                }),
+                new Provider('$scope', { useValue: scope }),
+                new Provider('$state', { useValue: stateService }),
+                new Provider('AUTH_EVENTS', { useValue: { AUTH_EVENTS } })
+            ];
+        
         beforeEach(angular.mock.module("templates"));
@@ -76,7 +77,6 @@ describe(&quot;Components&quot;, () =&gt; {
         it('should get the loggedIn user', (done: Function) => {
             let scope = jasmine.createSpyObj("scope", ["$on"]);
-
             let providers = [
                 provideEmptyObjects('moment', '$modal', 'AuthService', '$state'),
                 new Provider('Session', {
@@ -108,7 +108,8 @@ describe(&quot;Components&quot;, () =&gt; {
             });
         });
-        it('It should open on click', (done: Function) => {
+        it('should open on click', (done: Function) => {
+
             quickCreateComponent({
                 providers: providers,
                 template: "<acme-navbar></acme-navbar>",
@@ -119,17 +120,18 @@ describe(&quot;Components&quot;, () =&gt; {
                     spyOn($modal, "open");
                     navbarComp.openLogin();
                     expect($modal.open).toHaveBeenCalled();
-                    // expect($modal.open).toHaveBeenCalledWith({
-                    //     templateUrl: 'app/components/auth/login.html',
-                    //     controller: 'AuthController',
-                    //     controllerAs: 'vm',
-                    //     bindToController: true
-                    // })
+                    expect($modal.open).toHaveBeenCalledWith({
+                        templateUrl: 'app/components/auth/login.html',
+                        controller: AuthController,
+                        controllerAs: 'vm',
+                        bindToController: true                        
+                     })
                     done();
                 })
         });
-        it('It should logout', (done: Function) => {
+        it('should logout', (done: Function) => {
+
             quickCreateComponent({
                 providers: providers,
                 template: "<acme-navbar></acme-navbar>",
@@ -145,6 +147,38 @@ describe(&quot;Components&quot;, () =&gt; {
         });
+        it('should not activate user when logged in',  (done: Function) => {
+            quickCreateComponent({
+                providers: providers,
+                template: "<acme-navbar></acme-navbar>",
+                directives: [Navbar]
+            })
+                .then(fixture => {
+                    let navbarComp: Navbar = <Navbar>fixture.debugElement.componentViewChildren[0].componentInstance;
+                    spyOn(navbarComp, "openLogin");
+                    navbarComp.activate();
+                    expect(navbarComp.openLogin.calls.count()).toBe(0);
+                    done();
+               })
+
+        });            
+
+        it('should activate when user not logged in',  (done: Function) => {
+            user = null;
+            quickCreateComponent({
+                providers: providers,
+                template: "<acme-navbar></acme-navbar>",
+                directives: [Navbar]
+            })
+                .then(fixture => {
+                    let navbarComp: Navbar = <Navbar>fixture.debugElement.componentViewChildren[0].componentInstance;
+                    spyOn(navbarComp, "openLogin");
+                    navbarComp.activate();
+                    expect(navbarComp.openLogin).toHaveBeenCalled();
+                    done();
+                })
+        });
+        
         // it('closes the modal the login', (done: Function) => {
         //     let scope = {
+import {providers} from 'ng-forward/cjs/testing/providers';
+
 import {
     Input,
-    provide,
     Component
 } from 'ng-forward';
 import {
@@ -12,26 +13,16 @@ import {
     quickCreateComponent,
     provideEmptyObjects,
     createProviderToValue,
-    getAngularService
+    getAngularService,
+    provideFilters
 } from "../../../../spec/helpers.ts";
-
 // this htmlTemplate will be re-used between the container components in this spec file
 const htmlTemplate: string = '<noosfero-blog [article]="ctrl.article" [profile]="ctrl.profile"></noosfero-blog>';
-let articleService: {
-    getChildren: Function
-} = < any > {};
-
 describe("Blog Component", () => {
-
-    // the karma preprocessor html2js transform the templates html into js files which put
-    // the templates to the templateCache into the module templates
-    // we need to load the module templates here as the template for the
-    // component Noosfero ArtileView will be load on our tests
-    beforeEach(angular.mock.module("templates"));
-
-    function promiseResultTemplate(response ? : {}) {
+  
+    function promiseResultTemplate(response?: {}) {
         let thenFuncEmpty = (func: Function) => {
             // does nothing
         };
@@ -50,48 +41,54 @@ describe(&quot;Blog Component&quot;, () =&gt; {
         }
     }
-    beforeAll(() => {
-        // creating mock for articleService
-        articleService = {
-            getChildren: (article_id: number, filters: {}) => {
-                return promiseResultTemplate(null);
-            }
+    let articleService = {
+        getChildren: (article_id: number, filters: {}) => {
+            return promiseResultTemplate(null);
+        }
+    };
+
+    @Component({
+        selector: 'test-container-component',
+        template: htmlTemplate,
+        directives: [ArticleBlog],
+        providers: [
+            provideEmptyObjects('Restangular'),
+            createProviderToValue('ArticleService', articleService),
+            provideFilters('truncateFilter')
+        ]
+    })
+    class BlogContainerComponent {
+        article = {
+            type: 'anyArticleType'
+        };
+        profile = {
+            name: 'profile-name'
         };
+    }
+
+    beforeEach(() => {
+
+        // the karma preprocessor html2js transform the templates html into js files which put
+        // the templates to the templateCache into the module templates
+        // we need to load the module templates here as the template for the
+        // component Noosfero ArtileView will be load on our tests
+        angular.mock.module("templates")
+
+        providers((provide: any) => {
+            return <any>[
+                provide('ArticleService', { useValue: articleService })
+            ]
+        });
     });
     it("renders the blog content", (done: Function) => {
-        // Creating a container component (ArticleContainerComponent) to include
-        // the component under test (ArticleView)
-        @Component({
-            selector: 'test-container-component',
-            template: htmlTemplate,
-            directives: [ArticleBlog],
-            providers: [provideEmptyObjects('Restangular'), createProviderToValue('ArticleService', articleService)]
-        })
-        class BlogContainerComponent {
-            article = {
-                type: 'anyArticleType'
-            };
-            profile = {
-                name: 'profile-name'
-            };
-        }
-
         createComponentFromClass(BlogContainerComponent).then((fixture) => {
             expect(fixture.debugElement.query('div.blog').length).toEqual(1);
             done();
         });
-
-
-
-    });
-
-    it("get $q service", () => {
-        let $q = getAngularService<ng.IQService>("$q");
-        console.log($q);
     });
     it("verify the blog data", (done: Function) => {
@@ -102,44 +99,31 @@ describe(&quot;Blog Component&quot;, () =&gt; {
                 headers: (headerName: string) => {
                     return 1;
                 },
-                data: < any > {
-                    articles: []
+                data: <any>{
+                    articles: [{
+                        id: 1,
+                        title: 'The article test'
+                    }]
                 }
             });
         };
-        @Component({
-            selector: 'test-container-component',
-            template: htmlTemplate,
-            directives: [ArticleBlog],
-            providers: [provideEmptyObjects('Restangular'), createProviderToValue('ArticleService', articleService)]
-        })
-        class BlogContainerComponent {
-            article = {
-                type: 'anyArticleType'
-            };
-            profile = {
-                name: 'profile-name'
-            };
-        }
-
         createComponentFromClass(BlogContainerComponent).then((fixture) => {
             // gets the children component of BlogContainerComponent
             let articleBlog: BlogContainerComponent = fixture.debugElement.componentViewChildren[0].componentInstance;
-            // check if the component property are the provided by the mocked articleService 
-            expect(( < any > articleBlog)["posts"]).toEqual([]);
-            expect(( < any > articleBlog)["totalPosts"]).toEqual(1);
-
+            // check if the component property are the provided by the mocked articleService
+            var post = {
+                id: 1,
+                title: 'The article test'
+            };
+            expect((<any>articleBlog)["posts"][0]).toEqual(jasmine.objectContaining(post));
+            expect((<any>articleBlog)["totalPosts"]).toEqual(1);
-            // done needs to be called (it isn't really needed, as we can read in
-            // here (https://github.com/ngUpgraders/ng-forward/blob/master/API.md#createasync)
-            // because createAsync in ng-forward is not really async, but as the intention
-            // here is write tests in angular 2 ways, this is recommended
             done();
         });
     });
-});
 \ No newline at end of file
+});