Fixed tests

Carlos Purificação
1 parent 24a44ec4
Showing 9 changed files with 41 additions and 8 deletions Show diff stats
src/app/admin/layout-edit/designMode.service.spec.ts
src/app/admin/layout-edit/designModeToggler.component.spec.ts
src/app/layout/blocks/block.component.spec.ts
src/app/layout/blocks/block.component.ts
src/app/layout/navbar/navbar.spec.ts
src/app/layout/services/body-state-classes.service.spec.ts
src/app/login/session.service.spec.ts
src/app/profile/custom-content/custom-content.component.spec.ts
src/spec/mocks.ts
 import {DesignModeService} from './designMode.service';
+import {INoosferoLocalStorage} from "./../../shared/models/interfaces";
 describe('DesignMode Service', () => {
     let service: DesignModeService;
+    let $localStorage = <INoosferoLocalStorage>{ currentUser: null, settings: { designMode: false } };    
     beforeEach(() => {
-        service = new DesignModeService();
+        service = new DesignModeService($localStorage);
     });
     it('has the designModeOn equals false as default', () => {
@@ -18,12 +20,14 @@ describe(&#39;DesignMode Service&#39;, () =&gt; {
     });
     it('emits the onToggle event when changing the designModeOn property', () => {
+        service.setInDesignMode(false);
         spyOn(service.onToggle, 'next').and.stub();
         service.setInDesignMode(true);
         expect(service.onToggle.next).toHaveBeenCalled();
     });
     it('does not emit onToggle event when there is no change on designModeOn property', () => {
+        service.setInDesignMode(false);
         spyOn(service.onToggle, 'next').and.stub();
         service.setInDesignMode(false);
         expect(service.onToggle.next).not.toHaveBeenCalled();
@@ -2,6 +2,7 @@ import {ComponentTestHelper, createClass} from &#39;../../../spec/component-test-hel
 import * as helpers from '../../../spec/helpers';
 import {DesignModeTogglerComponent} from './designModeToggler.component';
 import {DesignModeService} from './designMode.service';
+import {INoosferoLocalStorage} from "./../../shared/models/interfaces";
 describe('DesignModeToggler Component', () => {
     const htmlTemplate: string = '<noosfero-design-toggler></noosfero-design-toggler>';
@@ -14,8 +15,9 @@ describe(&#39;DesignModeToggler Component&#39;, () =&gt; {
     });
     let designModeService: DesignModeService;
+    let $localStorage = <INoosferoLocalStorage>{ currentUser: null, settings: { designMode: false } };
     beforeEach((done) => {
-        designModeService = new DesignModeService();
+        designModeService = new DesignModeService($localStorage);
         let cls = createClass({
             template: htmlTemplate,
             directives: [DesignModeTogglerComponent],
@@ -36,6 +38,7 @@ describe(&#39;DesignModeToggler Component&#39;, () =&gt; {
     });
     it('emits event with value "true" when changing inDesignMode to On', (done) => {
+        designModeService.setInDesignMode(false);
         designModeService.onToggle.subscribe((designModeOn: boolean) => {
             expect(designModeOn).toBeTruthy();
             done();
@@ -2,6 +2,7 @@ import {Component} from &#39;ng-forward&#39;;
 import {BlockComponent} from './block.component';
 import * as helpers from "../../../spec/helpers";
 import {ComponentTestHelper, createClass} from '../../../spec/component-test-helper';
+import {DesignModeService} from '../../admin/layout-edit/designMode.service';
 const htmlTemplate: string = '<noosfero-block [block]="ctrl.block" [owner]="ctrl.profile"></noosfero-block>';
@@ -32,16 +33,17 @@ describe(&quot;Boxes Component&quot;, () =&gt; {
                 helpers.createProviderToValue('TranslatorService', translatorService),
                 helpers.createProviderToValue('$uibModal', helpers.mocks.$modal),
                 helpers.createProviderToValue('BlockService', blockService),
-                helpers.createProviderToValue('NotificationService', helpers.mocks.notificationService)
+                helpers.createProviderToValue('NotificationService', helpers.mocks.notificationService),
+                helpers.createProviderToValue('DesignModeService', helpers.mocks.designModeService)
             ]
         });
         helper = new ComponentTestHelper<BlockComponent>(cls, done);
     });
-
     let translatorService = jasmine.createSpyObj("translatorService", ["currentLanguage"]);
     let blockService = jasmine.createSpyObj("blockService", ["update"]);
     let state = jasmine.createSpyObj("state", ["current"]);
     state.current = { name: "" };
+    
     it("set isHomepage as false by default", () => {
         expect(helper.component.isHomepage).toBeFalsy();
@@ -11,7 +11,8 @@ import { DesignModeService } from &quot;../../admin/layout-edit/designMode.service&quot;;
     templateUrl: 'app/layout/blocks/block.html',
     directives: [BlockEditionComponent]
 })
-@Inject("$uibModal", "$scope", "$state", "$rootScope", BlockService, NotificationService, AuthService, SessionService, TranslatorService, DesignModeService)
+@Inject("$uibModal", "$scope", "$state", "$rootScope", BlockService, NotificationService, 
+AuthService, SessionService, TranslatorService, DesignModeService)
 export class BlockComponent {
     @Input() block: noosfero.Block;
@@ -9,6 +9,8 @@ import {SessionService, AuthService, AuthController, AuthEvents} from &quot;./../../l
 import events from 'ng-forward/cjs/events/events';
+import {DesignModeService} from '../../admin/layout-edit/designMode.service';
+
 describe("Components", () => {
     describe("Navbar Component", () => {
@@ -22,6 +24,7 @@ describe(&quot;Components&quot;, () =&gt; {
         let authService: any;
         let stateService: any;
         let sessionService: SessionService;
+        let designModeService: DesignModeService;
         let provideFunc = provide;
@@ -37,6 +40,7 @@ describe(&quot;Components&quot;, () =&gt; {
             authService = helpers.mocks.authService;
             stateService = jasmine.createSpyObj("$state", ["go"]);
             sessionService = <any>helpers.mocks.sessionWithCurrentUser(user);
+            designModeService = helpers.mocks.designModeService;
         });
@@ -76,6 +80,9 @@ describe(&quot;Components&quot;, () =&gt; {
                     }),
                     provide('TranslatorService', {
                         useValue: helpers.mocks.translatorService
+                    }),
+                    provide('DesignModeService', {
+                        useValue: helpers.mocks.designModeService
                     })
                 ].concat(helpers.provideFilters("translateFilter")),
                 directives: [Navbar],
@@ -5,11 +5,13 @@ import {AuthEvents} from &quot;./../../login/auth-events&quot;;
 import {EventEmitter} from 'ng-forward';
 import {DesignModeService} from './../../admin/layout-edit/designMode.service';
+import {INoosferoLocalStorage} from "./../../shared/models/interfaces";
 describe("BodyStateClasses Service", () => {
     let currentStateName = "main";
     let bodyStateClasseService: BodyStateClassesService;
+    let $localStorage = <INoosferoLocalStorage>{ currentUser: null, settings: { designMode: false } };
     let $rootScope: ng.IRootScopeService = <any>{},
         $document: ng.IDocumentService = <any>{},
         $state: ng.ui.IStateService = <any>{
@@ -20,7 +22,8 @@ describe(&quot;BodyStateClasses Service&quot;, () =&gt; {
         authService: any = helpers.mocks.authService,
         bodyEl: { className: string },
         bodyElJq: any,
-        designModeService = new DesignModeService();
+        
+        designModeService = new DesignModeService($localStorage);
@@ -13,7 +13,7 @@ describe(&quot;Services&quot;, () =&gt; {
         let $log: any;
         beforeEach(() => {
-            $localStorage = <INoosferoLocalStorage>{ currentUser: null };
+            $localStorage = <INoosferoLocalStorage>{ currentUser: null, settings: null };
             $log = jasmine.createSpyObj('$log', ['debug']);
         });
 import {CustomContentComponent} from './custom-content.component';
 import {ComponentTestHelper, createClass} from '../../../spec/component-test-helper';
 import * as helpers from "../../../spec/helpers";
+import {DesignModeService} from '../../admin/layout-edit/designMode.service';
 const htmlTemplate: string = '<custom-content [attribute]="\'custom_footer\'" [profile]="ctrl.profile"></custom-content>';
@@ -22,7 +23,8 @@ describe(&quot;Components&quot;, () =&gt; {
                 providers: [
                     helpers.createProviderToValue("$uibModal", helpers.mocks.$modal),
                     helpers.createProviderToValue("ProfileService", profileService),
-                    helpers.createProviderToValue("NotificationService", notificationService)
+                    helpers.createProviderToValue("NotificationService", notificationService),
+                    helpers.createProviderToValue("DesignModeService", helpers.mocks.designModeService)
                 ]
             });
             helper = new ComponentTestHelper<CustomContentComponent>(cls, done);
@@ -193,6 +193,17 @@ export var mocks: any = {
             currentUser: () => { return user; }
         };
     },
+    designModeService: {
+        modeFn: null,
+        onToggle: {
+            subscribe: (fn: Function) => {
+                mocks.designModeService.modeFn = fn;
+            },
+            next: (param: any) => {
+                mocks.designModeService.modeFn(param);
+            }
+        }
+    },
     $translate: {
         use: (lang?: string) => {
             return lang ? Promise.resolve(lang) : "en";
	@@ -13,7 +13,7 @@ describe("Services", () => {		@@ -13,7 +13,7 @@ describe("Services", () => {
13	let $log: any;	13	let $log: any;
14		14
15	beforeEach(() => {	15	beforeEach(() => {
16	- $localStorage = <INoosferoLocalStorage>{ currentUser: null };	16	+ $localStorage = <INoosferoLocalStorage>{ currentUser: null, settings: null };
17	$log = jasmine.createSpyObj('$log', ['debug']);	17	$log = jasmine.createSpyObj('$log', ['debug']);
18	});	18	});
19		19
	@@ -193,6 +193,17 @@ export var mocks: any = {		@@ -193,6 +193,17 @@ export var mocks: any = {
193	currentUser: () => { return user; }	193	currentUser: () => { return user; }
194	};	194	};
195	},	195	},
		196	+ designModeService: {
		197	+ modeFn: null,
		198	+ onToggle: {
		199	+ subscribe: (fn: Function) => {
		200	+ mocks.designModeService.modeFn = fn;
		201	+ },
		202	+ next: (param: any) => {
		203	+ mocks.designModeService.modeFn(param);
		204	+ }
		205	+ }
		206	+ },
196	$translate: {	207	$translate: {
197	use: (lang?: string) => {	208	use: (lang?: string) => {
198	return lang ? Promise.resolve(lang) : "en";	209	return lang ? Promise.resolve(lang) : "en";