Fix VM errors

harvester · Jul 6, 2022 · 2ff6ce6 · 2ff6ce6
1 parent 9e74266
commit 2ff6ce6
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 15 deletions.
diff --git a/cypress/cypress.config.ts b/cypress/cypress.config.ts
@@ -28,6 +28,7 @@ export default defineConfig({
       url: 'https://download.opensuse.org/pub/opensuse/distribution/leap/15.3/appliances/openSUSE-Leap-15.3-JeOS.x86_64-15.3-OpenStack-Cloud-Current.qcow2',
     },
     nfsEndPoint: 'nfs://ip',
+    vlans: ['[vlan name1]', '[vlan name2]'],
   },
   retries: {
     runMode: 1,

diff --git a/cypress/pageobjects/image.po.ts b/cypress/pageobjects/image.po.ts
@@ -24,7 +24,7 @@ export class ImagePage {
   private pageHead = 'main .outlet header h1';
 
   name() {
-    return new LabeledInputPo('.namespace-select > .labeled-input', `:contains("Name")`)
+    return new LabeledInputPo('.span-3 > .labeled-input', `:contains("Name")`)
   }
 
   url() {

diff --git a/cypress/pageobjects/virtualmachine.po.ts b/cypress/pageobjects/virtualmachine.po.ts
@@ -128,17 +128,10 @@ export class VmsPage extends CruResourcePo {
     cy.url().should('contain', 'as=config')
   }
 
-  goToYamlDetail(name: string) {
+  goToYamlEdit(name: string) {
     this.goToList();
-    cy.get('.search').type(name)
-    const vm = cy.contains(name)
-    expect(vm.should('be.visible'))
-    vm.click()
 
-    const config = cy.get('.masthead button').contains('YAML')
-    expect(config.should('be.visible'));
-    config.click()
-    cy.url().should('contain', 'as=yaml')
+    this.clickAction(name, 'Edit YAML')
   }
 
   public init() {

diff --git a/cypress/testcases/image/images.spec.ts b/cypress/testcases/image/images.spec.ts
@@ -285,7 +285,7 @@ describe('Update image labels after deleting source VM', () => {
 
 //         // check VM state
 //         vms.goToConfigDetail(VM_NAME);
-//         vms.goToYamlDetail(VM_NAME);
+//         vms.goToYamlEdit(VM_NAME);
 
 //         // delete VM
 //         vms.delete(VM_NAME)

diff --git a/cypress/testcases/virtualmachines/advanced.spec.ts b/cypress/testcases/virtualmachines/advanced.spec.ts
@@ -40,7 +40,7 @@ describe('Create a new VM and add Enable USB tablet option', () => {
 
     cy.intercept('GET', `/apis/kubevirt.io/v1/namespaces/*/virtualmachines/${VM_NAME}`).as('vmDetail');
 
-    vms.goToYamlDetail(VM_NAME);
+    vms.goToYamlEdit(VM_NAME);
 
     cy.wait('@vmDetail').then(res => {
       expect(res.response?.statusCode).to.equal(200);

diff --git a/cypress/testcases/virtualmachines/virtual-machine.spec.ts b/cypress/testcases/virtualmachines/virtual-machine.spec.ts
@@ -37,7 +37,7 @@ describe('Create a vm with all the default values', () => {
 
     vms.goToConfigDetail(VM_NAME);
 
-    vms.goToYamlDetail(VM_NAME);
+    vms.goToYamlEdit(VM_NAME);
 
     vms.delete(namespace, VM_NAME)
   });

diff --git a/cypress/utils/components/cru-resource.po.ts b/cypress/utils/components/cru-resource.po.ts
@@ -26,7 +26,7 @@ export default class CruResourcePo extends PagePo {
   }
 
   name() {
-    return new LabeledInputPo('.namespace-select > .labeled-input', `:contains("Name")`)
+    return new LabeledInputPo('.span-3 >.labeled-input', `:contains("Name")`)
   }
 
   description() {

diff --git a/cypress/utils/components/labeled-input.po.ts b/cypress/utils/components/labeled-input.po.ts
@@ -3,7 +3,7 @@ import ComponentPo from './component.po';
 export default class LabeledInputPo extends ComponentPo {
   input(string: string | undefined) {
     if (string) {
-      this.self().find('input').clear()
+      this.self().find('input').clear({force: true})
       this.self().type(string)
     }