fix issues

openshift · Feb 24, 2020 · 5ae502e · 5ae502e
1 parent 08bedcf
commit 5ae502e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 23 deletions.
diff --git a/...nd/packages/kubevirt-plugin/integration-tests/Installation/cnv-uninstallation.scenario.ts b/...nd/packages/kubevirt-plugin/integration-tests/Installation/cnv-uninstallation.scenario.ts
@@ -1,7 +1,6 @@
 import { click } from '@console/shared/src/test-utils/utils';
 import { browser } from 'protractor';
-import { isLoaded } from '@console/internal-integration-tests/views/crud.view';
-import * as sidenavView from '@console/internal-integration-tests/views/sidenav.view';
+import { clickNavLink } from '@console/internal-integration-tests/views/sidenav.view';
 import * as cnvView from '../views/containerNativeVirtualization.view';
 import { confirmAction } from '../views/vm.actions.view';
 import { waitFor } from '../tests/utils/utils';
@@ -10,40 +9,40 @@ import * as crudView from '@console/internal-integration-tests/views/crud.view';
 
 describe('Uninstall Kubevirt', () => {
   beforeAll(async () => {
-    await sidenavView.clickNavLink(['Operators', 'Installed Operators']);
-    await isLoaded();
+    await clickNavLink(['Operators', 'Installed Operators']);
+    await crudView.isLoaded();
     await click(cnvView.namespaceButton);
     await click(cnvView.openshiftNamespaceButton);
   });
 
   it('Deleting the KubeVirt HyperConverged Operator Custom Resource', async () => {
-    await isLoaded();
+    await crudView.isLoaded();
     await cnvView.elmKebab.click();
-    await isLoaded();
+    await crudView.isLoaded();
     await cnvView.elmUninstall.click();
     await waitFor(cnvView.kubevirtOperatorStatus, 'Succeeded', 5);
     await confirmAction();
   });
 
   it('Deleting the Container-native virtualization catalog subscription', async () => {
-    await sidenavView.clickNavLink(['Operators', 'OperatorHub']);
-    await isLoaded();
+    await clickNavLink(['Operators', 'OperatorHub']);
+    await crudView.isLoaded();
     await cnvView.elmCNV.click();
     await browser.sleep(20000);
   });
 
   it('Delete the openshift-cnv project', async () => {
-    await sidenavView.clickNavLink(['Administration', 'Namespaces']);
-    await cnvView.nameFilter.sendKeys("openshift-cnv")
+    await clickNavLink(['Administration', 'Namespaces']);
+    await cnvView.nameFilter.sendKeys('openshift-cnv');
     await crudView.isLoaded();
-    await crudView.clickKebabAction("openshift-cnv", "Delete Namespace");
+    await crudView.clickKebabAction('openshift-cnv', 'Delete Namespace');
     await crudView.isLoaded();
-    await cnvView.verifyDelete.sendKeys("openshift-cnv")
+    await cnvView.verifyDelete.sendKeys('openshift-cnv');
     await crudView.isLoaded();
     await confirmAction();
   });
 
-  it('Verify all CNV related resources are gone', async () => {
+  it('Delete kubevirt.io apiservices', async () => {
     execSync('kubectl delete apiservices v1alpha3.subresources.kubevirt.io -n openshift-cnv');
   });
 });
diff --git a/...nd/packages/kubevirt-plugin/integration-tests/views/containerNativeVirtualization.view.ts b/...nd/packages/kubevirt-plugin/integration-tests/views/containerNativeVirtualization.view.ts
@@ -1,18 +1,21 @@
 import { $, by, element } from 'protractor';
+
 export const elmCnvOperator = element(
-    by.cssContainingText('.catalog-tile-pf-title', 'Container-native virtualization Operator'),
-)
+  by.cssContainingText('.catalog-tile-pf-title', 'Container-native virtualization Operator'),
+);
 
 export const elmCNV = element(
-    by.cssContainingText('.catalog-tile-pf-title', 'Container-native virtualization'),
-)
-export const elmInstall = element(by.linkText('Install'))
+  by.cssContainingText('.catalog-tile-pf-title', 'Container-native virtualization'),
+);
+export const elmInstall = element(by.linkText('Install'));
 export const namespaceButton = $('.co-namespace-selector button');
 export const messageLbl = $('.cos-status-box');
 export const nameFilter = $('.pf-c-form-control.co-text-filter');
-export const verifyDelete = (element(by.css('.co-delete-modal'))).element(by.css('.pf-c-form-control'));
+export const verifyDelete = element(by.css('.co-delete-modal')).element(
+  by.css('.pf-c-form-control'),
+);
 export const openshiftNamespaceButton = $('#openshift-cnv-link');
 export const kubevirtOperatorStatus = $('.co-clusterserviceversion-row__status');
-export const elmKebab = element(by.xpath("//button[@data-test-id='kebab-button']"))
-export const elmUninstall = element(by.xpath("//button[@data-test-action='Uninstall Operator']"))
-export const elmActionMenu = element(by.xpath("//button[@data-test-id='actions-menu-button']"))
+export const elmKebab = element(by.xpath("//button[@data-test-id='kebab-button']"));
+export const elmUninstall = element(by.xpath("//button[@data-test-action='Uninstall Operator']"));
+export const elmActionMenu = element(by.xpath("//button[@data-test-id='actions-menu-button']"));
diff --git a/frontend/packages/kubevirt-plugin/package.json b/frontend/packages/kubevirt-plugin/package.json
@@ -20,7 +20,7 @@
         "integration-tests/installation/*.scenario.ts"
       ],
       "kubevirt": [
-        "integration-tests/tests/*.scenario.ts"      
+        "integration-tests/tests/*.scenario.ts"
       ],
       "kubevirt-v2v": [
         "integration-tests/v2v/*.scenario.ts"