merge. after changes on navbar

Evandro Junior
2 parents 729a3a63 a4832609
Showing 15 changed files with 207 additions and 93 deletions Show diff stats
.vscode/tasks.json
package.json
src/app/components/auth/auth_service.spec.ts
src/app/components/auth/auth_service.ts
src/app/components/navbar/navbar.directive.js
src/app/components/navbar/navbar.html
src/app/components/noosfero-blocks/block.component.ts
src/app/components/noosfero-blocks/link-list/link-list.component.spec.ts
src/app/components/noosfero-blocks/link-list/link-list.component.ts
src/app/components/noosfero-blocks/main-block/main-block.component.js
src/app/components/noosfero-blocks/main-block/main-block.component.spec.ts
src/app/components/noosfero-blocks/main-block/main-block.component.ts
src/app/index.ts
src/app/main/main.component.ts
typings.json
@@ -21,6 +21,10 @@
             "taskName": "test",
             "args": ["test"],
             "isTestCommand": true
+        },
+        {
+            "taskName": "generate-indexes",
+            "args": []
         }
     ]
 }
 \ No newline at end of file
@@ -8,7 +8,7 @@
   },
   "scripts": {
     "test": "concurrently \"webpack -w\" \"karma start\"",
-    "postinstall": "npm install -g bower && bower install",
+    "postinstall": "npm install -g bower && bower install && typings install",
     "start": "concurrently \"webpack -w\" \"gulp serve\"",
     "generate-indexes": "ts-node --project ./dev-scripts ./dev-scripts/generate-index-modules.ts"
   },
@@ -0,0 +1,67 @@
+
+
+import {AuthService, AUTH_EVENTS} from "./";
+import {User, Credentials} from "./../../models/interfaces";
+
+describe("Auth Service", () => {
+
+    let $httpBackend: ng.IHttpBackendService;
+    let authService: AuthService;
+    let credentials: Credentials;
+    let $rootScope: ng.IRootScopeService;
+    let user: User;
+
+    beforeEach(angular.mock.module("noosferoApp"));
+
+    beforeEach(inject((_$httpBackend_: ng.IHttpBackendService, _$rootScope_: ng.IRootScopeService, _AuthService_: AuthService) => {
+        $httpBackend = _$httpBackend_;
+        authService = _AuthService_;
+        $rootScope = _$rootScope_;
+
+        user = <User>{
+            id: 1,
+            login: "user"
+        };
+    }));
+
+
+    describe("Succesffull login", () => {
+
+        beforeEach(() => {
+            credentials = { username: "user", password: "password" };
+
+            $httpBackend.expectPOST("/api/v1/login", "login=user&password=password").respond(200, { user: user });
+        });
+
+        it("should return loggedUser", (done) => {
+            authService.login(credentials).then((loggedUser) => {
+                expect(loggedUser).toBeDefined();
+                done();
+            });
+            $httpBackend.flush();
+            expect($httpBackend.verifyNoOutstandingRequest());
+        });
+
+
+        it("should emit event loggin successful with user logged data", () => {
+
+            authService.login(credentials);
+
+            let eventEmmited: boolean = false;
+            $rootScope.$on(AUTH_EVENTS.loginSuccess, (event: ng.IAngularEvent, userThroughEvent: User) => {
+                eventEmmited = true;
+                expect(userThroughEvent).toEqual(user)
+            });
+
+            $httpBackend.flush();
+
+            expect(eventEmmited).toBeTruthy(AUTH_EVENTS.loginSuccess + " was not emmited!");
+        });
+
+    });
+
+
+
+
+});
+    
 \ No newline at end of file
@@ -32,7 +32,7 @@ export class AuthService {
         return currentUser;
     }
