Merge branch 'create-article' into 'master'

Basic form to create and edit articles See merge request !11

Merge branch 'create-article' into 'master'
Basic form to create and edit articles See merge request !11
Michel Felipe
2 parents 0e6cfa00 5f9ef2ae
Showing 27 changed files with 406 additions and 164 deletions Show diff stats
bower.json
src/app/article/article.html
src/app/article/basic-editor.component.spec.ts
src/app/article/basic-editor.component.ts
src/app/article/basic-editor.html
src/app/article/basic-editor/basic-editor.component.spec.ts
src/app/article/basic-editor/basic-editor.component.ts
src/app/article/basic-editor/basic-editor.html
src/app/article/basic-editor/basic-editor.scss
src/app/article/content-viewer/content-viewer-actions.component.spec.ts
src/app/article/content-viewer/content-viewer-actions.component.ts
src/app/article/content-viewer/content-viewer.component.ts
src/app/article/content-viewer/navbar-actions.html
src/app/article/index.ts
src/app/index.ts
src/app/main/main.component.ts
src/app/profile/profile.component.ts
src/app/shared/components/html-editor/html-editor.component.spec.ts
src/app/shared/components/html-editor/html-editor.component.ts
src/app/shared/components/html-editor/html-editor.html
@@ -34,7 +34,9 @@
     "angular-dynamic-locale": "^0.1.30",
     "angular-i18n": "^1.5.0",
     "angular-load": "^0.4.1",
