Fix getComponentTypeVersion method tests

dgolovin · dgolovin · commit 272dab764d85 · 2020-08-07T11:25:42.000-07:00
Signed-off-by: Denis Golovin &lt;dgolovin@redhat.com&gt;
diff --git a/src/odo.ts b/src/odo.ts
@@ -697,7 +697,7 @@ export class OdoImpl implements Odo {
 
     public async getComponentTypeVersions(componentName: string): Promise<string[]> {
         const result: cliInstance.CliExitData = await this.execute(Command.listCatalogComponentsJson());
-        const items = this.loadItems<ComponentType>(result).filter((value) => value.metadata.name === componentName);
+        const items = this.loadItems<ComponentType>(result, (json) => json.s2iItems).filter((value) => value.metadata.name === componentName);
         return items.length > 0 ? items[0].spec.allTags : [];
     }
 
diff --git a/test/unit/odo.test.ts b/test/unit/odo.test.ts
@@ -448,7 +448,7 @@ suite("odo", () => {
         const odoCatalog = JSON.stringify({
             kind : "ComponentTypeList",
             apiVersion : "odo.openshift.io/v1alpha1",
-            items: [
+            s2iItems: [
                 {
                     kind : "ComponentType",
                     apiVersion : "odo.openshift.io/v1alpha1",

Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,7 @@ export class OdoImpl implements Odo {`
`697`	`697`
`698`	`698`	`public async getComponentTypeVersions(componentName: string): Promise<string[]> {`
`699`	`699`	`const result: cliInstance.CliExitData = await this.execute(Command.listCatalogComponentsJson());`
`700`		`- const items = this.loadItems<ComponentType>(result).filter((value) => value.metadata.name === componentName);`
	`700`	`+ const items = this.loadItems<ComponentType>(result, (json) => json.s2iItems).filter((value) => value.metadata.name === componentName);`
`701`	`701`	`return items.length > 0 ? items[0].spec.allTags : [];`
`702`	`702`	`}`
`703`	`703`
Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ suite("odo", () => {`
`448`	`448`	`const odoCatalog = JSON.stringify({`
`449`	`449`	`kind : "ComponentTypeList",`
`450`	`450`	`apiVersion : "odo.openshift.io/v1alpha1",`
`451`		`- items: [`
	`451`	`+ s2iItems: [`
`452`	`452`	`{`
`453`	`453`	`kind : "ComponentType",`
`454`	`454`	`apiVersion : "odo.openshift.io/v1alpha1",`