-    login(credentials: Credentials) {
+    login(credentials: Credentials): ng.IPromise<User> {
         let url = '/api/v1/login';
         let encodedData = 'login=' + credentials.username + '&password=' + credentials.password;
         return this.$http.post(url, encodedData).then(this.loginSuccessCallback.bind(this), this.loginFailedCallback.bind(this));
@@ -1,58 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('noosferoApp')
-    .directive('acmeNavbar', acmeNavbar);
-
-  /** @ngInject */
-  function acmeNavbar() {
-    var directive = {
-      restrict: 'E',
-      templateUrl: 'app/components/navbar/navbar.html',
-      scope: {},
-      controller: NavbarController,
-      controllerAs: 'vm',
-      bindToController: true
-    };
-
-    return directive;
-
-    /** @ngInject */
-    function NavbarController(moment, $modal, AuthService, Session, $scope, $state, AUTH_EVENTS) {
-      var vm = this;
-
-      vm.currentUser = Session.getCurrentUser();
-      vm.modalInstance = null;
-
-      vm.openLogin = function() {
-        vm.modalInstance = $modal.open({
-          templateUrl: 'app/components/auth/login.html',
-          controller: 'AuthController',
-          controllerAs: 'vm',
-          bindToController: true
-        });
-      };
-      vm.logout = function() {
-        AuthService.logout();
-        $state.go($state.current, {}, {reload: true});  //TODO move to auth
-      };
-      $scope.$on(AUTH_EVENTS.loginSuccess, function() {
-        if(vm.modalInstance) {
-          vm.modalInstance.close();
-          vm.modalInstance = null;
-        }
-        $state.go($state.current, {}, {reload: true}); //TODO move to auth
-      });
-      $scope.$on(AUTH_EVENTS.logoutSuccess, function() {
-        vm.currentUser = Session.getCurrentUser();
-      });
-
-      vm.activate = function() {
-        if(!vm.currentUser) vm.openLogin();
-      }
-      vm.activate();
-    }
-  }
-
-})();
 <nav class="navbar navbar-static-top navbar-inverse">
   <div class="container-fluid">
     <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" ng-click="isCollapsed = !isCollapsed">
+      <button type="button" class="navbar-toggle collapsed" (ng-click)="isCollapsed = !isCollapsed">
         <span class="sr-only">Toggle navigation</span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
@@ -17,25 +17,25 @@
       </ul>
       <ul class="nav navbar-nav navbar-right">
-        <li ng-show="!vm.currentUser">
-          <a ng-href="#" ng-click="vm.openLogin()">Login</a>
+        <li ng-show="!ctrl.currentUser">
+          <a ng-href="#" (ng-click)="ctrl.openLogin()">Login</a>
         </li>
-        <li class="dropdown profile-menu" ng-show="vm.currentUser" dropdown>
+        <li class="dropdown profile-menu" ng-show="ctrl.currentUser" dropdown>
           <a href="#" class="dropdown-toggle" aria-expanded="false" dropdown-toggle>
-            <noosfero-profile-image profile="vm.currentUser.person" class="profile-image"></noosfero-profile-image>
-            <span ng-bind="vm.currentUser.person.name"></span> <b class="caret"></b>
+            <noosfero-profile-image profile="ctrl.currentUser.person" class="profile-image"></noosfero-profile-image>
+            <span ng-bind="ctrl.currentUser.person.name"></span> <b class="caret"></b>
           </a>
           <ul class="dropdown-menu" dropdown-menu>
               <li>
-                  <a ui-sref="main.profile.info({profile: vm.currentUser.person.identifier})"><i class="fa fa-fw fa-user"></i> Profile</a>
+                  <a ui-sref="main.profile.info({profile: ctrl.currentUser.person.identifier})"><i class="fa fa-fw fa-user"></i> Profile</a>
               </li>
               <li>
-                  <a target="_self" ui-sref="main.profile.settings({profile: vm.currentUser.person.identifier})"><i class="fa fa-fw fa-gear"></i> Settings</a>
+                  <a target="_self" ui-sref="main.profile.settings({profile: ctrl.currentUser.person.identifier})"><i class="fa fa-fw fa-gear"></i> Settings</a>
               </li>
               <li class="divider"></li>
               <li>
-                  <a href="#" ng-click="vm.logout()"><i class="fa fa-fw fa-power-off"></i> Log Out</a>
+                  <a href="#" (ng-click)="ctrl.logout()"><i class="fa fa-fw fa-power-off"></i> Log Out</a>
               </li>
           </ul>
         </li>
