fixed webpack errors and warnings

Ábner Oliveira
1 parent 41a1626d
Showing 28 changed files with 136 additions and 93 deletions Show diff stats
dev-scripts/fix-jqlite.ts
package.json
src/app/components/auth/auth_service.spec.ts
src/app/components/language-selector/language-selector.component.spec.ts
src/app/components/language-selector/language-selector.component.ts
src/app/components/navbar/navbar.spec.ts
src/app/components/noosfero-articles/blog/blog.component.spec.ts
src/app/components/noosfero-articles/blog/blog.component.ts
src/app/components/noosfero-blocks/link-list/link-list.component.spec.ts
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/components/noosfero-blocks/profile-image-block/profile-image-block.component.spec.ts
src/app/components/noosfero-blocks/profile-image-block/profile-image-block.component.ts
src/app/components/noosfero-blocks/recent-documents/recent-documents.component.spec.ts
src/app/components/noosfero-blocks/recent-documents/recent-documents.component.ts
src/app/components/noosfero-boxes/boxes.component.spec.ts
src/app/components/noosfero/noosfero-template.filter.ts
src/app/components/noosfero/profile-image/profile-image.component.spec.ts
src/app/components/noosfero/profile-image/profile-image.component.ts
src/app/content-viewer/content-viewer.component.spec.ts
@@ -0,0 +1,13 @@
+let replace = require("replace");
+
+import * as path from "path";
+
+let wrong_jqlite_d_ts_file = path.join(__dirname, "../node_modules/ng-forward/cjs/util/jqlite-extensions.d.ts");
+
+replace({
+    regex: /import JQuery from \".\/\";/,
+    replacement: "",
+    paths: [wrong_jqlite_d_ts_file],
+    sillent: false
+});
+
@@ -4,20 +4,22 @@
   "dependencies": {
     "angular": "^1.5.0",
     "angular-mock": "^1.0.0",
-    "moment": "^2.11.2"
+    "moment": "^2.11.2",
+    "ng-forward": "0.0.1-alpha.12"
   },
   "scripts": {
     "build": "webpack; gulp build",
     "webpack": "webpack",
-    "karma": "karma",
+    "karma": "concurrently \"webpack -w\" \"karma start\"",
     "coverage": "karma start --single-run; npm run remap-coverage",
     "remap-coverage": "ts-node --project ./dev-scripts ./dev-scripts/remapCoverage.ts",
     "test-single": "karma start --single-run",
     "test-and-coverage": "karma start & npm run remap-coverage",
     "test": "webpack -w --test",
-    "postinstall": "npm install -g bower && bower install && typings install && cd dev-scripts && typings install",
+    "postinstall": "npm install -g bower; bower install; typings install; npm run fix-jqlite; cd dev-scripts; typings install",
     "start": "concurrently \"webpack -w\" \"gulp serve\"",
-    "generate-indexes": "ts-node --project ./dev-scripts ./dev-scripts/generate-index-modules.ts"
+    "generate-indexes": "ts-node --project ./dev-scripts ./dev-scripts/generate-index-modules.ts",
+    "fix-jqlite": "ts-node --project ./dev-scripts dev-scripts/fix-jqlite.ts"
   },
   "devDependencies": {
     "browser-sync": "~2.9.11",
@@ -55,7 +55,7 @@ describe(&quot;Services&quot;, () =&gt; {
                 let eventEmmited: boolean = false;
                 $rootScope.$on(AUTH_EVENTS.loginSuccess, (event: ng.IAngularEvent, userThroughEvent: User) => {
                     eventEmmited = true;
-                    expect(userThroughEvent).toEqual(user)
+                    expect(userThroughEvent).toEqual(user);
                 });
                 $httpBackend.flush();
@@ -30,7 +30,7 @@ describe(&quot;Components&quot;, () =&gt; {
                     })
                 ].concat(helpers.provideFilters("translateFilter"))
             });
