fix: added test cases for missing scenarios, fixes #1

Author: vvdwivedi

sdk/lib/src/imagekitio-angular/ik-upload/ik-upload.component.ts

@@ -24,19 +24,26 @@ export class IkUploadComponent implements OnInit {
   }
 
   handleFileInput(e) {
+    const onError = this.onError;
+    const onSuccess = this.onSuccess;
     const files = e.target.files;
     this.fileToUpload = files.item(0);
     if (this.onFileInput) {
       this.onFileInput(e);
       return;
     }
-    this.upload(this.fileToUpload, this.fileName, this.useUniqueFileName, this.tags, this.folder, this.isPrivateFile, this.customCoordinates, this.responseFields)
+    const params = this.getUploadParams(this.fileToUpload, this.fileName, this.useUniqueFileName, this.tags, this.folder, this.isPrivateFile, this.customCoordinates, this.responseFields)
+    const ik = this.imagekit.ikInstance;
+    ik.upload(params, function (err, result) {
+      if (err) {
+        onError.emit(err);
+      } else {
+        onSuccess.emit(result);
+      }
+    });
   }
 
-  upload(file, fileName, useUniqueFileName, tags, folder, isPrivateFile, customCoordinates, responseFields) {
-    let ik = this.imagekit.ikInstance;
-    const onError = this.onError;
-    const onSuccess = this.onSuccess;
+  getUploadParams(file, fileName, useUniqueFileName?, tags?, folder?, isPrivateFile?, customCoordinates?, responseFields?) {
     const params:object = {
       file: file,
       fileName: fileName,
@@ -64,14 +71,6 @@ export class IkUploadComponent implements OnInit {
     if (responseFields !== undefined) {
       Object.assign(params, { responseFields: responseFields });
     }
-
-    ik.upload(params, function (err, result) {
-      if (err) {
-        onError.emit(err);
-      } else {
-        onSuccess.emit(result);
-      }
-    });
+    return params;
   }
-
 }

sdk/lib/src/imagekitio-angular/imagekit.service.ts

@@ -19,8 +19,6 @@ export class ImageKitConfiguration {
   isPrivateFile?: boolean;
   folder?: string;
   customCoordinates?: any;
-  onError?: Function;
-  onSuccess?: Function;
   sdkVersion?: string;
 }
 

sdk/src/sdk-tests/ik-image.component.spec.ts

@@ -1,9 +1,8 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ElementRef } from '@angular/core';
-import { IkImageComponent } from '../../lib/src/imagekitio-angular/ik-image/ik-image.component';
-import { ImagekitService } from '../../lib/src/imagekitio-angular/imagekit.service';
+import { ElementRef } from "@angular/core";
+import { IkImageComponent } from "../../lib/src/imagekitio-angular/ik-image/ik-image.component";
+import { ImagekitService } from "../../lib/src/imagekitio-angular/imagekit.service";
 
-describe('IkImageComponent', () => {
+describe("IkImageComponent", () => {
   let component: IkImageComponent;
   let imageKitService: ImagekitService;
 
@@ -17,30 +16,87 @@ describe('IkImageComponent', () => {
     component = new IkImageComponent(elRef, imageKitService);
   });
 
-  it('setUrl should create correct URL when src is provided', () => {
-    component.setUrl('abc');
-    expect(component.url).toContain('/abc?ik-sdk-version=angular-');
+  it("setUrl should create correct URL when src is provided", () => {
+    component.setUrl("abc");
+    expect(component.url).toContain("/abc?ik-sdk-version=angular-");
   });
 
-  it('setUrl should create correct URL when path is provided', () => {
-    component.setUrl(null, 'def');
-    expect(component.url).toContain('/url/def?ik-sdk-version=angular-');
+  it("setUrl should create correct URL when path is provided", () => {
+    component.setUrl(null, "def");
+    expect(component.url).toContain("/url/def?ik-sdk-version=angular-");
   });
 
-  it('setUrl should create correct lqipURL in addition to URL when lqip is provided', () => {
-    component.setUrl('abc', null, null, { active: true, quality: 1 });
-    expect(component.url).toContain('/abc?ik-sdk-version=angular-');
-    expect(component.lqipUrl).toContain('tr=q-1');
-    console.log(component.lqipUrl)
+  it("setUrl should create correct lqipURL in addition to URL when lqip is provided", () => {
+    component.setUrl("abc", null, null, { active: true, quality: 1 });
+    expect(component.url).toContain("/abc?ik-sdk-version=angular-");
+    expect(component.lqipUrl).toContain("tr=q-1");
   });
 
-  it('lqipload should create correct url format if path is provided', () => {
-    const lqipURl = component.lqipload(10, '/abc?ik-sdk-version=angular-0.0.0', '/xyz');
-    expect(lqipURl).toContain('tr:q-10');
+  it("lqipload should create correct query parameters if path is provided", () => {
+    const lqipURl = component.lqipload(
+      10,
+      "/abc?ik-sdk-version=angular-0.0.0",
+      "/xyz"
+    );
+    expect(lqipURl).toContain("tr:q-10");
   });
 
-  it('lqipload should create corrext url format if path is not provided', () => {
-    const lqipURl = component.lqipload(10, '/abc?ik-sdk-version=angular-0.0.0', null);
-    expect(lqipURl).toContain('tr=q-10');
+  it("lqipload should create correct query parameters if path is not provided", () => {
+    const lqipURl = component.lqipload(
+      10,
+      "/abc?ik-sdk-version=angular-0.0.0",
+      null
+    );
+    expect(lqipURl).toContain("tr=q-10");
   });
+
+  it("setUrl should add transformations in query parameters", () => {
+    const transformation = [
+      { height: "200", width: "200" },
+      {
+        rotation: "90"
+      }
+    ];
+    component.setUrl("abc", null, transformation);
+    expect(component.url).toContain("&tr=h-200%2Cw-200%3Art-90");
+  });
+
+  it("setUrl should handle the presence and absence of leading slash in path parameters", () => {
+    let comp: IkImageComponent;
+    let iKService: ImagekitService;
+    iKService = new ImagekitService({
+      urlEndpoint: "https://ik.imagekit.io/company/",
+      publicKey: "abc",
+      authenticationEndpoint: "http://example.com/auth"
+    });
+    let elRef: ElementRef;
+    comp = new IkImageComponent(elRef, iKService);
+    comp.setUrl(null, "/abc.png");
+    expect(comp.url).toContain("https://ik.imagekit.io/company/abc.png?ik-sdk-version=angular-");
+    comp.setUrl(null, "abc.png");
+    expect(comp.url).toContain("https://ik.imagekit.io/company/abc.png?ik-sdk-version=angular-");
+  });
+
+  it("setUrl should handle the presence and absence of leading slash in urlEndpoint parameters", () => {
+    let comp: IkImageComponent;
+    let iKService: ImagekitService;
+    iKService = new ImagekitService({
+      urlEndpoint: "https://ik.imagekit.io/company",
+      publicKey: "abc",
+      authenticationEndpoint: "http://example.com/auth"
+    });
+    let elRef: ElementRef;
+    comp = new IkImageComponent(elRef, iKService);
+
+    comp.setUrl(null, "/abc.png");
+    expect(comp.url).toContain("https://ik.imagekit.io/company/abc.png?ik-sdk-version=angular-");
+    iKService = new ImagekitService({
+      urlEndpoint: "https://ik.imagekit.io/company/",
+      publicKey: "abc",
+      authenticationEndpoint: "http://example.com/auth"
+    });
+    comp.setUrl(null, "/def.png");
+    expect(comp.url).toContain("https://ik.imagekit.io/company/def.png?ik-sdk-version=angular-");
+  });
+
 });