@@ -11,7 +11,7 @@ export class Block {
     @Input() owner: any;
     ngOnInit() {
-        let blockName = this.block.type ? this.block.type.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase() : "default-block";
+        let blockName = (this.block && this.block.type) ? this.block.type.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase() : "default-block";
         this.$element.replaceWith(this.$compile('<noosfero-' + blockName + ' [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-' + blockName + '>')(this.$scope));
     }
@@ -0,0 +1,64 @@
+import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder';
+import {Pipe, Input, provide, Component} from 'ng-forward';
+
+import {LinkListBlock} from './link-list.component';
+
+const tcb = new TestComponentBuilder();
+
+const htmlTemplate: string = '<noosfero-link-list-block [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-link-list-block>';
+
+
+describe("Link List Block Component", () => {
+
+    beforeEach(angular.mock.module("templates"));
+
+    it("receives the block and the owner as inputs", done => {
+
+        // Creating a container component (BlockContainerComponent) to include
+        // the component under test (Block)
+        @Component({ selector: 'test-container-component', template: htmlTemplate, directives: [LinkListBlock] })
+        class BlockContainerComponent {
+            block = { type: 'Block' };
+            owner = { name: 'profile-name' };
+            constructor() {
+            }
+        }
+
+        // uses the TestComponentBuilder instance to initialize the component
+        //.overrideView(LinkListBlock, { template: 'asdasdasd', pipes: [NoosferoTemplate] })
+        tcb.createAsync(BlockContainerComponent).then(fixture => {
+            // and here we can inspect and run the test assertions
+            let myComponent: LinkListBlock = fixture.componentInstance;
+
+            // assure the block object inside the Block matches
+            // the provided through the parent component
+            expect(myComponent.block.type).toEqual("Block");
+            expect(myComponent.owner.name).toEqual("profile-name");
+            done();
+        });
+    });
+
+
+    it("display links stored in block settings", done => {
+
+        @Pipe('noosferoTemplateFilter')
+        class NoosferoTemplateFilter {
+            transform(input: any, changeTo: any) {
+                return input;
+            }
+        }
+
+        @Component({ selector: 'test-container-component', template: htmlTemplate, directives: [LinkListBlock] })
+        class CustomBlockType {
+            block: any = { settings: { links: [{ name: 'link1', address: 'address1' }, { name: 'link2', address: 'address2' }] } };
+            owner: any = { name: 'profile-name' };
+            constructor() {
+            }
+        }
+        tcb.overrideView(LinkListBlock, { templateUrl: "app/components/noosfero-blocks/link-list/link-list.html", pipes: [NoosferoTemplateFilter] }).createAsync(CustomBlockType).then(fixture => {
+            expect(fixture.debugElement.queryAll(".link-list-block a").length).toEqual(2);
+            done();
+        });
+    });
+
+});
@@ -12,7 +12,9 @@ export class LinkListBlock {
     links: any;
     ngOnInit() {
-        this.links = this.block.settings.links;
+        if (this.block && this.block.settings) {
+            this.links = this.block.settings.links;
+        }
     }
 }
@@ -1,20 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('noosferoApp')
-    .component('noosferoMainBlock', {
-      restrict: 'E',
-      templateUrl: 'app/components/noosfero-blocks/main-block/main-block.html',
-      bindings: {
-          block: '<',
-          owner: '<'
-      },
-      controller: MainBlockController
-    });
-
-  /** @ngInject */
-  function MainBlockController() {
-  }
-
-})();
@@ -0,0 +1,40 @@
+import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder';
+import {Input, provide, Component, StateConfig} from 'ng-forward';
+
+import {MainBlock} from './main-block.component';
+import {NoosferoApp} from '../../../index.module';
+
+const tcb = new TestComponentBuilder();
+
+const htmlTemplate: string = '<noosfero-main-block [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-main-block>';
+
+
+describe("Main Block 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 Block will be load on our tests
+    beforeEach(angular.mock.module("templates"));
+
+    it("check if the main block has a tag with ui-view attribute", done => {
+
+        // Creating a container component (BlockContainerComponent) to include
+        // the component under test (Block)
+        @Component({ selector: 'test-container-component', template: htmlTemplate, directives: [MainBlock] })
+        class BlockContainerComponent {
+        }
+
+        // uses the TestComponentBuilder instance to initialize the component
+        tcb.createAsync(BlockContainerComponent).then(fixture => {
+            // and here we can inspect and run the test assertions
+            //let myComponent: MainBlock = fixture.componentInstance;
+
+            // assure the block object inside the Block matches
+            // the provided through the parent component
+            expect(fixture.debugElement.queryAll('[ui-view="mainBlockContent"]').length).toEqual(1)
+            done();
+        });
+    });
+
+});
@@ -0,0 +1,10 @@
+import {Component, Input} from 'ng-forward'
+import {Block} from '../block.component';
+
+@Component({
+    selector: 'noosfero-main-block',
+    templateUrl: 'app/components/noosfero-blocks/main-block/main-block.html'
+})
+export class MainBlock {
+
+}
@@ -45,7 +45,6 @@ NoosferoApp.addController(&quot;AuthController&quot;, AuthController);
 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");
 require("./components/noosfero-blocks/members-block/members-block.component.js");
 require("./components/noosfero-blocks/profile-image/profile-image.component.js");
 require("./components/noosfero-blocks/recent-documents/recent-documents.component.js");
