Download as
Browse Code »

Commit 27d8cca6b14b4480c90f5fb1f9360478687485c6

Authored by ABNER SILVA DE OLIVEIRA
2 parents 7044b1ae e97ae87b
Exists in master and in 31 other branches activities_block, btn-new-post, cleaning-the-house, cosmetic_changes_people_and_communities_block, edit-blocks, edit-header-footer, env-tags-block, forgot_password, header_and_footer, layout_support, list_articles_on_blog, loading-indicator-component, login_modal, login_modal_improve, person_info_block, profile-article-resolvers, profile-blocks-sass, profile_description_block_component, profile_page_improvements, recent-activities, remove-article-confirmation, responsive-fixes, seo, signup_page, skin-small-change, staging, tags-block, theme-skin-yellow, translations, updated_signup_page, users_profile_page

Merge branch 'ngforward' into cleaning-the-house

Showing 4 changed files with 6 additions and 6 deletions   Show diff stats
src/app/components/language-selector/language-selector.component.spec.ts
  Diff comments   View file @27d8cca
... ... @@ -14,7 +14,7 @@ describe("Components", () => {
14 14 let translatorService: any;
15 15  
16 16 let buildComponent = (): Promise<ComponentFixture> => {
17   - translatorService = jasmine.createSpyObj("translatorService", ["availableLanguages", "currentLanguage"])
  17 + translatorService = jasmine.createSpyObj("translatorService", ["availableLanguages", "currentLanguage"]);
18 18 return helpers.quickCreateComponent({
19 19 template: "<language-selector></language-selector>",
20 20 directives: [LanguageSelector],
... ...
src/app/index.module.ts
  Diff comments   View file @27d8cca
... ... @@ -15,13 +15,13 @@ export class NoosferoApp {
15 15 * @returns {string} the name of this application ('noosferoApp')
16 16 */
17 17 static appName: string = "noosferoApp";
18   -
  18 +
19 19 /**
20 20 * @ngdoc property
21 21 * @name angularModule
22 22 * @propertyOf NoosferoApp
23 23 * @returns {any} all the modules installed for this application
24   - */
  24 + */
25 25 static angularModule: any;
26 26  
27 27 /**
... ...
src/lib/ng-noosfero-api/http/article.service.spec.ts
  Diff comments   View file @27d8cca
... ... @@ -63,7 +63,7 @@ describe(&quot;Services&quot;, () =&gt; {
63 63 it("should create an article in a profile", (done) => {
64 64 let profileId = 1;
65 65 let article: noosfero.Article = <any>{ id: null};
66   - $httpBackend.expectPOST(`/api/v1/profiles/${profileId}/articles`, article).respond(200, {article: { id: 2 }});
  66 + $httpBackend.expectPOST(`/api/v1/profiles/${profileId}/articles`, { article: article }).respond(200, {article: { id: 2 }});
67 67 articleService.createInProfile(<noosfero.Profile>{id: profileId}, article).then((result: noosfero.RestResult<noosfero.Article>) => {
68 68 expect(result.data).toEqual({ id: 2 });
69 69 done();
... ...
src/lib/ng-noosfero-api/http/article.service.ts
  Diff comments   View file @27d8cca
... ... @@ -28,7 +28,7 @@ export class ArticleService extends RestangularService&lt;noosfero.Article&gt; {
28 28 (<any>profileElement).id = profile.id;
29 29 let headers = {
30 30 'Content-Type': 'application/json'
31   - }
  31 + };
32 32 return this.create(article, <noosfero.RestModel>profileElement, null, headers);
33 33 }
34 34  
... ... @@ -67,7 +67,7 @@ export class ArticleService extends RestangularService&lt;noosfero.Article&gt; {
67 67  
68 68 getOneByProfile<T>(profile: noosfero.Profile, params?: any): ng.IPromise<noosfero.RestResult<noosfero.Article>> {
69 69 let profileElement = this.profileService.get(<number>profile.id);
70   - return this.getSub(profileElement, params);;
  70 + return this.getSub(profileElement, params);
71 71 }
72 72  
73 73 getChildren<T>(article: noosfero.Article, params?: any): ng.IPromise<noosfero.RestResult<noosfero.Article[]>> {
... ...