diff --git a/src/components/img/test/basic/app-module.ts b/src/components/img/test/basic/app-module.ts index 0a15a08de1..988467d2c9 100644 --- a/src/components/img/test/basic/app-module.ts +++ b/src/components/img/test/basic/app-module.ts @@ -20,17 +20,17 @@ export class E2EPage { { width: '100', height: '44', - src: 'http://localhost:8000/dist/e2e/img/img/batmobile.jpg' + src: '../img/img/batmobile.jpg' }, { width: '100', height: '75', - src: 'http://localhost:8000/dist/e2e/img/img/knight-rider.jpg' + src: '../img/img/knight-rider.jpg' }, { width: '100', height: '68', - src: 'http://localhost:8000/dist/e2e/img/img/general-lee.jpg' + src: '../img/img/general-lee.jpg' } ]; @@ -52,7 +52,9 @@ export class E2EApp { MyImg ], imports: [ - IonicModule.forRoot(E2EApp) + IonicModule.forRoot(E2EApp, { + imgWorkerUrl: '/dist/e2e/workers/ion-img-worker.js' + }) ], bootstrap: [IonicApp], entryComponents: [ diff --git a/src/components/img/test/basic/main.html b/src/components/img/test/basic/main.html index 116e10eaa3..135c793d8e 100644 --- a/src/components/img/test/basic/main.html +++ b/src/components/img/test/basic/main.html @@ -26,13 +26,13 @@ - + Loaded Avatar - + @@ -68,13 +68,13 @@ - + Loaded Thumbnail - + @@ -83,7 +83,7 @@
Default ion-img w/in content, display: inline-block. - + has width, height and alt set.
diff --git a/src/components/img/test/cards/app-module.ts b/src/components/img/test/cards/app-module.ts index f57350ad6b..ce6065c133 100644 --- a/src/components/img/test/cards/app-module.ts +++ b/src/components/img/test/cards/app-module.ts @@ -29,7 +29,9 @@ export class E2EApp { E2EPage ], imports: [ - IonicModule.forRoot(E2EApp) + IonicModule.forRoot(E2EApp, { + imgWorkerUrl: '/dist/e2e/workers/ion-img-worker.js' + }) ], bootstrap: [IonicApp], entryComponents: [ diff --git a/src/components/img/test/cards/main.html b/src/components/img/test/cards/main.html index 4541662fa6..2837ede61a 100644 --- a/src/components/img/test/cards/main.html +++ b/src/components/img/test/cards/main.html @@ -15,22 +15,22 @@ - +

Item thumbnail right

ion-img left

- + - +

Item avatar left

ion-img right

Isn't it beautiful.

- + diff --git a/src/components/img/test/img.spec.ts b/src/components/img/test/img.spec.ts index 2223fe6d82..54cee66279 100644 --- a/src/components/img/test/img.spec.ts +++ b/src/components/img/test/img.spec.ts @@ -2,7 +2,7 @@ import { ElementRef, Renderer } from '@angular/core'; import { Content } from '../../content/content'; import { Img } from '../img'; import { ImgLoader } from '../img-loader'; -import { mockContent, MockDomController, mockElementRef, mockPlatform, mockRenderer, mockZone } from '../../../util/mock-providers'; +import { mockConfig, mockContent, MockDomController, mockElementRef, mockPlatform, mockRenderer, mockZone } from '../../../util/mock-providers'; import { Platform } from '../../../platform/platform'; @@ -79,7 +79,7 @@ describe('Img', () => { beforeEach(() => { content = mockContent(); - ldr = new ImgLoader(); + ldr = new ImgLoader(mockConfig()); elementRef = mockElementRef(); renderer = mockRenderer(); platform = mockPlatform(); diff --git a/src/components/img/test/lazy-load/app-module.ts b/src/components/img/test/lazy-load/app-module.ts index 559813021d..5824c6c7b4 100644 --- a/src/components/img/test/lazy-load/app-module.ts +++ b/src/components/img/test/lazy-load/app-module.ts @@ -24,7 +24,9 @@ export class E2EApp { E2EPage ], imports: [ - IonicModule.forRoot(E2EApp) + IonicModule.forRoot(E2EApp, { + imgWorkerUrl: '/dist/e2e/workers/ion-img-worker.js' + }) ], bootstrap: [IonicApp], entryComponents: [ diff --git a/src/components/img/test/lazy-load/main.html b/src/components/img/test/lazy-load/main.html index bcfccf310d..ff3b48c0a6 100644 --- a/src/components/img/test/lazy-load/main.html +++ b/src/components/img/test/lazy-load/main.html @@ -12,13 +12,13 @@ - + Thumbnail - + @@ -26,13 +26,13 @@ - + Thumbnail - + @@ -40,13 +40,13 @@ - + Thumbnail - + @@ -54,13 +54,13 @@ - + Thumbnail - + @@ -68,13 +68,13 @@ - + Thumbnail - + @@ -82,13 +82,13 @@ - + Thumbnail - + @@ -96,13 +96,13 @@ - + Thumbnail - + @@ -110,13 +110,13 @@ - + Thumbnail - + @@ -124,13 +124,13 @@ - + Thumbnail - + @@ -138,13 +138,13 @@ - + Thumbnail - + @@ -152,13 +152,13 @@ - + Thumbnail - + @@ -166,13 +166,13 @@ - + Thumbnail - + @@ -180,13 +180,13 @@ - + Thumbnail - + @@ -194,13 +194,13 @@ - + Thumbnail - + @@ -208,13 +208,13 @@ - + Thumbnail - + @@ -222,13 +222,13 @@ - + Thumbnail - + @@ -236,13 +236,13 @@ - + Thumbnail - + @@ -250,13 +250,13 @@ - + Thumbnail - + @@ -264,13 +264,13 @@ - + Thumbnail - + @@ -278,13 +278,13 @@ - + Thumbnail - + @@ -292,13 +292,13 @@ - + Thumbnail - + @@ -306,13 +306,13 @@ - + Thumbnail - + @@ -320,13 +320,13 @@ - + Thumbnail - + @@ -334,13 +334,13 @@ - + Thumbnail - + @@ -348,13 +348,13 @@ - + Thumbnail - + @@ -362,13 +362,13 @@ - + Thumbnail - + @@ -376,13 +376,13 @@ - + Thumbnail - + @@ -390,13 +390,13 @@ - + Thumbnail - + @@ -404,13 +404,13 @@ - + Thumbnail - + @@ -418,13 +418,13 @@ - + Thumbnail - + @@ -432,13 +432,13 @@ - + Thumbnail - + @@ -446,13 +446,13 @@ - + Thumbnail - + @@ -460,13 +460,13 @@ - + Thumbnail - + @@ -474,13 +474,13 @@ - + Thumbnail - + @@ -488,13 +488,13 @@ - + Thumbnail - + @@ -502,13 +502,13 @@ - + Thumbnail - + @@ -516,13 +516,13 @@ - + Thumbnail - + @@ -530,13 +530,13 @@ - + Thumbnail - + @@ -544,13 +544,13 @@ - + Thumbnail - + @@ -558,13 +558,13 @@ - + Thumbnail - + @@ -572,13 +572,13 @@ - + Thumbnail - + @@ -586,13 +586,13 @@ - + Thumbnail - + @@ -600,13 +600,13 @@ - + Thumbnail - + @@ -614,13 +614,13 @@ - + Thumbnail - + @@ -628,13 +628,13 @@ - + Thumbnail - + @@ -642,13 +642,13 @@ - + Thumbnail - + @@ -656,13 +656,13 @@ - + Thumbnail - + @@ -670,13 +670,13 @@ - + Thumbnail - + diff --git a/src/components/img/test/list/app-module.ts b/src/components/img/test/list/app-module.ts index 2a452a991f..06d4dc6539 100644 --- a/src/components/img/test/list/app-module.ts +++ b/src/components/img/test/list/app-module.ts @@ -35,7 +35,7 @@ const images = [ function getRandomImg(): string { let imgString = images[Math.floor(Math.random() * images.length)]; - let src = 'http://localhost:8000/dist/e2e/img/img/' + imgString; + let src = '../img/img/' + imgString; return src; } @@ -54,7 +54,9 @@ export class E2EApp { E2EPage ], imports: [ - IonicModule.forRoot(E2EApp) + IonicModule.forRoot(E2EApp, { + imgWorkerUrl: '/dist/e2e/workers/ion-img-worker.js' + }) ], bootstrap: [IonicApp], entryComponents: [ diff --git a/src/components/virtual-scroll/test/basic/app-module.ts b/src/components/virtual-scroll/test/basic/app-module.ts index 57b0bb0934..c0aa84baee 100644 --- a/src/components/virtual-scroll/test/basic/app-module.ts +++ b/src/components/virtual-scroll/test/basic/app-module.ts @@ -60,7 +60,9 @@ export class E2EApp { E2EPage ], imports: [ - IonicModule.forRoot(E2EApp) + IonicModule.forRoot(E2EApp, { + imgWorkerUrl: '/dist/e2e/workers/ion-img-worker.js' + }) ], bootstrap: [IonicApp], entryComponents: [ diff --git a/src/components/virtual-scroll/test/cards/app-module.ts b/src/components/virtual-scroll/test/cards/app-module.ts index 1ea80880cd..5b38682ce3 100644 --- a/src/components/virtual-scroll/test/cards/app-module.ts +++ b/src/components/virtual-scroll/test/cards/app-module.ts @@ -41,7 +41,9 @@ export class E2EApp { E2EPage ], imports: [ - IonicModule.forRoot(E2EApp) + IonicModule.forRoot(E2EApp, { + imgWorkerUrl: '/dist/e2e/workers/ion-img-worker.js' + }) ], bootstrap: [IonicApp], entryComponents: [ diff --git a/src/components/virtual-scroll/test/image-gallery/app-module.ts b/src/components/virtual-scroll/test/image-gallery/app-module.ts index 80497b6b6b..8d844d5659 100644 --- a/src/components/virtual-scroll/test/image-gallery/app-module.ts +++ b/src/components/virtual-scroll/test/image-gallery/app-module.ts @@ -87,7 +87,9 @@ export class E2EApp { E2EPage ], imports: [ - IonicModule.forRoot(E2EApp) + IonicModule.forRoot(E2EApp, { + imgWorkerUrl: '/dist/e2e/workers/ion-img-worker.js' + }) ], bootstrap: [IonicApp], entryComponents: [ diff --git a/src/components/virtual-scroll/test/list/app-module.ts b/src/components/virtual-scroll/test/list/app-module.ts index e3c5e93524..1eba0fcba1 100644 --- a/src/components/virtual-scroll/test/list/app-module.ts +++ b/src/components/virtual-scroll/test/list/app-module.ts @@ -116,7 +116,9 @@ export class E2EApp { E2EPage ], imports: [ - IonicModule.forRoot(E2EApp) + IonicModule.forRoot(E2EApp, { + imgWorkerUrl: '/dist/e2e/workers/ion-img-worker.js' + }) ], bootstrap: [IonicApp], entryComponents: [ diff --git a/src/components/virtual-scroll/test/list/main.html b/src/components/virtual-scroll/test/list/main.html index 82f8d73d03..390077810c 100644 --- a/src/components/virtual-scroll/test/list/main.html +++ b/src/components/virtual-scroll/test/list/main.html @@ -26,13 +26,13 @@ - +

{{item.id}}, top: {{itemBounds.top}}, bottom: {{itemBounds.bottom}}, height: {{itemBounds.height}}