Merge pull request #208 from Ontotext-AD/GDB-5327-fix-flaky-tests

GDB-5372 Fixed flaky tests

Author: desislava-hristova-ontotext

cypress/steps/mapping-steps.ts

@@ -11,7 +11,7 @@ class MappingSteps {
    * @param fieldAccessorCb a function which must return a field
    */
   static type(value: string, fieldAccessorCb: any) {
-    return fieldAccessorCb().type(value, {force: true});
+    return fieldAccessorCb().type(value);
   }
 
   static completeTriple(index: number, subject?: string, predicate?: string, object?: string) {
@@ -27,18 +27,27 @@ class MappingSteps {
   }
 
   static completeSubject(index: number, value: string) {
-    this.type(value, () => MappingSteps.getTripleSubjectValue(index));
-    MappingSteps.getTripleSubjectValue(index).blur();
+    this.type(value, () => MappingSteps.getTripleSubjectValue(index)).then((component) => {
+      if (component) {
+        component.blur();
+      }
+    });
   }
 
   static completePredicate(index: number, value: string) {
-    this.type(value, () => MappingSteps.getTriplePredicateValue(index));
-    MappingSteps.getTriplePredicateValue(index).blur();
+    this.type(value, () => MappingSteps.getTriplePredicateValue(index)).then((component) => {
+      if (component) {
+        component.blur();
+      }
+    });
   }
 
   static completeObject(index: number, value: string) {
-    this.type(value, () => MappingSteps.getTripleObjectValue(index));
-    MappingSteps.getTripleObjectValue(index).blur();
+    this.type(value, () => MappingSteps.getTripleObjectValue(index)).then((component) => {
+      if (component) {
+        component.blur();
+      }
+    });
   }
 
   static verifyTriple(index: number, subject: string, predicate: string, object: string) {
@@ -92,7 +101,7 @@ class MappingSteps {
 
   static getTripleSubjectValue(index: any) {
     // wait for a while to prevent element to be found in detached state
-    return MappingSteps.getTripleSubject(index).find('[appCypressData="cell-value"]').wait(300);
+    return MappingSteps.getTripleSubject(index).find('[appCypressData="cell-value"]');
   }
 
   static getTripleSubjectValuePreview(index: any) {
@@ -158,7 +167,7 @@ class MappingSteps {
 
   static getTriplePredicateValue(index: any) {
     // wait for a while to prevent element to be found in detached state
-    return MappingSteps.getTriplePredicate(index).find('[appCypressData="cell-value"]').wait(300);
+    return MappingSteps.getTriplePredicate(index).find('[appCypressData="cell-value"]');
   }
 
   static getTriplePredicateValuePreview(index: any) {
@@ -192,7 +201,7 @@ class MappingSteps {
 
   static getTripleObjectValue(index: any) {
     // wait for a while to prevent element to be found in detached state
-    return MappingSteps.getTripleObject(index).find('[appCypressData="cell-value"]').wait(300);
+    return MappingSteps.getTripleObject(index).find('[appCypressData="cell-value"]');
   }
 
   static getTripleObjectValuePreview(index: any) {
@@ -325,7 +334,7 @@ class MappingSteps {
     return cy.get('[appCypressData="namespace-error"]');
   }
 
-  static getSuggestions(index: any) {
+  static getSuggestions() {
     return cy.get(`[appCypressData="cell-option"]`);
   }
 

cypress/test/autocomplete.spec.ts

@@ -20,8 +20,10 @@ describe('Autocomplete mapping', () => {
       MappingSteps.getTriples().should('have.length', 1);
       MappingSteps.completeTriple(0, 's', 'p', undefined);
       MappingSteps.type('w', () => MappingSteps.getTripleObjectValue(0));
-      MappingSteps.getSuggestions(0).should('have.length', 5);
-      MappingSteps.getSuggestions(0).first().should('contain', 'wgs:').click();
+      MappingSteps.getSuggestions().should('have.length', 5);
+      MappingSteps.getSuggestions().first().should('contain', 'wgs:').then((option) => {
+        option[0].click();
+      });
       MappingSteps.type('test', () => MappingSteps.getTripleObjectValue(0));
       MappingSteps.getTripleObjectValue(0).blur();
       MappingSteps.getTripleObjectPropertyTransformation(0).should('have.text', 'wgs:');
@@ -32,15 +34,19 @@ describe('Autocomplete mapping', () => {
       MappingSteps.getTriples().should('have.length', 1);
       MappingSteps.completeTriple(0, 's', 'p', undefined);
       MappingSteps.type('rdf:@', () => MappingSteps.getTripleObjectValue(0));
-      MappingSteps.getSuggestions(0).should('have.length', 28);
-      MappingSteps.getSuggestions(0).first().should('contain', 'color').click();
+      MappingSteps.getSuggestions().should('have.length', 28);
+      MappingSteps.getSuggestions().first().should('contain', 'color').then((option) => {
+        option[0].click();
+      });
       MappingSteps.getTripleObjectPropertyTransformation(0).should('have.text', 'rdf:');
       MappingSteps.getTripleObjectSource(0).should('have.text', ' @  color ');
       // When I type on the subject position an extended prefix plus column beginning
       MappingSteps.type('rdf:ext@du', () => MappingSteps.getTripleSubjectValue(1));
-      MappingSteps.getSuggestions(0).should('have.length', 1);
+      MappingSteps.getSuggestions().should('have.length', 1);
       // And I select the column from the suggestion
-      MappingSteps.getSuggestions(0).first().should('contain', 'duration').click();
+      MappingSteps.getSuggestions().first().should('contain', 'duration').then((option) => {
+        option[0].click();
+      });
       // Then I expect that the extended prefix is properly populated in the cell
       // And The column and type are properly set
       MappingSteps.getTripleSubjectPropertyTransformation(1).should('have.text', 'rdf:ext');
@@ -50,7 +56,9 @@ describe('Autocomplete mapping', () => {
       MappingSteps.type('p', () => MappingSteps.getTriplePredicateValue(1));
       MappingSteps.type('rdf:ext@co', () => MappingSteps.getTripleObjectValue(1));
       // And I select the columns from the suggestion
-      MappingSteps.getSuggestions(0).first().should('contain', 'color').click();
+      MappingSteps.getSuggestions().first().should('contain', 'color').then((option) => {
+        option[0].click();
+      });
       // Then I expect that the prefix, column and tpe are properly populated in the cell
       MappingSteps.getTripleObjectPropertyTransformation(1).should('have.text', 'rdf:ext');
       MappingSteps.getTripleObjectSource(1).should('have.text', ' @  color ');
@@ -64,7 +72,7 @@ describe('Autocomplete mapping', () => {
       // Call POST again to load tooltips
       cy.route('POST', '/repositories/Movies', 'fixture:autocomplete/autocomplete-iri-description-response.json').as('loadDescr');
       // When I hover an autocomplete
-      MappingSteps.getSuggestions(0).first().trigger('mouseover');
+      MappingSteps.getSuggestions().first().trigger('mouseover');
       // I expect tho see an IRI description
       MappingSteps.getTooltip().contains('IRI Description');
     });

cypress/test/edit-mapping.spec.ts

@@ -752,8 +752,10 @@ describe('Edit mapping', () => {
 
       MappingSteps.completeTriple(0, 's', undefined, undefined);
       MappingSteps.type('rdf:t', () => MappingSteps.getTriplePredicateValue(0));
-      MappingSteps.getSuggestions(0).should('have.length', 1);
-      MappingSteps.getSuggestions(0).first().should('contain', 'rdf:type').click();
+      MappingSteps.getSuggestions().should('have.length', 1);
+      MappingSteps.getSuggestions().first().should('contain', 'rdf:type').then((option) => {
+        option[0].click();
+      });
 
       // THEN
       MappingSteps.getTriplePredicate(0).should('have.text', 'a<IRI>');