-    "angular-translate-interpolation-messageformat": "^2.10.0"
+    "angular-translate-interpolation-messageformat": "^2.10.0",
+    "ng-ckeditor": "^0.2.1",
+    "ckeditor": "^4.5.8"
   },
   "devDependencies": {
     "angular-mocks": "~1.5.0"
@@ -4,6 +4,9 @@
   </div>
  
   <div class="sub-header clearfix">
+    <a href="#" class="btn btn-default btn-xs" ui-sref="main.cmsEdit({profile: ctrl.profile.identifier, id: ctrl.article.id})">
+      <i class="fa fa-pencil-square-o fa-fw fa-lg"></i> {{"article.actions.edit" | translate}}
+    </a>
     <div class="page-info pull-right small text-muted">
       <span class="time">
         <i class="fa fa-clock-o"></i> <span am-time-ago="ctrl.article.created_at | dateFormat"></span>
@@ -1,55 +0,0 @@
-import {quickCreateComponent} from "../../spec/helpers";
-import {BasicEditorComponent} from "./basic-editor.component";
-
-
-describe("Article BasicEditor", () => {
-
-    let $rootScope: ng.IRootScopeService;
-    let $q: ng.IQService;
-    let articleServiceMock: any;
-    let profileServiceMock: any;
-    let $state: any;
-    let profile = { id: 1 };
-    let notification: any;
-
-
-    beforeEach(inject((_$rootScope_: ng.IRootScopeService, _$q_: ng.IQService) => {
-        $rootScope = _$rootScope_;
-        $q = _$q_;
-    }));
-
-    beforeEach(() => {
-        $state = jasmine.createSpyObj("$state", ["transitionTo"]);
-        notification = jasmine.createSpyObj("notification", ["success"]);
-        profileServiceMock = jasmine.createSpyObj("profileServiceMock", ["getCurrentProfile"]);
-        articleServiceMock = jasmine.createSpyObj("articleServiceMock", ["createInProfile"]);
-
-        let getCurrentProfileResponse = $q.defer();
-        getCurrentProfileResponse.resolve(profile);
-
-        let articleCreate = $q.defer();
-        articleCreate.resolve({ data: { path: "path", profile: { identifier: "profile" } } });
-
-        profileServiceMock.getCurrentProfile = jasmine.createSpy("getCurrentProfile").and.returnValue(getCurrentProfileResponse.promise);
-        articleServiceMock.createInProfile = jasmine.createSpy("createInProfile").and.returnValue(articleCreate.promise);
-    });
-
-    it("create an article in the current profile when save", done => {
-        let component: BasicEditorComponent = new BasicEditorComponent(articleServiceMock, profileServiceMock, $state, notification);
-        component.save();
-        $rootScope.$apply();
-        expect(profileServiceMock.getCurrentProfile).toHaveBeenCalled();
-        expect(articleServiceMock.createInProfile).toHaveBeenCalledWith(profile, component.article);
-        done();
-    });
-
-    it("got to the new article page and display an alert when saving sucessfully", done => {
-        let component: BasicEditorComponent = new BasicEditorComponent(articleServiceMock, profileServiceMock, $state, notification);
-        component.save();
-        $rootScope.$apply();
-        expect($state.transitionTo).toHaveBeenCalledWith("main.profile.page", { page: "path", profile: "profile" });
-        expect(notification.success).toHaveBeenCalled();
-        done();
-    });
-
-});
@@ -1,35 +0,0 @@
-import {StateConfig, Component, Inject, provide} from 'ng-forward';
-import {ArticleService} from "../../lib/ng-noosfero-api/http/article.service";
-import {ProfileService} from "../../lib/ng-noosfero-api/http/profile.service";
-import {NotificationService} from "../shared/services/notification.service.ts";
-
-@Component({
-    selector: 'article-basic-editor',
-    templateUrl: "app/article/basic-editor.html",
-    providers: [
-        provide('articleService', { useClass: ArticleService }),
-        provide('profileService', { useClass: ProfileService }),
-        provide('notification', { useClass: NotificationService })
-    ]
-})
-@Inject(ArticleService, ProfileService, "$state", NotificationService)
-export class BasicEditorComponent {
-
-    article: noosfero.Article = <noosfero.Article>{};
-
-    constructor(private articleService: ArticleService,
-        private profileService: ProfileService,
-        private $state: ng.ui.IStateService,
-        private notification: NotificationService) { }
-
-    save() {
-        this.profileService.getCurrentProfile().then((profile: noosfero.Profile) => {
-            return this.articleService.createInProfile(profile, this.article);
-        }).then((response: noosfero.RestResult<noosfero.Article>) => {
-            let article = (<noosfero.Article>response.data);
-            this.$state.transitionTo('main.profile.page', { page: article.path, profile: article.profile.identifier });
-            this.notification.success({ title: "Good job!", message: "Article saved!" });
-        });
-    }
-
-}
@@ -1,11 +0,0 @@
-<form>
-  <div class="form-group">
-    <label for="titleInput">Title</label>
-    <input type="text" class="form-control" id="titleInput" placeholder="title" ng-model="vm.article.name">
-  </div>
-  <div class="form-group">
-    <label for="bodyInput">Text</label>
-    <textarea class="form-control" id="bodyInput" rows="10" ng-model="vm.article.body"></textarea>
-  </div>
-  <button type="submit" class="btn btn-default" ng-click="vm.save()">Save</button>
-</form>
@@ -0,0 +1,84 @@
+import {quickCreateComponent} from "../../../spec/helpers";
+import {BasicEditorComponent} from "./basic-editor.component";
+
+
+describe("Article BasicEditor", () => {
+
+    let $rootScope: ng.IRootScopeService;
+    let $q: ng.IQService;
+    let articleServiceMock: any;
+    let profileServiceMock: any;
+    let $state: any;
+    let $stateParams: any;
+    let $window: any;
+    let profile = { id: 1 };
+    let notification: any;
+
+
+    beforeEach(inject((_$rootScope_: ng.IRootScopeService, _$q_: ng.IQService) => {
+        $rootScope = _$rootScope_;
+        $q = _$q_;
+    }));
+
+    beforeEach(() => {
+        $window = jasmine.createSpyObj("$window", ["back"]);
+        $state = jasmine.createSpyObj("$state", ["go"]);
+        notification = jasmine.createSpyObj("notification", ["success"]);
+        profileServiceMock = jasmine.createSpyObj("profileServiceMock", ["setCurrentProfileByIdentifier"]);
+        articleServiceMock = jasmine.createSpyObj("articleServiceMock", ["createInParent", "updateArticle", "get"]);
+
+        $stateParams = { profile: "profile" };
+
+        let setCurrentProfileByIdentifierResponse = $q.defer();
+        setCurrentProfileByIdentifierResponse.resolve(profile);
+
+        let articleCreate = $q.defer();
+        articleCreate.resolve({ data: { path: "path", profile: { identifier: "profile" } } });
+
+        let articleGet = $q.defer();
+        articleGet.resolve({ data: { path: "parent-path", profile: { identifier: "profile" } } });
+
+        profileServiceMock.setCurrentProfileByIdentifier = jasmine.createSpy("setCurrentProfileByIdentifier").and.returnValue(setCurrentProfileByIdentifierResponse.promise);
+        articleServiceMock.createInParent = jasmine.createSpy("createInParent").and.returnValue(articleCreate.promise);
+        articleServiceMock.updateArticle = jasmine.createSpy("updateArticle").and.returnValue(articleCreate.promise);
+        articleServiceMock.get = jasmine.createSpy("get").and.returnValue(articleGet.promise);
+    });
+
+    it("create an article in the current profile when save", done => {
+        $stateParams['parent_id'] = 1;
+        let component: BasicEditorComponent = new BasicEditorComponent(articleServiceMock, profileServiceMock, $state, notification, $stateParams, $window);
+        component.save();
+        $rootScope.$apply();
+        expect(profileServiceMock.setCurrentProfileByIdentifier).toHaveBeenCalled();
+        expect(articleServiceMock.createInParent).toHaveBeenCalledWith(1, component.article);
+        done();
+    });
+
+    it("got to the new article page and display an alert when saving sucessfully", done => {
+        let component: BasicEditorComponent = new BasicEditorComponent(articleServiceMock, profileServiceMock, $state, notification, $stateParams, $window);
+        component.save();
+        $rootScope.$apply();
+        expect($state.go).toHaveBeenCalledWith("main.profile.page", { page: "path", profile: "profile" });
+        expect(notification.success).toHaveBeenCalled();
+        done();
+    });
+
+    it("go back when cancel article edition", done => {
+        let component: BasicEditorComponent = new BasicEditorComponent(articleServiceMock, profileServiceMock, $state, notification, $stateParams, $window);
+        $window.history = { back: jasmine.createSpy('back') };
+        component.cancel();
+        expect($window.history.back).toHaveBeenCalled();
+        done();
+    });
+
+    it("edit existing article when save", done => {
+        $stateParams['parent_id'] = null;
+        $stateParams['id'] = 2;
+        let component: BasicEditorComponent = new BasicEditorComponent(articleServiceMock, profileServiceMock, $state, notification, $stateParams, $window);
+        component.save();
+        $rootScope.$apply();
+        expect(articleServiceMock.updateArticle).toHaveBeenCalledWith(component.article);
+        done();
+    });
+
+});
@@ -0,0 +1,69 @@
+import {StateConfig, Component, Inject, provide} from 'ng-forward';
+import {ArticleService} from "../../../lib/ng-noosfero-api/http/article.service";
+import {ProfileService} from "../../../lib/ng-noosfero-api/http/profile.service";
+import {NotificationService} from "../../shared/services/notification.service.ts";
+
+@Component({
+    selector: 'article-basic-editor',
+    templateUrl: "app/article/basic-editor/basic-editor.html",
+    providers: [
+        provide('articleService', { useClass: ArticleService }),
+        provide('profileService', { useClass: ProfileService }),
+        provide('notification', { useClass: NotificationService })
+    ]
+})
+@Inject(ArticleService, ProfileService, "$state", NotificationService, "$stateParams", "$window")
+export class BasicEditorComponent {
+
+    article: noosfero.Article = <noosfero.Article>{ type: "TextArticle" };
+    parent: noosfero.Article = <noosfero.Article>{};
+
+    id: number;
+    parentId: number;
+    profileIdentifier: string;
+
+    constructor(private articleService: ArticleService,
+        private profileService: ProfileService,
+        private $state: ng.ui.IStateService,
+        private notification: NotificationService,
+        private $stateParams: ng.ui.IStateParamsService,
+        private $window: ng.IWindowService) {
+
+        this.parentId = this.$stateParams['parent_id'];
+        this.profileIdentifier = this.$stateParams["profile"];
+        this.id = this.$stateParams['id'];
+
+        if (this.parentId) {
+            this.articleService.get(this.parentId).then((result: noosfero.RestResult<noosfero.Article>) => {
+                this.parent = result.data;
+            });
+        }
+        if (this.id) {
+            this.articleService.get(this.id).then((result: noosfero.RestResult<noosfero.Article>) => {
+                this.article = result.data;
+                this.article.name = this.article.title; // FIXME
+            });
+        }
+    }
+
+    save() {
+        this.profileService.setCurrentProfileByIdentifier(this.profileIdentifier).then((profile: noosfero.Profile) => {
+            if (this.id) {
+                return this.articleService.updateArticle(this.article);
+            } else {
+                return this.articleService.createInParent(this.parentId, this.article);
+            }
+        }).then((response: noosfero.RestResult<noosfero.Article>) => {
+            let article = (<noosfero.Article>response.data);
+            this.$state.go('main.profile.page', { page: article.path, profile: article.profile.identifier });
+            this.notification.success({ title: "article.basic_editor.success.title", message: "article.basic_editor.success.message" });
+        }).catch(() => {
+            this.notification.error({ message: "article.basic_editor.save.failed" });
+        });
+    }
+
+    cancel() {
+        this.$window.history.back();
+    }
+
+}
@@ -0,0 +1,34 @@
+<div class="basic-editor">
+  <div class="row">
+    <div class="col-md-1"></div>
+    <div class="col-md-8">
+      <form>
+        <div class="form-group">
+          <label for="titleInput">{{"article.basic_editor.title" | translate}}</label>
+          <input type="text" class="form-control" id="titleInput" placeholder="{{'article.basic_editor.title' | translate}}" ng-model="vm.article.name">
+        </div>
+        <div class="form-group">
+          <label for="bodyInput">{{"article.basic_editor.body" | translate}}</label>
+          <html-editor [(value)]="vm.article.body"></html-editor>
+        </div>
+        <button type="submit" class="btn btn-default" ng-click="vm.save()">{{"article.basic_editor.save" | translate}}</button>
+        <button type="button" class="btn btn-danger" ng-click="vm.cancel()">{{"article.basic_editor.cancel" | translate}}</button>
+      </form>
+    </div>
+    <div class="side-options">
+      <div class="visibility panel panel-default">
+        <div class="panel-heading">{{"article.basic_editor.visibility" | translate}}</div>
+        <div class="panel-body">
+          <div>
+            <input type="radio" ng-model="vm.article.published" ng-value="true"> 
+            <i class="fa fa-unlock fa-fw"></i> {{"article.basic_editor.visibility.public" | translate}}
+          </div>
+          <div>
+            <input type="radio" ng-model="vm.article.published" ng-value="false">
+            <i class="fa fa-lock fa-fw"></i> {{"article.basic_editor.visibility.private" | translate}}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
@@ -0,0 +1,21 @@
+.basic-editor {
+  @extend .container-fluid;
+  padding: 0 1%;
+
+  .side-options {
+    @extend .col-md-3;
+    margin-top: 25px;
+
+    .visibility {
+      .panel-heading {
+        background-color: transparent;
+        font-weight: bold;
+      }
+      .panel-body {
+        i {
+          color: #A5A5A5;
+        }
+      }
+    }
+  }
+}
-import {providers} from 'ng-forward/cjs/testing/providers';
-
 import {Input, Component, provide} from 'ng-forward';
  
 import * as helpers from "../../../spec/helpers";
-
-import {ComponentFixture} from 'ng-forward/cjs/testing/test-component-builder';
+import {ComponentTestHelper, createClass} from '../../../spec/component-test-helper';
 import {ContentViewerActionsComponent} from './content-viewer-actions.component';
  
 // this htmlTemplate will be re-used between the container components in this spec file
@@ -12,56 +9,57 @@ const htmlTemplate: string = &#39;&lt;content-viewer-actions [article]=&quot;ctrl.article&quot; [
  
 describe('Content Viewer Actions Component', () => {
  
-    beforeEach(() => {
+    let helper: ComponentTestHelper<ContentViewerActionsComponent>;
  
-        angular.mock.module("templates");
+    beforeEach(angular.mock.module("templates"));
  
-        providers((provide: any) => {
-            return <any>[
-                provide('ProfileService', {
-                    useValue: helpers.mocks.profileService
-                })
-            ];
-        });
-    });
+    let providers = [
+        provide('ProfileService', {
+            useValue: helpers.mocks.profileService
+        }),
+        provide('ArticleService', {
+            useValue: helpers.mocks.articleService
+        })
+    ].concat(helpers.provideFilters("translateFilter"));
  
-    let buildComponent = (): Promise<ComponentFixture> => {
-        return helpers.quickCreateComponent({
-            providers: [
-                helpers.provideEmptyObjects('Restangular'),
-                helpers.provideFilters('translateFilter')
-            ],
+    beforeEach((done) => {
+        let cls = createClass({
+            template: htmlTemplate,
             directives: [ContentViewerActionsComponent],
-            template: htmlTemplate
+            providers: providers
         });
-    };
+        helper = new ComponentTestHelper<ContentViewerActionsComponent>(cls, done);
+    });
  
-    it('renders content viewer actions directive', (done: Function) => {
-        buildComponent().then((fixture: ComponentFixture) => {
-            expect(fixture.debugElement.query('content-viewer-actions').length).toEqual(1);
+    it('renders content viewer actions directive', () => {
+        expect(helper.all("content-viewer-actions").length).toEqual(1);
+    });
  
-            done();
-        });
+    it('return article parent as container when it is not a folder', () => {
+        let article = <noosfero.Article>({ id: 1, type: 'TextArticle', parent: { id: 2 } });
+        expect(helper.component.getArticleContainer(article)).toEqual(2);
+    });
+
+    it('return article as container when it is a folder', () => {
+        let article = <noosfero.Article>({ id: 1, type: 'Folder' });
+        expect(helper.component.getArticleContainer(article)).toEqual(1);
     });
  
-    it('check if profile was loaded', (done: Function) => {
+    it('return article as container when it is a blog', () => {
+        let article = <noosfero.Article>({ id: 1, type: 'Blog' });
+        expect(helper.component.getArticleContainer(article)).toEqual(1);
+    });
+
+    it('check if profile was loaded', () => {
         let profile: any = {
             id: 1,
             identifier: 'the-profile-test',
             type: 'Person'
         };
-
         helpers.mocks.profileService.getCurrentProfile = () => {
             return helpers.mocks.promiseResultTemplate(profile);
         };
-
-        buildComponent().then((fixture: ComponentFixture) => {
-            let contentViewerComp: ContentViewerActionsComponent = fixture.debugElement.componentViewChildren[0].componentInstance;
-
-            expect(contentViewerComp.profile).toEqual(jasmine.objectContaining(profile));
-
-            done();
-        });
+        let component = new ContentViewerActionsComponent(<any>helpers.mocks.profileService, <any>helpers.mocks.articleService);
+        expect(component.profile).toEqual(jasmine.objectContaining(profile));
     });
-
 });
 import {Component, Inject, provide} from "ng-forward";
 import {ProfileService} from "../../../lib/ng-noosfero-api/http/profile.service";
+import {ArticleService} from "../../../lib/ng-noosfero-api/http/article.service";
  
 @Component({
     selector: "content-viewer-actions",
     templateUrl: "app/article/content-viewer/navbar-actions.html",
-    providers: [provide('profileService', { useClass: ProfileService })]
+    providers: [
+        provide('profileService', { useClass: ProfileService }),
+        provide('articleService', { useClass: ArticleService })
+    ]
 })
-@Inject(ProfileService)
+@Inject(ProfileService, ArticleService)
 export class ContentViewerActionsComponent {
  
     article: noosfero.Article;
     profile: noosfero.Profile;
+    parentId: number;
  
-    constructor(profileService: ProfileService) {
+    constructor(profileService: ProfileService, articleService: ArticleService) {
         profileService.getCurrentProfile().then((profile: noosfero.Profile) => {
             this.profile = profile;
+            return articleService.getCurrent();
+        }).then((article: noosfero.Article) => {
+            this.article = article;
+            this.parentId = this.getArticleContainer(article);
         });
     }
+
+    getArticleContainer(article: noosfero.Article) {
+        // FIXME get folder types from api
+        if (article.type === "Blog" || article.type === "Folder") {
+            return article.id;
+        } else if (article.parent) {
+            return article.parent.id;
+        }
+    }
 }
@@ -28,11 +28,12 @@ export class ContentViewerComponent {
     }
  
     activate() {
-       this.profileService.getCurrentProfile().then((profile: noosfero.Profile) => {
+        this.profileService.getCurrentProfile().then((profile: noosfero.Profile) => {
             this.profile = profile;
             return this.articleService.getArticleByProfileAndPath(this.profile, this.$stateParams["page"]);
         }).then((result: noosfero.RestResult<any>) => {
             this.article = <noosfero.Article>result.data;
+            this.articleService.setCurrent(this.article);
         });
     }
 }
 <ul class="nav navbar-nav">
   <li ng-show="vm.profile">
-    <a href="#" role="button" ui-sref="main.profile.cms({profile: vm.profile.identifier})">
+    <a ng-show="vm.parentId" href="#" role="button" ui-sref="main.cms({profile: vm.profile.identifier, parent_id: vm.parentId})">
       <i class="fa fa-file fa-fw fa-lg"></i> {{"navbar.content_viewer_actions.new_post" | translate}}
     </a>
   </li>
 /* Module Index Entry - generated using the script npm run generate-index */
 export * from "./article-default-view.component";
-export * from "./basic-editor.component";
@@ -14,7 +14,7 @@ declare var moment: any;
  
 let noosferoApp: any = bundle("noosferoApp", MainComponent, ["ngAnimate", "ngCookies", "ngStorage", "ngTouch",
     "ngSanitize", "ngMessages", "ngAria", "restangular",
-    "ui.router", "ui.bootstrap", "toastr",
+    "ui.router", "ui.bootstrap", "toastr", "ngCkeditor",
     "angularMoment", "angular.filter", "akoenig.deckgrid",
     "angular-timeline", "duScroll", "oitozero.ngSweetAlert",
     "pascalprecht.translate", "tmh.dynamicLocale", "angularLoad"]).publish();
@@ -29,6 +29,7 @@ import {BodyStateClassesService} from &quot;./../layout/services/body-state-classes.s
 import {Navbar} from "../layout/navbar/navbar";
  
 import {MainBlockComponent} from "../layout/blocks/main-block/main-block.component";
+import {HtmlEditorComponent} from "../shared/components/html-editor/html-editor.component";
  
  
 /**
@@ -82,7 +83,7 @@ export class EnvironmentContent {
     directives: [
         ArticleBlogComponent, ArticleViewComponent, BoxesComponent, BlockComponent,
         EnvironmentComponent, PeopleBlockComponent,
-        LinkListBlockComponent, CommunitiesBlockComponent,
+        LinkListBlockComponent, CommunitiesBlockComponent, HtmlEditorComponent,
         MainBlockComponent, RecentDocumentsBlockComponent, Navbar, ProfileImageBlockComponent,
         MembersBlockComponent, NoosferoTemplate, DateFormat, RawHTMLBlockComponent
     ],
 import {StateConfig, Component, Inject, provide} from 'ng-forward';
 import {ProfileInfoComponent} from './info/profile-info.component';
 import {ProfileHomeComponent} from './profile-home.component';
-import {BasicEditorComponent} from '../article/basic-editor.component';
+import {BasicEditorComponent} from '../article/basic-editor/basic-editor.component';
 import {ContentViewerComponent} from "../article/content-viewer/content-viewer.component";
 import {ContentViewerActionsComponent} from "../article/content-viewer/content-viewer-actions.component";
 import {ActivitiesComponent} from "./activities/activities.component";
@@ -45,12 +45,24 @@ import {MyProfileComponent} from &quot;./myprofile.component&quot;;
         component: MyProfileComponent
     },
     {
-        name: 'main.profile.cms',
-        url: "^/myprofile/:profile/cms",
+        name: 'main.cms',
+        url: "^/myprofile/:profile/cms?parent_id",
         component: BasicEditorComponent,
         views: {
-            "mainBlockContent": {
-                templateUrl: "app/article/basic-editor.html",
+            "content": {
+                templateUrl: "app/article/basic-editor/basic-editor.html",
+                controller: BasicEditorComponent,
+                controllerAs: "vm"
+            }
+        }
+    },
+    {
+        name: 'main.cmsEdit',
+        url: "^/myprofile/:profile/cms/edit/:id",
+        component: BasicEditorComponent,
+        views: {
+            "content": {
+                templateUrl: "app/article/basic-editor/basic-editor.html",
                 controller: BasicEditorComponent,
                 controllerAs: "vm"
             }
@@ -98,7 +110,7 @@ export class ProfileComponent {
         }).then((response: restangular.IResponse) => {
             this.boxes = response.data.boxes;
         }).catch(() => {
-            $state.transitionTo('main');
+            $state.transitionTo('main.environment.home');
             notificationService.error({ message: "notification.profile.not_found" });
         });
     }
@@ -0,0 +1,26 @@
+import {ComponentTestHelper, createClass} from './../../../../spec/component-test-helper';
+import {HtmlEditorComponent} from "./html-editor.component";
+
+const htmlTemplate: string = '<html-editor [(value)]="ctrl.value" [options]="ctrl.options"></html-editor>';
+
+describe("Components", () => {
+    describe("Html Editor Component", () => {
+
+        let helper: ComponentTestHelper<HtmlEditorComponent>;
+        beforeEach(angular.mock.module("templates"));
+
+        beforeEach((done) => {
+            let properties = { value: "value" };
+            let cls = createClass({
+                template: htmlTemplate,
+                directives: [HtmlEditorComponent],
+                properties: properties
+            });
+            helper = new ComponentTestHelper<HtmlEditorComponent>(cls, done);
+        });
+
+        it("render a textarea", () => {
+            expect(helper.find("textarea").length).toEqual(1);
+        });
+    });
+});
@@ -0,0 +1,11 @@
+import {Component, Input} from "ng-forward";
+
+@Component({
+    selector: 'html-editor',
+    templateUrl: "app/shared/components/html-editor/html-editor.html",
+})
+export class HtmlEditorComponent {
+
+    @Input() options: any = {};
+    @Input() value: any;
+}
@@ -0,0 +1 @@
+<textarea ckeditor="ctrl.options" class="form-control" ng-model="ctrl.value"></textarea>
@@ -25,7 +25,7 @@ export class NotificationService {
  
     httpError(status: number, data: any): boolean {
         this.error({ message: `notification.http_error.${status}.message` });
-        return true; // return true to indicate that the error was already handled
+        return false; // return true to indicate that the error was already handled
     }
  
     success({
@@ -35,5 +35,16 @@
   "comment.pagination.more": "More",
   "comment.post.success.title": "Good job!",
   "comment.post.success.message": "Comment saved!",
-  "comment.reply": "reply"
+  "comment.reply": "reply",
+  "article.actions.edit": "Edit",
+  "article.basic_editor.title": "Title",
+  "article.basic_editor.body": "Body",
+  "article.basic_editor.save": "Save",
+  "article.basic_editor.save.failed": "This article could not be saved",
+  "article.basic_editor.cancel": "Cancel",
+  "article.basic_editor.success.title": "Good job!",
+  "article.basic_editor.success.message": "Article saved!",
+  "article.basic_editor.visibility": "Visibility",
+  "article.basic_editor.visibility.public": "Public",
+  "article.basic_editor.visibility.private": "Private"
 }
@@ -35,5 +35,16 @@
   "comment.pagination.more": "Mais",
   "comment.post.success.title": "Bom trabalho!",
   "comment.post.success.message": "Comentário salvo com sucesso!",
-  "comment.reply": "responder"
+  "comment.reply": "responder",
+  "article.actions.edit": "Editar",
+  "article.basic_editor.title": "Título",
+  "article.basic_editor.body": "Corpo",
+  "article.basic_editor.save": "Salvar",
+  "article.basic_editor.save.failed": "O artigo não pode ser salvo",
+  "article.basic_editor.cancel": "Cancelar",
+  "article.basic_editor.success.title": "Bom trabalho!",
+  "article.basic_editor.success.message": "Artigo salvo com sucesso!",
+  "article.basic_editor.visibility": "Visibilidade",
+  "article.basic_editor.visibility.public": "Público",
+  "article.basic_editor.visibility.private": "Privado"
 }
@@ -22,6 +22,17 @@ export class ArticleService extends RestangularService&lt;noosfero.Article&gt; {
         };
     }
  
+    updateArticle(article: noosfero.Article) {
+        let headers = {
+            'Content-Type': 'application/json'
+        };
+        let deferred = this.$q.defer<noosfero.RestResult<noosfero.Article>>();
+        let attributesToUpdate: any = { article: { name: article.name, body: article.body, published: article.published } };
+        let restRequest: ng.IPromise<noosfero.RestResult<noosfero.Article>> = this.getElement(article.id).customPOST(attributesToUpdate, null, null, headers);
+        restRequest.then(this.getHandleSuccessFunction(deferred))
+            .catch(this.getHandleErrorFunction(deferred));
+        return deferred.promise;
+    }
  
     createInProfile(profile: noosfero.Profile, article: noosfero.Article): ng.IPromise<noosfero.RestResult<noosfero.Article>> {
         let profileElement = this.profileService.get(<number>profile.id);
@@ -32,6 +43,14 @@ export class ArticleService extends RestangularService&lt;noosfero.Article&gt; {
         return this.create(article, <noosfero.RestModel>profileElement, null, headers);
     }
  
+    createInParent(parentId: number, article: noosfero.Article): ng.IPromise<noosfero.RestResult<noosfero.Article>> {
+        let headers = {
+            'Content-Type': 'application/json'
+        };
+
+        let parent = this.getElement(parentId);
+        return this.create(article, parent, null, headers, true, "children");
+    }
  
     getAsCollectionChildrenOf<C>(rootElement: noosfero.Environment | noosfero.Article | noosfero.Profile, path: string, queryParams?: any, headers?: any): restangular.ICollectionPromise<C> {
         return rootElement.getList<C>(path, queryParams, headers);
@@ -77,5 +96,4 @@ export class ArticleService extends RestangularService&lt;noosfero.Article&gt; {
     }
  
  
-
 }
@@ -11,6 +11,8 @@
 export abstract class RestangularService<T extends noosfero.RestModel> {
  
     private baseResource: restangular.IElement;
+    private currentPromise: ng.IDeferred<T>;
+
     /**
      * Creates an instance of RestangularService.
      * 
@@ -20,6 +22,7 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
      */
     constructor(protected restangularService: restangular.IService, protected $q: ng.IQService, protected $log: ng.ILogService) {
         this.baseResource = restangularService.all(this.getResourcePath());
+        this.resetCurrent();
         // TODO 
         // this.restangularService.setResponseInterceptor((data, operation, what, url, response, deferred) => {
         //     let transformedData: any = data;
@@ -32,6 +35,18 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
         // });
     }
  
+    public resetCurrent() {
+        this.currentPromise = this.$q.defer();
+    }
+
+    public getCurrent(): ng.IPromise<T> {
+        return this.currentPromise.promise;
+    }
+
+    public setCurrent(object: T) {
+        this.currentPromise.resolve(object);
+    }
+
     protected extractData(response: restangular.IResponse): noosfero.RestResult<T> {
         let dataKey: string;
         if (response.data && this.getDataKeys()) {
@@ -221,7 +236,7 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
      * Creates a new Resource into the resource collection
      * calls POST /resourcePath
      */
-    public create(obj: T, rootElement?: noosfero.RestModel, queryParams?: any, headers?: any, isSub: boolean = true): ng.IPromise<noosfero.RestResult<T>> {
+    public create(obj: T, rootElement?: noosfero.RestModel, queryParams?: any, headers?: any, isSub: boolean = true, path?: string): ng.IPromise<noosfero.RestResult<T>> {
         let deferred = this.$q.defer<noosfero.RestResult<T>>();
  
         let restRequest: ng.IPromise<noosfero.RestResult<T>>;
@@ -233,8 +248,9 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
             data = obj;
         }
  
+        let subpath = path || this.getResourcePath();
         if (rootElement) {
-            restRequest = rootElement.all(this.getResourcePath()).post(data, queryParams, headers);
+            restRequest = rootElement.all(subpath).post(data, queryParams, headers);
         } else {
             restRequest = this.baseResource.post(data, queryParams, headers);
         }
  
 namespace noosfero {
-    export interface Article  extends RestModel {
+    export interface Article extends RestModel {
         path: string;
         profile: Profile;
         type: string;
+        parent: Article;
+        body: string;
+        title: string;
+        name: string;
+        published: boolean;
     }
-}
 \ No newline at end of file
+}
 const DEBUG = false;
  
-let log = (message: string, ...args:  any[]) => {
+let log = (message: string, ...args: any[]) => {
     if (DEBUG) {
         console.log(message);
     }
@@ -70,7 +70,9 @@ export var mocks = {
             return {
                 then: (func?: Function) => { if (func) func(); }
             };
-        }
+        },
+        setCurrent: (article: noosfero.Article) => { },
+        getCurrent: () => { return Promise.resolve({}); }
     },
     environmentService: {
         getEnvironmentPeople: (params: any) => {
...	...	@@ -34,7 +34,9 @@
34	34	"angular-dynamic-locale": "^0.1.30",
35	35	"angular-i18n": "^1.5.0",
36	36	"angular-load": "^0.4.1",
37		- "angular-translate-interpolation-messageformat": "^2.10.0"
	37	+ "angular-translate-interpolation-messageformat": "^2.10.0",
	38	+ "ng-ckeditor": "^0.2.1",
	39	+ "ckeditor": "^4.5.8"
38	40	},
39	41	"devDependencies": {
40	42	"angular-mocks": "~1.5.0"
...	...
...	...	@@ -4,6 +4,9 @@
4	4	</div>
5	5
6	6	<div class="sub-header clearfix">
	7	+ <a href="#" class="btn btn-default btn-xs" ui-sref="main.cmsEdit({profile: ctrl.profile.identifier, id: ctrl.article.id})">
	8	+ <i class="fa fa-pencil-square-o fa-fw fa-lg"></i> {{"article.actions.edit" \| translate}}
	9	+ </a>
7	10	<div class="page-info pull-right small text-muted">
8	11	<span class="time">
9	12	<i class="fa fa-clock-o"></i> <span am-time-ago="ctrl.article.created_at \| dateFormat"></span>
...	...
...	...	@@ -1,55 +0,0 @@
1		-import {quickCreateComponent} from "../../spec/helpers";
2		-import {BasicEditorComponent} from "./basic-editor.component";
3		-
4		-
5		-describe("Article BasicEditor", () => {
6		-
7		- let $rootScope: ng.IRootScopeService;
8		- let $q: ng.IQService;
9		- let articleServiceMock: any;
10		- let profileServiceMock: any;
11		- let $state: any;
12		- let profile = { id: 1 };
13		- let notification: any;
14		-
15		-
16		- beforeEach(inject((_$rootScope_: ng.IRootScopeService, _$q_: ng.IQService) => {
17		- $rootScope = _$rootScope_;
18		- $q = _$q_;
19		- }));
20		-
21		- beforeEach(() => {
22		- $state = jasmine.createSpyObj("$state", ["transitionTo"]);
23		- notification = jasmine.createSpyObj("notification", ["success"]);
24		- profileServiceMock = jasmine.createSpyObj("profileServiceMock", ["getCurrentProfile"]);
25		- articleServiceMock = jasmine.createSpyObj("articleServiceMock", ["createInProfile"]);
26		-
27		- let getCurrentProfileResponse = $q.defer();
28		- getCurrentProfileResponse.resolve(profile);
29		-
30		- let articleCreate = $q.defer();
31		- articleCreate.resolve({ data: { path: "path", profile: { identifier: "profile" } } });
32		-
33		- profileServiceMock.getCurrentProfile = jasmine.createSpy("getCurrentProfile").and.returnValue(getCurrentProfileResponse.promise);
34		- articleServiceMock.createInProfile = jasmine.createSpy("createInProfile").and.returnValue(articleCreate.promise);
35		- });
36		-
37		- it("create an article in the current profile when save", done => {
38		- let component: BasicEditorComponent = new BasicEditorComponent(articleServiceMock, profileServiceMock, $state, notification);
39		- component.save();
40		- $rootScope.$apply();
41		- expect(profileServiceMock.getCurrentProfile).toHaveBeenCalled();
42		- expect(articleServiceMock.createInProfile).toHaveBeenCalledWith(profile, component.article);
43		- done();
44		- });
45		-
46		- it("got to the new article page and display an alert when saving sucessfully", done => {
47		- let component: BasicEditorComponent = new BasicEditorComponent(articleServiceMock, profileServiceMock, $state, notification);
48		- component.save();
49		- $rootScope.$apply();
50		- expect($state.transitionTo).toHaveBeenCalledWith("main.profile.page", { page: "path", profile: "profile" });
51		- expect(notification.success).toHaveBeenCalled();
52		- done();
53		- });
54		-
55		-});
...	...	@@ -1,35 +0,0 @@
1		-import {StateConfig, Component, Inject, provide} from 'ng-forward';
2		-import {ArticleService} from "../../lib/ng-noosfero-api/http/article.service";
3		-import {ProfileService} from "../../lib/ng-noosfero-api/http/profile.service";
4		-import {NotificationService} from "../shared/services/notification.service.ts";
5		-
6		-@Component({
7		- selector: 'article-basic-editor',
8		- templateUrl: "app/article/basic-editor.html",
9		- providers: [
10		- provide('articleService', { useClass: ArticleService }),
11		- provide('profileService', { useClass: ProfileService }),
12		- provide('notification', { useClass: NotificationService })
13		- ]
14		-})
15		-@Inject(ArticleService, ProfileService, "$state", NotificationService)
16		-export class BasicEditorComponent {
17		-
18		- article: noosfero.Article = <noosfero.Article>{};
19		-
20		- constructor(private articleService: ArticleService,
21		- private profileService: ProfileService,
22		- private $state: ng.ui.IStateService,
23		- private notification: NotificationService) { }
24		-
25		- save() {
26		- this.profileService.getCurrentProfile().then((profile: noosfero.Profile) => {
27		- return this.articleService.createInProfile(profile, this.article);
28		- }).then((response: noosfero.RestResult<noosfero.Article>) => {
29		- let article = (<noosfero.Article>response.data);
30		- this.$state.transitionTo('main.profile.page', { page: article.path, profile: article.profile.identifier });
31		- this.notification.success({ title: "Good job!", message: "Article saved!" });
32		- });
33		- }
34		-
35		-}
...	...	@@ -1,11 +0,0 @@
1		-<form>
2		- <div class="form-group">
3		- <label for="titleInput">Title</label>
4		- <input type="text" class="form-control" id="titleInput" placeholder="title" ng-model="vm.article.name">
5		- </div>
6		- <div class="form-group">
7		- <label for="bodyInput">Text</label>
8		- <textarea class="form-control" id="bodyInput" rows="10" ng-model="vm.article.body"></textarea>
9		- </div>
10		- <button type="submit" class="btn btn-default" ng-click="vm.save()">Save</button>
11		-</form>
...	...	@@ -0,0 +1,84 @@
	1	+import {quickCreateComponent} from "../../../spec/helpers";
	2	+import {BasicEditorComponent} from "./basic-editor.component";
	3	+
	4	+
	5	+describe("Article BasicEditor", () => {
	6	+
	7	+ let $rootScope: ng.IRootScopeService;
	8	+ let $q: ng.IQService;
	9	+ let articleServiceMock: any;
	10	+ let profileServiceMock: any;
	11	+ let $state: any;
	12	+ let $stateParams: any;
	13	+ let $window: any;
	14	+ let profile = { id: 1 };
	15	+ let notification: any;
	16	+
	17	+
	18	+ beforeEach(inject((_$rootScope_: ng.IRootScopeService, _$q_: ng.IQService) => {
	19	+ $rootScope = _$rootScope_;
	20	+ $q = _$q_;
	21	+ }));
	22	+
	23	+ beforeEach(() => {
	24	+ $window = jasmine.createSpyObj("$window", ["back"]);
	25	+ $state = jasmine.createSpyObj("$state", ["go"]);
	26	+ notification = jasmine.createSpyObj("notification", ["success"]);
	27	+ profileServiceMock = jasmine.createSpyObj("profileServiceMock", ["setCurrentProfileByIdentifier"]);
	28	+ articleServiceMock = jasmine.createSpyObj("articleServiceMock", ["createInParent", "updateArticle", "get"]);
	29	+
	30	+ $stateParams = { profile: "profile" };
	31	+
	32	+ let setCurrentProfileByIdentifierResponse = $q.defer();
	33	+ setCurrentProfileByIdentifierResponse.resolve(profile);
	34	+
	35	+ let articleCreate = $q.defer();
	36	+ articleCreate.resolve({ data: { path: "path", profile: { identifier: "profile" } } });
	37	+
	38	+ let articleGet = $q.defer();
	39	+ articleGet.resolve({ data: { path: "parent-path", profile: { identifier: "profile" } } });
	40	+
	41	+ profileServiceMock.setCurrentProfileByIdentifier = jasmine.createSpy("setCurrentProfileByIdentifier").and.returnValue(setCurrentProfileByIdentifierResponse.promise);
	42	+ articleServiceMock.createInParent = jasmine.createSpy("createInParent").and.returnValue(articleCreate.promise);
	43	+ articleServiceMock.updateArticle = jasmine.createSpy("updateArticle").and.returnValue(articleCreate.promise);
	44	+ articleServiceMock.get = jasmine.createSpy("get").and.returnValue(articleGet.promise);
	45	+ });
	46	+
	47	+ it("create an article in the current profile when save", done => {
	48	+ $stateParams['parent_id'] = 1;
	49	+ let component: BasicEditorComponent = new BasicEditorComponent(articleServiceMock, profileServiceMock, $state, notification, $stateParams, $window);
	50	+ component.save();
	51	+ $rootScope.$apply();
	52	+ expect(profileServiceMock.setCurrentProfileByIdentifier).toHaveBeenCalled();
	53	+ expect(articleServiceMock.createInParent).toHaveBeenCalledWith(1, component.article);
	54	+ done();
	55	+ });
	56	+
	57	+ it("got to the new article page and display an alert when saving sucessfully", done => {
	58	+ let component: BasicEditorComponent = new BasicEditorComponent(articleServiceMock, profileServiceMock, $state, notification, $stateParams, $window);
	59	+ component.save();
	60	+ $rootScope.$apply();
	61	+ expect($state.go).toHaveBeenCalledWith("main.profile.page", { page: "path", profile: "profile" });
	62	+ expect(notification.success).toHaveBeenCalled();
	63	+ done();
	64	+ });
	65	+
	66	+ it("go back when cancel article edition", done => {
	67	+ let component: BasicEditorComponent = new BasicEditorComponent(articleServiceMock, profileServiceMock, $state, notification, $stateParams, $window);
	68	+ $window.history = { back: jasmine.createSpy('back') };
	69	+ component.cancel();
	70	+ expect($window.history.back).toHaveBeenCalled();
	71	+ done();
	72	+ });
	73	+
	74	+ it("edit existing article when save", done => {
	75	+ $stateParams['parent_id'] = null;
	76	+ $stateParams['id'] = 2;
	77	+ let component: BasicEditorComponent = new BasicEditorComponent(articleServiceMock, profileServiceMock, $state, notification, $stateParams, $window);
	78	+ component.save();
	79	+ $rootScope.$apply();
	80	+ expect(articleServiceMock.updateArticle).toHaveBeenCalledWith(component.article);
	81	+ done();
	82	+ });
	83	+
	84	+});
...	...
...	...	@@ -0,0 +1,69 @@
	1	+import {StateConfig, Component, Inject, provide} from 'ng-forward';
	2	+import {ArticleService} from "../../../lib/ng-noosfero-api/http/article.service";
	3	+import {ProfileService} from "../../../lib/ng-noosfero-api/http/profile.service";
	4	+import {NotificationService} from "../../shared/services/notification.service.ts";
	5	+
	6	+@Component({
	7	+ selector: 'article-basic-editor',
	8	+ templateUrl: "app/article/basic-editor/basic-editor.html",
	9	+ providers: [
	10	+ provide('articleService', { useClass: ArticleService }),
	11	+ provide('profileService', { useClass: ProfileService }),
	12	+ provide('notification', { useClass: NotificationService })
	13	+ ]
	14	+})
	15	+@Inject(ArticleService, ProfileService, "$state", NotificationService, "$stateParams", "$window")
	16	+export class BasicEditorComponent {
	17	+
	18	+ article: noosfero.Article = <noosfero.Article>{ type: "TextArticle" };
	19	+ parent: noosfero.Article = <noosfero.Article>{};
	20	+
	21	+ id: number;
	22	+ parentId: number;
	23	+ profileIdentifier: string;
	24	+
	25	+ constructor(private articleService: ArticleService,
	26	+ private profileService: ProfileService,
	27	+ private $state: ng.ui.IStateService,
	28	+ private notification: NotificationService,
	29	+ private $stateParams: ng.ui.IStateParamsService,
	30	+ private $window: ng.IWindowService) {
	31	+
	32	+ this.parentId = this.$stateParams['parent_id'];
	33	+ this.profileIdentifier = this.$stateParams["profile"];
	34	+ this.id = this.$stateParams['id'];
	35	+
	36	+ if (this.parentId) {
	37	+ this.articleService.get(this.parentId).then((result: noosfero.RestResult<noosfero.Article>) => {
	38	+ this.parent = result.data;
	39	+ });
	40	+ }
	41	+ if (this.id) {
	42	+ this.articleService.get(this.id).then((result: noosfero.RestResult<noosfero.Article>) => {
	43	+ this.article = result.data;
	44	+ this.article.name = this.article.title; // FIXME
	45	+ });
	46	+ }
	47	+ }
	48	+
	49	+ save() {
	50	+ this.profileService.setCurrentProfileByIdentifier(this.profileIdentifier).then((profile: noosfero.Profile) => {
	51	+ if (this.id) {
	52	+ return this.articleService.updateArticle(this.article);
	53	+ } else {
	54	+ return this.articleService.createInParent(this.parentId, this.article);
	55	+ }
	56	+ }).then((response: noosfero.RestResult<noosfero.Article>) => {
	57	+ let article = (<noosfero.Article>response.data);
	58	+ this.$state.go('main.profile.page', { page: article.path, profile: article.profile.identifier });
	59	+ this.notification.success({ title: "article.basic_editor.success.title", message: "article.basic_editor.success.message" });
	60	+ }).catch(() => {
	61	+ this.notification.error({ message: "article.basic_editor.save.failed" });
	62	+ });
	63	+ }
	64	+
	65	+ cancel() {
	66	+ this.$window.history.back();
	67	+ }
	68	+
	69	+}
...	...
...	...	@@ -0,0 +1,34 @@
	1	+<div class="basic-editor">
	2	+ <div class="row">
	3	+ <div class="col-md-1"></div>
	4	+ <div class="col-md-8">
	5	+ <form>
	6	+ <div class="form-group">
	7	+ <label for="titleInput">{{"article.basic_editor.title" \| translate}}</label>
	8	+ <input type="text" class="form-control" id="titleInput" placeholder="{{'article.basic_editor.title' \| translate}}" ng-model="vm.article.name">
	9	+ </div>
	10	+ <div class="form-group">
	11	+ <label for="bodyInput">{{"article.basic_editor.body" \| translate}}</label>
	12	+ <html-editor [(value)]="vm.article.body"></html-editor>
	13	+ </div>
	14	+ <button type="submit" class="btn btn-default" ng-click="vm.save()">{{"article.basic_editor.save" \| translate}}</button>
	15	+ <button type="button" class="btn btn-danger" ng-click="vm.cancel()">{{"article.basic_editor.cancel" \| translate}}</button>
	16	+ </form>
	17	+ </div>
	18	+ <div class="side-options">
	19	+ <div class="visibility panel panel-default">
	20	+ <div class="panel-heading">{{"article.basic_editor.visibility" \| translate}}</div>
	21	+ <div class="panel-body">
	22	+ <div>
	23	+ <input type="radio" ng-model="vm.article.published" ng-value="true">
	24	+ <i class="fa fa-unlock fa-fw"></i> {{"article.basic_editor.visibility.public" \| translate}}
	25	+ </div>
	26	+ <div>
	27	+ <input type="radio" ng-model="vm.article.published" ng-value="false">
	28	+ <i class="fa fa-lock fa-fw"></i> {{"article.basic_editor.visibility.private" \| translate}}
	29	+ </div>
	30	+ </div>
	31	+ </div>
	32	+ </div>
	33	+ </div>
	34	+</div>
...	...
...	...	@@ -0,0 +1,21 @@
	1	+.basic-editor {
	2	+ @extend .container-fluid;
	3	+ padding: 0 1%;
	4	+
	5	+ .side-options {
	6	+ @extend .col-md-3;
	7	+ margin-top: 25px;
	8	+
	9	+ .visibility {
	10	+ .panel-heading {
	11	+ background-color: transparent;
	12	+ font-weight: bold;
	13	+ }
	14	+ .panel-body {
	15	+ i {
	16	+ color: #A5A5A5;
	17	+ }
	18	+ }
	19	+ }
	20	+ }
	21	+}
...	...
1		-import {providers} from 'ng-forward/cjs/testing/providers';
2		-
3	1	import {Input, Component, provide} from 'ng-forward';
4	2
5	3	import * as helpers from "../../../spec/helpers";
6		-
7		-import {ComponentFixture} from 'ng-forward/cjs/testing/test-component-builder';
	4	+import {ComponentTestHelper, createClass} from '../../../spec/component-test-helper';
8	5	import {ContentViewerActionsComponent} from './content-viewer-actions.component';
9	6
10	7	// this htmlTemplate will be re-used between the container components in this spec file
...	...	@@ -12,56 +9,57 @@ const htmlTemplate: string = '<content-viewer-actions [article]="ctrl.article" [
12	9
13	10	describe('Content Viewer Actions Component', () => {
14	11
15		- beforeEach(() => {
	12	+ let helper: ComponentTestHelper<ContentViewerActionsComponent>;
16	13
17		- angular.mock.module("templates");
	14	+ beforeEach(angular.mock.module("templates"));
18	15
19		- providers((provide: any) => {
20		- return <any>[
21		- provide('ProfileService', {
22		- useValue: helpers.mocks.profileService
23		- })
24		- ];
25		- });
26		- });
	16	+ let providers = [
	17	+ provide('ProfileService', {
	18	+ useValue: helpers.mocks.profileService
	19	+ }),
	20	+ provide('ArticleService', {
	21	+ useValue: helpers.mocks.articleService
	22	+ })
	23	+ ].concat(helpers.provideFilters("translateFilter"));
27	24
28		- let buildComponent = (): Promise<ComponentFixture> => {
29		- return helpers.quickCreateComponent({
30		- providers: [
31		- helpers.provideEmptyObjects('Restangular'),
32		- helpers.provideFilters('translateFilter')
33		- ],
	25	+ beforeEach((done) => {
	26	+ let cls = createClass({
	27	+ template: htmlTemplate,
34	28	directives: [ContentViewerActionsComponent],
35		- template: htmlTemplate
	29	+ providers: providers
36	30	});
37		- };
	31	+ helper = new ComponentTestHelper<ContentViewerActionsComponent>(cls, done);
	32	+ });
38	33
39		- it('renders content viewer actions directive', (done: Function) => {
40		- buildComponent().then((fixture: ComponentFixture) => {
41		- expect(fixture.debugElement.query('content-viewer-actions').length).toEqual(1);
	34	+ it('renders content viewer actions directive', () => {
	35	+ expect(helper.all("content-viewer-actions").length).toEqual(1);
	36	+ });
42	37
43		- done();
44		- });
	38	+ it('return article parent as container when it is not a folder', () => {
	39	+ let article = <noosfero.Article>({ id: 1, type: 'TextArticle', parent: { id: 2 } });
	40	+ expect(helper.component.getArticleContainer(article)).toEqual(2);
	41	+ });
	42	+
	43	+ it('return article as container when it is a folder', () => {
	44	+ let article = <noosfero.Article>({ id: 1, type: 'Folder' });
	45	+ expect(helper.component.getArticleContainer(article)).toEqual(1);
45	46	});
46	47
47		- it('check if profile was loaded', (done: Function) => {
	48	+ it('return article as container when it is a blog', () => {
	49	+ let article = <noosfero.Article>({ id: 1, type: 'Blog' });
	50	+ expect(helper.component.getArticleContainer(article)).toEqual(1);
	51	+ });
	52	+
	53	+ it('check if profile was loaded', () => {
48	54	let profile: any = {
49	55	id: 1,
50	56	identifier: 'the-profile-test',
51	57	type: 'Person'
52	58	};
53		-
54	59	helpers.mocks.profileService.getCurrentProfile = () => {
55	60	return helpers.mocks.promiseResultTemplate(profile);
56	61	};
57		-
58		- buildComponent().then((fixture: ComponentFixture) => {
59		- let contentViewerComp: ContentViewerActionsComponent = fixture.debugElement.componentViewChildren[0].componentInstance;
60		-
61		- expect(contentViewerComp.profile).toEqual(jasmine.objectContaining(profile));
62		-
63		- done();
64		- });
	62	+ let component = new ContentViewerActionsComponent(<any>helpers.mocks.profileService, <any>helpers.mocks.articleService);
	63	+ expect(component.profile).toEqual(jasmine.objectContaining(profile));
65	64	});
66		-
67	65	});
...	...