@@ -12,8 +12,12 @@ 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";
+import {MainBlock} from "../components/noosfero-blocks/main-block/main-block.component";
+
+
 @Component({
     selector: 'main-content',
     templateUrl: "app/main/main.html",
@@ -26,7 +30,7 @@ export class MainContent {
 @Component({
     selector: 'main',
     template: '<div ng-view></div>',
-    directives: [NoosferoArticleBlog, ArticleView, Boxes, Block, LinkListBlock, Navbar],
+    directives: [NoosferoArticleBlog, ArticleView, Boxes, Block, LinkListBlock, MainBlock, Navbar],
     providers: [AuthService, Session]
 })
 @StateConfig([
@@ -9,6 +9,8 @@
     "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c",
     "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#dd638012d63e069f2c99d06ef4dcc9616a943ee4",
     "jquery": "github:DefinitelyTyped/DefinitelyTyped/jquery/jquery.d.ts#470954c4f427e0805a2d633636a7c6aa7170def8",
+    "moment": "github:DefinitelyTyped/DefinitelyTyped/moment/moment.d.ts#b090bcf9ba9f756ec8ff53e7707269729172a325",
+    "moment-node": "github:DefinitelyTyped/DefinitelyTyped/moment/moment-node.d.ts#b090bcf9ba9f756ec8ff53e7707269729172a325",
     "ngstorage": "github:DefinitelyTyped/DefinitelyTyped/ngstorage/ngstorage.d.ts#f59279e1f7535149b4e14d2ccf537b2c81cfff75",
     "restangular": "github:DefinitelyTyped/DefinitelyTyped/restangular/restangular.d.ts#f2ae460e1751bb6668d291d4eb9255f047dd0ac5"
   }
	@@ -8,7 +8,7 @@		@@ -8,7 +8,7 @@
8	},	8	},
9	"scripts": {	9	"scripts": {
10	"test": "concurrently \"webpack -w\" \"karma start\"",	10	"test": "concurrently \"webpack -w\" \"karma start\"",
11	- "postinstall": "npm install -g bower && bower install",	11	+ "postinstall": "npm install -g bower && bower install && typings install",
12	"start": "concurrently \"webpack -w\" \"gulp serve\"",	12	"start": "concurrently \"webpack -w\" \"gulp serve\"",
13	"generate-indexes": "ts-node --project ./dev-scripts ./dev-scripts/generate-index-modules.ts"	13	"generate-indexes": "ts-node --project ./dev-scripts ./dev-scripts/generate-index-modules.ts"
14	},	14	},
	@@ -0,0 +1,67 @@		@@ -0,0 +1,67 @@
		1	+
		2	+
		3	+import {AuthService, AUTH_EVENTS} from "./";
		4	+import {User, Credentials} from "./../../models/interfaces";
		5	+
		6	+describe("Auth Service", () => {
		7	+
		8	+ let $httpBackend: ng.IHttpBackendService;
		9	+ let authService: AuthService;
		10	+ let credentials: Credentials;
		11	+ let $rootScope: ng.IRootScopeService;
		12	+ let user: User;
		13	+
		14	+ beforeEach(angular.mock.module("noosferoApp"));
		15	+
		16	+ beforeEach(inject((_$httpBackend_: ng.IHttpBackendService, _$rootScope_: ng.IRootScopeService, _AuthService_: AuthService) => {
		17	+ $httpBackend = _$httpBackend_;
		18	+ authService = _AuthService_;
		19	+ $rootScope = _$rootScope_;
		20	+
		21	+ user = <User>{
		22	+ id: 1,
		23	+ login: "user"
		24	+ };
		25	+ }));
		26	+
		27	+
		28	+ describe("Succesffull login", () => {
		29	+
		30	+ beforeEach(() => {
		31	+ credentials = { username: "user", password: "password" };
		32	+
		33	+ $httpBackend.expectPOST("/api/v1/login", "login=user&password=password").respond(200, { user: user });
		34	+ });
		35	+
		36	+ it("should return loggedUser", (done) => {
		37	+ authService.login(credentials).then((loggedUser) => {
		38	+ expect(loggedUser).toBeDefined();
		39	+ done();
		40	+ });
		41	+ $httpBackend.flush();
		42	+ expect($httpBackend.verifyNoOutstandingRequest());
		43	+ });
		44	+
		45	+
		46	+ it("should emit event loggin successful with user logged data", () => {
		47	+
		48	+ authService.login(credentials);
		49	+
		50	+ let eventEmmited: boolean = false;
		51	+ $rootScope.$on(AUTH_EVENTS.loginSuccess, (event: ng.IAngularEvent, userThroughEvent: User) => {
		52	+ eventEmmited = true;
		53	+ expect(userThroughEvent).toEqual(user)
		54	+ });
		55	+
		56	+ $httpBackend.flush();
		57	+
		58	+ expect(eventEmmited).toBeTruthy(AUTH_EVENTS.loginSuccess + " was not emmited!");
		59	+ });
		60	+
		61	+ });
		62	+
		63	+
		64	+
		65	+
		66	+});
		67	+
0	\ No newline at end of file	68	\ No newline at end of file
	@@ -32,7 +32,7 @@ export class AuthService {		@@ -32,7 +32,7 @@ export class AuthService {
32	return currentUser;	32	return currentUser;
33	}	33	}
34		34
35	- login(credentials: Credentials) {	35	+ login(credentials: Credentials): ng.IPromise<User> {
36	let url = '/api/v1/login';	36	let url = '/api/v1/login';
37	let encodedData = 'login=' + credentials.username + '&password=' + credentials.password;	37	let encodedData = 'login=' + credentials.username + '&password=' + credentials.password;
38	return this.$http.post(url, encodedData).then(this.loginSuccessCallback.bind(this), this.loginFailedCallback.bind(this));	38	return this.$http.post(url, encodedData).then(this.loginSuccessCallback.bind(this), this.loginFailedCallback.bind(this));
	@@ -1,58 +0,0 @@	@@ -1,58 +0,0 @@
1	-(function() {
2	- 'use strict';
3	-
4	- angular
5	- .module('noosferoApp')
6	- .directive('acmeNavbar', acmeNavbar);
7	-
8	- /** @ngInject */
9	- function acmeNavbar() {
10	- var directive = {
11	- restrict: 'E',
12	- templateUrl: 'app/components/navbar/navbar.html',
13	- scope: {},
14	- controller: NavbarController,
15	- controllerAs: 'vm',
16	- bindToController: true
17	- };
18	-
19	- return directive;
20	-
21	- /** @ngInject */
22	- function NavbarController(moment, $modal, AuthService, Session, $scope, $state, AUTH_EVENTS) {
23	- var vm = this;
24	-
25	- vm.currentUser = Session.getCurrentUser();
26	- vm.modalInstance = null;
27	-
28	- vm.openLogin = function() {
29	- vm.modalInstance = $modal.open({
30	- templateUrl: 'app/components/auth/login.html',
31	- controller: 'AuthController',
32	- controllerAs: 'vm',
33	- bindToController: true
34	- });
35	- };
36	- vm.logout = function() {
37	- AuthService.logout();
38	- $state.go($state.current, {}, {reload: true}); //TODO move to auth
39	- };
40	- $scope.$on(AUTH_EVENTS.loginSuccess, function() {
41	- if(vm.modalInstance) {
42	- vm.modalInstance.close();
43	- vm.modalInstance = null;
44	- }
45	- $state.go($state.current, {}, {reload: true}); //TODO move to auth
46	- });
47	- $scope.$on(AUTH_EVENTS.logoutSuccess, function() {
48	- vm.currentUser = Session.getCurrentUser();
49	- });
50	-
51	- vm.activate = function() {
52	- if(!vm.currentUser) vm.openLogin();
53	- }
54	- vm.activate();
55	- }
56	- }
57	-
58	-})();
	@@ -11,7 +11,7 @@ export class Block {		@@ -11,7 +11,7 @@ export class Block {
11	@Input() owner: any;	11	@Input() owner: any;
12		12
13	ngOnInit() {	13	ngOnInit() {
14	- let blockName = this.block.type ? this.block.type.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase() : "default-block";	14	+ let blockName = (this.block && this.block.type) ? this.block.type.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase() : "default-block";
15	this.$element.replaceWith(this.$compile('<noosfero-' + blockName + ' [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-' + blockName + '>')(this.$scope));	15	this.$element.replaceWith(this.$compile('<noosfero-' + blockName + ' [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-' + blockName + '>')(this.$scope));
16	}	16	}
17		17
@@ -0,0 +1,64 @@		@@ -0,0 +1,64 @@
	1	+import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder';
	2	+import {Pipe, Input, provide, Component} from 'ng-forward';
	3	+
	4	+import {LinkListBlock} from './link-list.component';
	5	+
	6	+const tcb = new TestComponentBuilder();
	7	+
	8	+const htmlTemplate: string = '<noosfero-link-list-block [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-link-list-block>';
	9	+
	10	+
	11	+describe("Link List Block Component", () => {
	12	+
	13	+ beforeEach(angular.mock.module("templates"));
	14	+
	15	+ it("receives the block and the owner as inputs", done => {
	16	+
	17	+ // Creating a container component (BlockContainerComponent) to include
	18	+ // the component under test (Block)
	19	+ @Component({ selector: 'test-container-component', template: htmlTemplate, directives: [LinkListBlock] })
	20	+ class BlockContainerComponent {
	21	+ block = { type: 'Block' };
	22	+ owner = { name: 'profile-name' };
	23	+ constructor() {
	24	+ }
	25	+ }
	26	+
	27	+ // uses the TestComponentBuilder instance to initialize the component
	28	+ //.overrideView(LinkListBlock, { template: 'asdasdasd', pipes: [NoosferoTemplate] })
	29	+ tcb.createAsync(BlockContainerComponent).then(fixture => {
	30	+ // and here we can inspect and run the test assertions
	31	+ let myComponent: LinkListBlock = fixture.componentInstance;
	32	+
	33	+ // assure the block object inside the Block matches
	34	+ // the provided through the parent component
	35	+ expect(myComponent.block.type).toEqual("Block");
	36	+ expect(myComponent.owner.name).toEqual("profile-name");
	37	+ done();
	38	+ });
	39	+ });
	40	+
	41	+
	42	+ it("display links stored in block settings", done => {
	43	+
	44	+ @Pipe('noosferoTemplateFilter')
	45	+ class NoosferoTemplateFilter {
	46	+ transform(input: any, changeTo: any) {
	47	+ return input;
	48	+ }
	49	+ }
	50	+
	51	+ @Component({ selector: 'test-container-component', template: htmlTemplate, directives: [LinkListBlock] })
	52	+ class CustomBlockType {
	53	+ block: any = { settings: { links: [{ name: 'link1', address: 'address1' }, { name: 'link2', address: 'address2' }] } };
	54	+ owner: any = { name: 'profile-name' };
	55	+ constructor() {
	56	+ }
	57	+ }
	58	+ tcb.overrideView(LinkListBlock, { templateUrl: "app/components/noosfero-blocks/link-list/link-list.html", pipes: [NoosferoTemplateFilter] }).createAsync(CustomBlockType).then(fixture => {
	59	+ expect(fixture.debugElement.queryAll(".link-list-block a").length).toEqual(2);
	60	+ done();
	61	+ });
	62	+ });
	63	+
	64	+});
	@@ -1,20 +0,0 @@	@@ -1,20 +0,0 @@
1	-(function() {
2	- 'use strict';
3	-
4	- angular
5	- .module('noosferoApp')
6	- .component('noosferoMainBlock', {
7	- restrict: 'E',
8	- templateUrl: 'app/components/noosfero-blocks/main-block/main-block.html',
9	- bindings: {
10	- block: '<',
11	- owner: '<'
12	- },
13	- controller: MainBlockController
14	- });
15	-
16	- /** @ngInject */
17	- function MainBlockController() {
18	- }
19	-
20	-})();
@@ -0,0 +1,40 @@		@@ -0,0 +1,40 @@
	1	+import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder';
	2	+import {Input, provide, Component, StateConfig} from 'ng-forward';
	3	+
	4	+import {MainBlock} from './main-block.component';
	5	+import {NoosferoApp} from '../../../index.module';
	6	+
	7	+const tcb = new TestComponentBuilder();
	8	+
	9	+const htmlTemplate: string = '<noosfero-main-block [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-main-block>';
	10	+
	11	+
	12	+describe("Main Block Component", () => {
	13	+
	14	+ // the karma preprocessor html2js transform the templates html into js files which put
	15	+ // the templates to the templateCache into the module templates
	16	+ // we need to load the module templates here as the template for the
	17	+ // component Block will be load on our tests
	18	+ beforeEach(angular.mock.module("templates"));
	19	+
	20	+ it("check if the main block has a tag with ui-view attribute", done => {
	21	+
	22	+ // Creating a container component (BlockContainerComponent) to include
	23	+ // the component under test (Block)
	24	+ @Component({ selector: 'test-container-component', template: htmlTemplate, directives: [MainBlock] })
	25	+ class BlockContainerComponent {
	26	+ }
	27	+
	28	+ // uses the TestComponentBuilder instance to initialize the component
	29	+ tcb.createAsync(BlockContainerComponent).then(fixture => {
	30	+ // and here we can inspect and run the test assertions
	31	+ //let myComponent: MainBlock = fixture.componentInstance;
	32	+
	33	+ // assure the block object inside the Block matches
	34	+ // the provided through the parent component
	35	+ expect(fixture.debugElement.queryAll('[ui-view="mainBlockContent"]').length).toEqual(1)
	36	+ done();
	37	+ });
	38	+ });
	39	+
	40	+});
@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
	1	+import {Component, Input} from 'ng-forward'
	2	+import {Block} from '../block.component';
	3	+
	4	+@Component({
	5	+ selector: 'noosfero-main-block',
	6	+ templateUrl: 'app/components/noosfero-blocks/main-block/main-block.html'
	7	+})
	8	+export class MainBlock {
	9	+
	10	+}
	@@ -45,7 +45,6 @@ NoosferoApp.addController("AuthController", AuthController);		@@ -45,7 +45,6 @@ NoosferoApp.addController("AuthController", AuthController);
45		45
46	require("./components/noosfero-activities/activities.component.js");	46	require("./components/noosfero-activities/activities.component.js");
47	require("./components/noosfero-activities/activity/activity.component.js");	47	require("./components/noosfero-activities/activity/activity.component.js");
48	-require("./components/noosfero-blocks/main-block/main-block.component.js");
49	require("./components/noosfero-blocks/members-block/members-block.component.js");	48	require("./components/noosfero-blocks/members-block/members-block.component.js");
50	require("./components/noosfero-blocks/profile-image/profile-image.component.js");	49	require("./components/noosfero-blocks/profile-image/profile-image.component.js");
51	require("./components/noosfero-blocks/recent-documents/recent-documents.component.js");	50	require("./components/noosfero-blocks/recent-documents/recent-documents.component.js");