new helpers methods

Ábner Oliveira
1 parent e882651c
Showing 2 changed files with 57 additions and 23 deletions Show diff stats
src/app/components/noosfero-articles/blog/blog.component.spec.ts
src/spec/helpers.ts
@@ -12,7 +12,7 @@ import {
     quickCreateComponent,
     provideEmptyObjects,
     createProviderToValue,
-    getAngularService
+    getQService
 } from "../../../../spec/helpers.ts";
@@ -21,7 +21,7 @@ const htmlTemplate: string = &#39;&lt;noosfero-blog [article]=&quot;ctrl.article&quot; [profile]=
 let articleService: {
     getChildren: Function
-} = < any > {};
+} = <any>{};
 describe("Blog Component", () => {
@@ -31,7 +31,7 @@ describe(&quot;Blog Component&quot;, () =&gt; {
     // component Noosfero ArtileView will be load on our tests
     beforeEach(angular.mock.module("templates"));
-    function promiseResultTemplate(response ? : {}) {
+    function promiseResultTemplate(response?: {}) {
         let thenFuncEmpty = (func: Function) => {
             // does nothing
         };
@@ -90,7 +90,7 @@ describe(&quot;Blog Component&quot;, () =&gt; {
     });
     it("get $q service", () => {
-        let $q = getAngularService<ng.IQService>("$q");
+        let $q: ng.IQService = getQService();
         console.log($q);
     });
@@ -102,7 +102,7 @@ describe(&quot;Blog Component&quot;, () =&gt; {
                 headers: (headerName: string) => {
                     return 1;
                 },
-                data: < any > {
+                data: <any>{
                     articles: []
                 }
             });
@@ -128,9 +128,9 @@ describe(&quot;Blog Component&quot;, () =&gt; {
             // gets the children component of BlogContainerComponent
             let articleBlog: BlogContainerComponent = fixture.debugElement.componentViewChildren[0].componentInstance;
-            // check if the component property are the provided by the mocked articleService 
-            expect(( < any > articleBlog)["posts"]).toEqual([]);
-            expect(( < any > articleBlog)["totalPosts"]).toEqual(1);
+            // check if the component property are the provided by the mocked articleService
+            expect((<any>articleBlog)["posts"]).toEqual([]);
+            expect((<any>articleBlog)["totalPosts"]).toEqual(1);
             // done needs to be called (it isn't really needed, as we can read in
@@ -142,4 +142,4 @@ describe(&quot;Blog Component&quot;, () =&gt; {
     });
-});
 \ No newline at end of file
+});
@@ -48,28 +48,62 @@ export function provideFilters(...filters: string[]) {
     return providers;
 }
+
+@Component({
+    selector: 'helper_get_angular_service',
+    template: 'not-used',
+    providers: []
+})
+class AngularServiceHookComponent {
+    constructor() {
+
+    }
+}
+
+class AngularServiceFactory {
+    fixtureComponentHookPoint: ComponentFixture;
+    tcb: TestComponentBuilder = new TestComponentBuilder();
+
+    constructor() {
+        this.fixtureComponentHookPoint = (<any>this.tcb)["create"](AngularServiceHookComponent);
+    }
+
+    getAngularService<T>(angularService: string) {
+        return this.fixtureComponentHookPoint.debugElement.getLocal(angularService);
+    }
+
+    getQService(): ng.IQService {
+        return this.getAngularService<ng.IQService>("$q");
+    }
+
+    getHttpBackendService(): ng.IHttpBackendService {
+        return this.getAngularService<ng.IHttpBackendService>("$httpBackend");
+    }
+}
+
+export var angularServiceFactory = new AngularServiceFactory();
 /**
  * This help function allows get angular services to be used in integration tests
  * i.e: '$http', '$q', '$location', etc...
  */
 export function getAngularService<T>(angularService: string) {
-    let tcb: TestComponentBuilder = new TestComponentBuilder();
-
-    @Component({
-        selector: 'helper_get_angular_service',
-        template: 'not-used',
-        providers: []
-    })
-    class AnyService {
-        constructor() {
+    return angularServiceFactory.getAngularService(angularService);
+}
-        }
-    }
+export function getQService(): ng.IQService {
+    return angularServiceFactory.getQService();
+}
-    let fixture: ComponentFixture = (<any>tcb)["create"](AnyService);
-    return fixture.debugElement.getLocal(angularService);
+export function getHttpBackendService(): ng.IHttpBackendService {
+    return angularServiceFactory.getHttpBackendService();
 }
+// export function getResolvablePromise() {
+//     let $q = getQService();
+//
+//     return null;
+// }
+
 export var fixtures = {
     user: {
         id: 1,
@@ -82,4 +116,4 @@ export var fixtures = {
         private_token: 'token',
         userRole: 'admin'
     }
-};
 \ No newline at end of file
+};
	@@ -48,28 +48,62 @@ export function provideFilters(...filters: string[]) {		@@ -48,28 +48,62 @@ export function provideFilters(...filters: string[]) {
48	return providers;	48	return providers;
49	}	49	}
50		50
		51	+
		52	+@Component({
		53	+ selector: 'helper_get_angular_service',
		54	+ template: 'not-used',
		55	+ providers: []
		56	+})
		57	+class AngularServiceHookComponent {
		58	+ constructor() {
		59	+
		60	+ }
		61	+}
		62	+
		63	+class AngularServiceFactory {
		64	+ fixtureComponentHookPoint: ComponentFixture;
		65	+ tcb: TestComponentBuilder = new TestComponentBuilder();
		66	+
		67	+ constructor() {
		68	+ this.fixtureComponentHookPoint = (<any>this.tcb)["create"](AngularServiceHookComponent);
		69	+ }
		70	+
		71	+ getAngularService<T>(angularService: string) {
		72	+ return this.fixtureComponentHookPoint.debugElement.getLocal(angularService);
		73	+ }
		74	+
		75	+ getQService(): ng.IQService {
		76	+ return this.getAngularService<ng.IQService>("$q");
		77	+ }
		78	+
		79	+ getHttpBackendService(): ng.IHttpBackendService {
		80	+ return this.getAngularService<ng.IHttpBackendService>("$httpBackend");
		81	+ }
		82	+}
		83	+
		84	+export var angularServiceFactory = new AngularServiceFactory();
51	/**	85	/**
52	* This help function allows get angular services to be used in integration tests	86	* This help function allows get angular services to be used in integration tests
53	* i.e: '$http', '$q', '$location', etc...	87	* i.e: '$http', '$q', '$location', etc...
54	*/	88	*/
55	export function getAngularService<T>(angularService: string) {	89	export function getAngularService<T>(angularService: string) {
56	- let tcb: TestComponentBuilder = new TestComponentBuilder();
57	-
58	- @Component({
59	- selector: 'helper_get_angular_service',
60	- template: 'not-used',
61	- providers: []
62	- })
63	- class AnyService {
64	- constructor() {	90	+ return angularServiceFactory.getAngularService(angularService);
		91	+}
65		92
66	- }
67	- }	93	+export function getQService(): ng.IQService {
		94	+ return angularServiceFactory.getQService();
		95	+}
68		96
69	- let fixture: ComponentFixture = (<any>tcb)["create"](AnyService);
70	- return fixture.debugElement.getLocal(angularService);	97	+export function getHttpBackendService(): ng.IHttpBackendService {
		98	+ return angularServiceFactory.getHttpBackendService();
71	}	99	}
72		100
		101	+// export function getResolvablePromise() {
		102	+// let $q = getQService();
		103	+//
		104	+// return null;
		105	+// }
		106	+
73	export var fixtures = {	107	export var fixtures = {
74	user: {	108	user: {
75	id: 1,	109	id: 1,
	@@ -82,4 +116,4 @@ export var fixtures = {		@@ -82,4 +116,4 @@ export var fixtures = {
82	private_token: 'token',	116	private_token: 'token',
83	userRole: 'admin'	117	userRole: 'admin'
84	}	118	}
85	-};
86	\ No newline at end of file	119	\ No newline at end of file
		120	+};