-        }
+        };
         it("set available languages when change language", (done) => {
             let component: LanguageSelector = new LanguageSelector(
@@ -41,7 +41,7 @@ export class LanguageSelector {
     private changeMomentLocale(language: string) {
         let localePromise = Promise.resolve();
-        if (language != "en") {
+        if (language !== "en") {
             localePromise = this.angularLoad.loadScript(`/bower_components/moment/locale/${language}.js`);
         }
         localePromise.then(() => {
@@ -88,7 +88,7 @@ describe(&quot;Components&quot;, () =&gt; {
                 directives: [Navbar],
                 template: '<acme-navbar></acme-navbar>'
             });
-        }
+        };
         it('should get the loggedIn user', (done: Function) => {
@@ -73,14 +73,14 @@ describe(&quot;Blog Component&quot;, () =&gt; {
         // 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")
+        angular.mock.module("templates");
         providers((provide: any) => {
             return <any>[
                 provide('ArticleService', {
                     useValue: articleService
                 })
-            ]
+            ];
         });
     });
@@ -13,7 +13,7 @@ export class ArticleBlog {
     @Input() article: noosfero.Article;
     @Input() profile: Profile;
-    private posts: any[];
+    private posts: noosfero.Article[];
     private perPage: number = 3;
     private currentPage: number;
     private totalPosts: number = 0;
@@ -33,9 +33,9 @@ export class ArticleBlog {
         this.articleService
             .getChildren(this.article, filters)
-            .then((result: noosfero.RestResult<noosfero.Article>) => {
+            .then((result: noosfero.RestResult<noosfero.Article[]>) => {
                 this.totalPosts = <number>result.headers("total");
-                this.posts = <noosfero.Article[]> result.data;
+                this.posts = result.data;
             });
     }
@@ -28,7 +28,7 @@ describe(&quot;Components&quot;, () =&gt; {
             }
             // uses the TestComponentBuilder instance to initialize the component
-            //.overrideView(LinkListBlock, { template: 'asdasdasd', pipes: [NoosferoTemplate] })
+            // .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;
@@ -28,14 +28,13 @@ describe(&quot;Components&quot;, () =&gt; {
             // 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;
+                // 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)
+                expect(fixture.debugElement.queryAll('[ui-view="mainBlockContent"]').length).toEqual(1);
                 done();
             });
         });
-        
     });
 });
 \ No newline at end of file
-import {Component, Input} from 'ng-forward'
+import {Component, Input} from 'ng-forward';
 import {Block} from '../block.component';
 @Component({
@@ -30,14 +30,14 @@ describe(&quot;Components&quot;, () =&gt; {
         it("show image if present", () => {
             helpers.tcb.createAsync(BlockContainerComponent).then(fixture => {
-                var elProfile = fixture.debugElement.componentViewChildren[0];
+                let elProfile = fixture.debugElement.componentViewChildren[0];
                 expect(elProfile.query('div.profile-image-block').length).toEqual(1);
             });
         });
         it("has link to the profile", () => {
             helpers.tcb.createAsync(BlockContainerComponent).then(fixture => {
-                var elProfile = fixture.debugElement.componentViewChildren[0];
+                let elProfile = fixture.debugElement.componentViewChildren[0];
                 expect(elProfile.query('a.settings-link').length).toEqual(1);
             });
         });
@@ -10,5 +10,5 @@ export class ProfileImageBlock {
     @Input() block: any;
     @Input() owner: any;
-    
+
 }
@@ -10,30 +10,42 @@ const tcb = new TestComponentBuilder();
 describe("Components", () => {
     describe("Recent Documents Block Component", () => {
+        let settingsObj = {};
+        let mockedArticleService = {
+            getByProfile: (profile: noosfero.Profile, filters: any): any => {
+                return Promise.resolve({ data: [{ name: "article1" }], headers: (name: string) => { return name; } });
+            }
+        };
+        let profile = { name: 'profile-name' };
         beforeEach(angular.mock.module("templates"));
         let state = jasmine.createSpyObj("state", ["go"]);
-        let providers = [
-            new Provider('$state', { useValue: state }),
-            new Provider('ArticleService', {
-                useValue: {
-                    getByProfile: (profileId: number, filters: any): any => {
-                        return Promise.resolve({ data: [{ name: "article1" }] , headers: (name: string) => {return name;}});
-                    }
+
+
+        function getProviders() {
+            return [
+                new Provider('$state', { useValue: state }),
+                new Provider('ArticleService', {
+                    useValue: mockedArticleService
+                }),
+            ].concat(provideFilters("truncateFilter", "stripTagsFilter"));
+        }
+        let componentClass: any = null;
+
+        function getComponent() {
+            @Component({ selector: 'test-container-component', template: htmlTemplate, directives: [RecentDocumentsBlock], providers: getProviders() })
+            class BlockContainerComponent {
+                block = { type: 'Block', settings: settingsObj };
+                owner = profile;
+                constructor() {
                 }
-            }),
-        ].concat(provideFilters("truncateFilter", "stripTagsFilter"));
-
-        @Component({ selector: 'test-container-component', template: htmlTemplate, directives: [RecentDocumentsBlock], providers: providers })
-        class BlockContainerComponent {
-            block = { type: 'Block', settings: {} };
-            owner = { name: 'profile-name' };
-            constructor() {
             }
+            return BlockContainerComponent;
         }
+
         it("get recent documents from the article service", done => {
-            tcb.createAsync(BlockContainerComponent).then(fixture => {
+            tcb.createAsync(getComponent()).then(fixture => {
                 let recentDocumentsBlock: RecentDocumentsBlock = fixture.debugElement.componentViewChildren[0].componentInstance;
                 expect(recentDocumentsBlock.documents).toEqual([{ name: "article1" }]);
                 done();
@@ -41,7 +53,7 @@ describe(&quot;Components&quot;, () =&gt; {
         });
         it("go to article page when open a document", done => {
-            tcb.createAsync(BlockContainerComponent).then(fixture => {
+            tcb.createAsync(getComponent()).then(fixture => {
                 let recentDocumentsBlock: RecentDocumentsBlock = fixture.debugElement.componentViewChildren[0].componentInstance;
                 recentDocumentsBlock.openDocument({ path: "path", profile: { identifier: "identifier" } });
                 expect(state.go).toHaveBeenCalledWith("main.profile.page", { page: "path", profile: "identifier" });
@@ -49,5 +61,20 @@ describe(&quot;Components&quot;, () =&gt; {
             });
         });
+        it("it uses default limit 5 if not defined on block", done => {
+            settingsObj = null;
+            mockedArticleService = jasmine.createSpyObj("mockedArticleService", ["getByProfile"]);
+            (<any>mockedArticleService).mocked = true;
+            let thenMocked = jasmine.createSpy("then");
+            mockedArticleService.getByProfile = jasmine.createSpy("getByProfile").and.returnValue({then: thenMocked});
+            let getByProfileFunct = mockedArticleService.getByProfile;
+            tcb.createAsync(getComponent()).then(fixture => {
+                let recentDocumentsBlock: RecentDocumentsBlock = fixture.debugElement.componentViewChildren[0].componentInstance;
+                recentDocumentsBlock.openDocument({ path: "path", profile: { identifier: "identifier" } });
+                expect(getByProfileFunct).toHaveBeenCalledWith(profile, { content_type: 'TinyMceArticle', per_page: 5 });
+                done();
+            });
+        });
+
     });
 });
 \ No newline at end of file
@@ -23,12 +23,12 @@ export class RecentDocumentsBlock {
         this.profile = this.owner;
         this.documents = [];
-        let limit = (this.block && this.block.settings) ? this.block.settings.limit : null || 5;
+        let limit = ((this.block && this.block.settings) ? this.block.settings.limit : null) || 5;
         // FIXME get all text articles
         // FIXME make the getByProfile a generic method where we tell the type passing a class TinyMceArticle
         //       and the promise should be of type TinyMceArticle[], per example
         this.articleService.getByProfile(this.profile, { content_type: 'TinyMceArticle', per_page: limit })
-        .then((result: noosfero.RestResult<noosfero.Article>) => {
+        .then((result: noosfero.RestResult<noosfero.Article[]>) => {
             this.documents = <noosfero.Article[]>result.data;
             this.documentsLoaded = true;
         });
@@ -19,8 +19,8 @@ const htmlTemplate: string = &#39;&lt;noosfero-boxes [boxes]=&quot;ctrl.boxes&quot; [owner]=&quot;ctrl
 describe("Boxes Component", () => {
     beforeEach(() => {
-        angular.mock.module("templates")
-    })
+        angular.mock.module("templates");
+    });
     @Component({
         selector: 'test-container-component',
@@ -43,8 +43,7 @@ describe(&quot;Boxes Component&quot;, () =&gt; {
     it("renders boxes into a container", (done: Function) => {
         createComponentFromClass(BoxesContainerComponent).then((fixture) => {
-
-            var boxesHtml = fixture.debugElement;
+            let boxesHtml = fixture.debugElement;
             expect(boxesHtml.query('div.col-md-7').length).toEqual(1);
             expect(boxesHtml.query('div.col-md-2-5').length).toEqual(1);
@@ -4,7 +4,7 @@ import {Pipe} from &quot;ng-forward&quot;;
 export class NoosferoTemplate {
     transform(text: string, options: any) {
-        for (var option in options) {
+        for (let option in options) {
             text = text.replace('{' + option + '}', options[option]);
         }
         return text;
@@ -4,42 +4,42 @@ import {Pipe, Input, provide, Component} from &#39;ng-forward&#39;;
 import * as helpers from "./../../../../spec/helpers";
-import {ProfileImage} from "./profile-image.component"
+import {ProfileImage} from "./profile-image.component";
 const tcb = new TestComponentBuilder();
 describe("Components", () => {
-        
+
     describe("Profile Image Component", () => {
         beforeEach(angular.mock.module("templates"));
-        
+
         it("show community users image if profile is not Person", done => {
             helpers.tcb.createAsync(ProfileImage).then(fixture => {
-                let profileImageComponent : ProfileImage = fixture.componentInstance
-                let profile = { id: 1, identifier: "myprofile", type: "Community" }
-                profileImageComponent.profile = profile
+                let profileImageComponent: ProfileImage = fixture.componentInstance;
+                let profile = { id: 1, identifier: "myprofile", type: "Community" };
+                profileImageComponent.profile = profile;
                 profileImageComponent.ngOnInit();
                 // Check the attribute
                 expect(profileImageComponent.defaultIcon).toBe("fa-users", "The default icon should be community users");
-                //var elProfile = fixture.debugElement.componentViewChildren[0];
-                //expect(elProfile.query('div.profile-image-block').length).toEqual(1);
+                // var elProfile = fixture.debugElement.componentViewChildren[0];
+                // expect(elProfile.query('div.profile-image-block').length).toEqual(1);
                 done();
             });
         });
-        
+
         it("show Person image if profile is Person", done => {
             tcb.createAsync(ProfileImage).then(fixture => {
-                let profileImageComponent : ProfileImage = fixture.componentInstance
-                let profile = { id: 1, identifier: "myprofile", type: "Person" }
-                profileImageComponent.profile = profile
+                let profileImageComponent: ProfileImage = fixture.componentInstance;
+                let profile = { id: 1, identifier: "myprofile", type: "Person" };
+                profileImageComponent.profile = profile;
                 profileImageComponent.ngOnInit();
                 // Check the attribute
                 expect(profileImageComponent.defaultIcon).toEqual("fa-user", "The default icon should be person user");
                 done();
             });
         });
-                        
+
     });
 });
 \ No newline at end of file
@@ -9,7 +9,7 @@ export class ProfileImage {
     @Input() profile: Profile;
     defaultIcon: string;
-    
+
     ngOnInit() {
         this.defaultIcon = 'fa-users';
         if (this.profile && this.profile.type === 'Person') {
@@ -14,7 +14,7 @@ describe(&#39;Content Viewer Component&#39;, () =&gt; {
     let stateParamsService: any;
-    //loading the templates
+    // loading the templates
     beforeEach(() => {
         angular.mock.module("templates");
@@ -32,7 +32,7 @@ describe(&#39;Content Viewer Component&#39;, () =&gt; {
                 provide('$stateParams', {
                     useValue: stateParamsService
                 })
-            ]
+            ];
         });
     });
@@ -51,7 +51,7 @@ describe(&#39;Content Viewer Component&#39;, () =&gt; {
             expect(fixture.debugElement.query('content-viewer').length).toEqual(1);
             done();
-        })
+        });
     });
     it('check if article was loaded', (done: Function) => {
@@ -69,7 +69,7 @@ describe(&#39;Content Viewer Component&#39;, () =&gt; {
             return helpers.mocks.promiseResultTemplate(profile);
         };
-        helpers.mocks.articleService.getByProfile = (id: number, params: any) => {
+        helpers.mocks.articleService.getOneByProfile = (id: number, params: any) => {
             return helpers.mocks.promiseResultTemplate({
                 data:  article
             });
@@ -30,7 +30,7 @@ export class ContentViewer {
     activate() {
        this.profileService.getCurrentProfile().then((profile: noosfero.Profile) => {
             this.profile = profile;
-            return this.articleService.getByProfile(<any>this.profile, { path: this.$stateParams["page"] });
+            return this.articleService.getOneByProfile(<any>this.profile, { path: this.$stateParams["page"] });
         }).then((result: noosfero.RestResult<noosfero.Article>) => {
             this.article = <noosfero.Article>result.data;
         });
@@ -36,12 +36,17 @@ export class ArticleService extends RestangularService&lt;noosfero.Article&gt; {
         return rootElement.one(path, id).get<C>(queryParams, headers);
     }
-    getByProfile<T>(profile: noosfero.Profile, params?: any): ng.IPromise<noosfero.RestResult<noosfero.Article>> {
+    getByProfile<T>(profile: noosfero.Profile, params?: any): ng.IPromise<noosfero.RestResult<noosfero.Article[]>> {
         let profileElement = this.profileService.get(<number>profile.id);
         return this.list(profileElement, params);
     }
-    getChildren<T>(article: noosfero.Article, params?: any): ng.IPromise<noosfero.RestResult<noosfero.Article>> {
+    getOneByProfile<T>(profile: noosfero.Profile, params?: any): ng.IPromise<noosfero.RestResult<noosfero.Article>> {
+        let profileElement = this.profileService.get(<number>profile.id);
+        return this.get(profile.id, params);
+    }
+
+    getChildren<T>(article: noosfero.Article, params?: any): ng.IPromise<noosfero.RestResult<noosfero.Article[]>> {
         return this.listSubElements(article, "children", params);
     }
@@ -19,7 +19,7 @@ describe(&quot;Restangular Service - base Class&quot;, () =&gt; {
             return {
                 singular: "object",
                 plural: "objects"
-            }
+            };
         }
         public getResourcePath() {
@@ -32,7 +32,7 @@ describe(&quot;Restangular Service - base Class&quot;, () =&gt; {
             return {
                 singular: "rootObject",
                 plural: "rootObjects"
-            }
+            };
         }
         public getResourcePath() {
@@ -59,7 +59,7 @@ describe(&quot;Restangular Service - base Class&quot;, () =&gt; {
     it("list() calls GET /objects", (done) => {
         $httpBackend.expectGET("/api/v1/objects").respond(200, { objects: [{ id: 1 }, { id: 2 }] });
-        objectRestService.list().then((result: noosfero.RestResult<ObjectModel>) => {
+        objectRestService.list().then((result: noosfero.RestResult<ObjectModel[]>) => {
             expect(result.data).toBeDefined();
             expect((<ObjectModel[]>result.data).length).toEqual(2);
             done();
@@ -75,7 +75,7 @@ describe(&quot;Restangular Service - base Class&quot;, () =&gt; {
         $httpBackend.expectGET("/api/v1/rootObjects/1/objects").respond(200, { objects: [{ id: 1 }, { id: 2 }] });
         let rootObj: RootObjectModel = rootObjectRestService.getElement(1);
-        objectRestService.list(rootObj).then((result: noosfero.RestResult<ObjectModel>) => {
+        objectRestService.list(rootObj).then((result: noosfero.RestResult<ObjectModel[]>) => {
             expect(result.data).toBeDefined();
             expect((<ObjectModel[]>result.data).length).toEqual(2);
             done();
@@ -104,8 +104,8 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
      * @param {number} id (description)
      * @returns {ng.IPromise<T>} Returns a Promise to the Generic Type 
      */
-    public list(rootElement?: restangular.IElement, queryParams?: any, headers?: any): ng.IPromise<noosfero.RestResult<T>> {
-        let deferred = this.$q.defer<noosfero.RestResult<T>>();
+    public list(rootElement?: restangular.IElement, queryParams?: any, headers?: any): ng.IPromise<noosfero.RestResult<T[]>> {
+        let deferred = this.$q.defer<noosfero.RestResult<T[]>>();
         let restRequest: ng.IPromise<any>;
@@ -133,7 +133,7 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
         restRequest = obj.all(subElement).get(queryParams, headers);
         restRequest.then(this.getHandleSuccessFunction(deferred))
             .catch(this.getHandleErrorFunction(deferred));
-        return deferred.promise;;
+        return deferred.promise;
     }
     /**
@@ -146,9 +146,9 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
         if (rootElement) {
-            restangularObj = rootElement.one(this.getResourcePath(), <string>obj.id);
+            restangularObj = rootElement.one(this.getResourcePath(), obj.id);
         } else {
-            restangularObj = this.restangularService.one(this.getResourcePath(), <string>obj.id);
+            restangularObj = this.restangularService.one(this.getResourcePath(), obj.id);
         }
         let deferred = this.$q.defer<noosfero.RestResult<T>>();
@@ -176,9 +176,9 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
         let restangularObj: restangular.IElement;
         if (rootElement) {
-            restangularObj = rootElement.one(this.getResourcePath(), <string>obj.id);
+            restangularObj = rootElement.one(this.getResourcePath(), obj.id);
         } else {
-            restangularObj = this.restangularService.one(this.getResourcePath(), <string>obj.id);
+            restangularObj = this.restangularService.one(this.getResourcePath(), obj.id);
         }
         restRequest = restangularObj.put(queryParams, headers);
@@ -235,7 +235,6 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
                 self.$log.debug("Request successfull executed", response.data, self, response);
             }
             deferred.resolve(<any>this.extractData(response));
-            //deferred.resolve(this.buildResult(response));
         };
         return successFunction;
     }
@@ -1,12 +0,0 @@
-
-namespace noosfero {
-    export interface ArticlesResult {
-        articles: Article[];
-        headers: Function;
-    }
-
-    export interface ArticleResult {
-        article: Article;
-        headers: Function;
-    }
-}
 \ No newline at end of file
 namespace noosfero {
     export interface RestModel extends restangular.IElement {
-        id: number | string;
+        id: number;
     }
 }
 \ No newline at end of file
 namespace noosfero {
     export interface RestResult<T> {
-        data: T | T[];
+        data: T;
         headers: Function;
     }
 }
 \ No newline at end of file
@@ -50,6 +50,17 @@ export var mocks = {
                 }
             };
         },
+        getOneByProfile: (profileId: number, params?: any) => {
+            return {
+                then: (func?: Function) => {
+                    if (func) func({
+                        data: {
+                            article: null
+                        }
+                    });
+                }
+            };
+        },
         getChildren: (articleId: number, params?: any) => {
             return {
                 then: (func?: Function) => { if (func) func(); }
@@ -73,7 +84,7 @@ export var mocks = {
         use: (lang?: string) => {
             return lang ? Promise.resolve(lang) : "en";
         },
-        instant: (text: string) => { return text }
+        instant: (text: string) => { return text; }
     },
     tmhDynamicLocale: {
         get: () => { },
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+let replace = require("replace");
	2	+
	3	+import * as path from "path";
	4	+
	5	+let wrong_jqlite_d_ts_file = path.join(__dirname, "../node_modules/ng-forward/cjs/util/jqlite-extensions.d.ts");
	6	+
	7	+replace({
	8	+ regex: /import JQuery from \".\/\";/,
	9	+ replacement: "",
	10	+ paths: [wrong_jqlite_d_ts_file],
	11	+ sillent: false
	12	+});
	13	+
	@@ -55,7 +55,7 @@ describe("Services", () => {		@@ -55,7 +55,7 @@ describe("Services", () => {
55	let eventEmmited: boolean = false;	55	let eventEmmited: boolean = false;
56	$rootScope.$on(AUTH_EVENTS.loginSuccess, (event: ng.IAngularEvent, userThroughEvent: User) => {	56	$rootScope.$on(AUTH_EVENTS.loginSuccess, (event: ng.IAngularEvent, userThroughEvent: User) => {
57	eventEmmited = true;	57	eventEmmited = true;
58	- expect(userThroughEvent).toEqual(user)	58	+ expect(userThroughEvent).toEqual(user);
59	});	59	});
60		60
61	$httpBackend.flush();	61	$httpBackend.flush();
	@@ -30,7 +30,7 @@ describe("Components", () => {		@@ -30,7 +30,7 @@ describe("Components", () => {
30	})	30	})
31	].concat(helpers.provideFilters("translateFilter"))	31	].concat(helpers.provideFilters("translateFilter"))
32	});	32	});
33	- }	33	+ };
34		34
35	it("set available languages when change language", (done) => {	35	it("set available languages when change language", (done) => {
36	let component: LanguageSelector = new LanguageSelector(	36	let component: LanguageSelector = new LanguageSelector(
	@@ -41,7 +41,7 @@ export class LanguageSelector {		@@ -41,7 +41,7 @@ export class LanguageSelector {
41		41
42	private changeMomentLocale(language: string) {	42	private changeMomentLocale(language: string) {
43	let localePromise = Promise.resolve();	43	let localePromise = Promise.resolve();
44	- if (language != "en") {	44	+ if (language !== "en") {
45	localePromise = this.angularLoad.loadScript(`/bower_components/moment/locale/${language}.js`);	45	localePromise = this.angularLoad.loadScript(`/bower_components/moment/locale/${language}.js`);
46	}	46	}
47	localePromise.then(() => {	47	localePromise.then(() => {
	@@ -88,7 +88,7 @@ describe("Components", () => {		@@ -88,7 +88,7 @@ describe("Components", () => {
88	directives: [Navbar],	88	directives: [Navbar],
89	template: '<acme-navbar></acme-navbar>'	89	template: '<acme-navbar></acme-navbar>'
90	});	90	});
91	- }	91	+ };
92		92
93		93
94	it('should get the loggedIn user', (done: Function) => {	94	it('should get the loggedIn user', (done: Function) => {
	@@ -73,14 +73,14 @@ describe("Blog Component", () => {		@@ -73,14 +73,14 @@ describe("Blog Component", () => {
73	// the templates to the templateCache into the module templates	73	// the templates to the templateCache into the module templates
74	// we need to load the module templates here as the template for the	74	// we need to load the module templates here as the template for the
75	// component Noosfero ArtileView will be load on our tests	75	// component Noosfero ArtileView will be load on our tests
76	- angular.mock.module("templates")	76	+ angular.mock.module("templates");
77		77
78	providers((provide: any) => {	78	providers((provide: any) => {
79	return <any>[	79	return <any>[
80	provide('ArticleService', {	80	provide('ArticleService', {
81	useValue: articleService	81	useValue: articleService
82	})	82	})
83	- ]	83	+ ];
84	});	84	});
85	});	85	});
86		86
	@@ -13,7 +13,7 @@ export class ArticleBlog {		@@ -13,7 +13,7 @@ export class ArticleBlog {
13	@Input() article: noosfero.Article;	13	@Input() article: noosfero.Article;
14	@Input() profile: Profile;	14	@Input() profile: Profile;
15		15
16	- private posts: any[];	16	+ private posts: noosfero.Article[];
17	private perPage: number = 3;	17	private perPage: number = 3;
18	private currentPage: number;	18	private currentPage: number;
19	private totalPosts: number = 0;	19	private totalPosts: number = 0;
	@@ -33,9 +33,9 @@ export class ArticleBlog {		@@ -33,9 +33,9 @@ export class ArticleBlog {
33		33
34	this.articleService	34	this.articleService
35	.getChildren(this.article, filters)	35	.getChildren(this.article, filters)
36	- .then((result: noosfero.RestResult<noosfero.Article>) => {	36	+ .then((result: noosfero.RestResult<noosfero.Article[]>) => {
37	this.totalPosts = <number>result.headers("total");	37	this.totalPosts = <number>result.headers("total");
38	- this.posts = <noosfero.Article[]> result.data;	38	+ this.posts = result.data;
39	});	39	});
40	}	40	}
41		41
	@@ -28,7 +28,7 @@ describe("Components", () => {		@@ -28,7 +28,7 @@ describe("Components", () => {
28	}	28	}
29		29
30	// uses the TestComponentBuilder instance to initialize the component	30	// uses the TestComponentBuilder instance to initialize the component
31	- //.overrideView(LinkListBlock, { template: 'asdasdasd', pipes: [NoosferoTemplate] })	31	+ // .overrideView(LinkListBlock, { template: 'asdasdasd', pipes: [NoosferoTemplate] })
32	tcb.createAsync(BlockContainerComponent).then(fixture => {	32	tcb.createAsync(BlockContainerComponent).then(fixture => {
33	// and here we can inspect and run the test assertions	33	// and here we can inspect and run the test assertions
34	let myComponent: LinkListBlock = fixture.componentInstance;	34	let myComponent: LinkListBlock = fixture.componentInstance;
1	-import {Component, Input} from 'ng-forward'	1	+import {Component, Input} from 'ng-forward';
2	import {Block} from '../block.component';	2	import {Block} from '../block.component';
3		3
4	@Component({	4	@Component({
	@@ -30,14 +30,14 @@ describe("Components", () => {		@@ -30,14 +30,14 @@ describe("Components", () => {
30		30
31	it("show image if present", () => {	31	it("show image if present", () => {
32	helpers.tcb.createAsync(BlockContainerComponent).then(fixture => {	32	helpers.tcb.createAsync(BlockContainerComponent).then(fixture => {
33	- var elProfile = fixture.debugElement.componentViewChildren[0];	33	+ let elProfile = fixture.debugElement.componentViewChildren[0];
34	expect(elProfile.query('div.profile-image-block').length).toEqual(1);	34	expect(elProfile.query('div.profile-image-block').length).toEqual(1);
35	});	35	});
36	});	36	});
37		37
38	it("has link to the profile", () => {	38	it("has link to the profile", () => {
39	helpers.tcb.createAsync(BlockContainerComponent).then(fixture => {	39	helpers.tcb.createAsync(BlockContainerComponent).then(fixture => {
40	- var elProfile = fixture.debugElement.componentViewChildren[0];	40	+ let elProfile = fixture.debugElement.componentViewChildren[0];
41	expect(elProfile.query('a.settings-link').length).toEqual(1);	41	expect(elProfile.query('a.settings-link').length).toEqual(1);
42	});	42	});
43	});	43	});