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

ABNER SILVA DE OLIVEIRA
2 parents babe9d57 4aa998ad
Showing 7 changed files with 26 additions and 23 deletions Show diff stats
.gitignore
src/app/components/noosfero-blocks/link-list/link-list.component.spec.ts
src/app/components/noosfero-blocks/link-list/link-list.html
src/app/components/noosfero-blocks/members-block/members-block.component.spec.ts
src/app/components/noosfero-blocks/recent-documents/recent-documents.component.spec.ts
src/app/components/noosfero/noosfero-template.filter.js
src/spec/helpers.ts
@@ -6,6 +6,7 @@ coverage/
 .tmp/
 dist/
 src/noosfero.js*
-src/commons.js
-src/noosfero-specs.js
+src/commons.js*
+src/noosfero-specs.js*
 typings
+npm-debug.log
 import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder';
 import {Pipe, Input, provide, Component} from 'ng-forward';
+import {provideFilters} from '../../../../spec/helpers';
 import {LinkListBlock} from './link-list.component';
@@ -41,21 +42,17 @@ describe(&quot;Link List Block Component&quot;, () =&gt; {
     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] })
+        @Component({
+            selector: 'test-container-component',
+            template: htmlTemplate,
+            directives: [LinkListBlock],
+            providers: provideFilters("noosferoTemplateFilter")
+        })
         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 => {
+        tcb.createAsync(CustomBlockType).then(fixture => {
             expect(fixture.debugElement.queryAll(".link-list-block a").length).toEqual(2);
             done();
         });
 <div class="link-list-block">
   <div ng-repeat="link in ctrl.links">
-    <a ng-href="{{link.address | noosferoTemplateFilter:{profile: ctrl.owner.identifier} }}">
+    <a ng-href="{{link.address | noosferoTemplate:{profile: ctrl.owner.identifier} }}">
       <i class="fa fa-fw icon-{{link.icon}}"></i> <span>{{link.name}}</span>
     </a>
   </div>
@@ -34,15 +34,14 @@ describe(&quot;Members Block Component&quot;, () =&gt; {
     it("get members of the block owner", done => {
         tcb.createAsync(BlockContainerComponent).then(fixture => {
-            let recentDocumentsBlock: MembersBlock = fixture.debugElement.componentViewChildren[0].componentInstance;
-            expect(recentDocumentsBlock.members).toEqual([{ identifier: "person1" }]);
+            let block: MembersBlock = fixture.debugElement.componentViewChildren[0].componentInstance;
+            expect(block.members).toEqual([{ identifier: "person1" }]);
             done();
         });
     });
     it("render the profile image for each member", done => {
         tcb.createAsync(BlockContainerComponent).then(fixture => {
-            let recentDocumentsBlock: MembersBlock = fixture.debugElement.componentViewChildren[0].componentInstance;
             fixture.debugElement.getLocal("$rootScope").$apply();
             expect(fixture.debugElement.queryAll("noosfero-profile-image").length).toEqual(1);
             done();
 import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder';
 import {Provider, Input, provide, Component} from 'ng-forward';
-
+import {provideFilters} from '../../../../spec/helpers';
 import {RecentDocumentsBlock} from './recent-documents.component';
 const htmlTemplate: string = '<noosfero-recent-documents-block [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-recent-documents-block>';
@@ -13,8 +13,6 @@ describe(&quot;Recent Documents Block Component&quot;, () =&gt; {
     let state = jasmine.createSpyObj("state", ["go"]);
     let providers = [
-        new Provider('truncateFilter', { useValue: () => { } }),
-        new Provider('stripTagsFilter', { useValue: () => { } }),
         new Provider('$state', { useValue: state }),
         new Provider('ArticleService', {
             useValue: {
@@ -23,7 +21,8 @@ describe(&quot;Recent Documents Block Component&quot;, () =&gt; {
                 }
             }
         }),
-    ];
+    ].concat(provideFilters("truncateFilter", "stripTagsFilter"));
+
     @Component({ selector: 'test-container-component', template: htmlTemplate, directives: [RecentDocumentsBlock], providers: providers })
     class BlockContainerComponent {
         block = { type: 'Block', settings: {} };
@@ -2,7 +2,7 @@
   'use strict';
   angular
     .module("noosferoApp")
-    .filter("noosferoTemplateFilter", function() {
+    .filter("noosferoTemplate", function() {
       return function(text, options) {
         for(var option in options) {
           text = text.replace('{'+option+'}', options[option]);
 import {ngClass, TestComponentBuilder, ComponentFixture} from 'ng-forward/cjs/testing/test-component-builder';
 import {quickFixture} from 'ng-forward/cjs/tests/utils';
-import {Input, provide, Component} from 'ng-forward';
+import {Provider, Input, provide, Component} from 'ng-forward';
@@ -29,3 +29,10 @@ export function createComponentFromClass(yourClass: ngClass) {
     return tcb.createAsync(yourClass);
 }
+export function provideFilters(...filters: string[]) {
+    let providers: Provider[] = [];
+    for (var filter of filters) {
+        providers.push(new Provider(filter, { useValue: () => { } }));
+    }
+    return providers;
+}
1	<div class="link-list-block">	1	<div class="link-list-block">
2	<div ng-repeat="link in ctrl.links">	2	<div ng-repeat="link in ctrl.links">
3	- <a ng-href="{{link.address \| noosferoTemplateFilter:{profile: ctrl.owner.identifier} }}">	3	+ <a ng-href="{{link.address \| noosferoTemplate:{profile: ctrl.owner.identifier} }}">
4	<i class="fa fa-fw icon-{{link.icon}}"></i> <span>{{link.name}}</span>	4	<i class="fa fa-fw icon-{{link.icon}}"></i> <span>{{link.name}}</span>
5	</a>	5	</a>
6	</div>	6	</div>
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2	'use strict';	2	'use strict';
3	angular	3	angular
4	.module("noosferoApp")	4	.module("noosferoApp")
5	- .filter("noosferoTemplateFilter", function() {	5	+ .filter("noosferoTemplate", function() {
6	return function(text, options) {	6	return function(text, options) {
7	for(var option in options) {	7	for(var option in options) {
8	text = text.replace('{'+option+'}', options[option]);	8	text = text.replace('{'+option+'}', options[option]);