#359 all tests migrated to cypress

ugurdogrusoz · Jun 9, 2021 · d5f025c · d5f025c
1 parent afd66b3
commit d5f025c
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 13 deletions.
diff --git a/cypress/downloads/visuall.json b/cypress/downloads/visuall.json
diff --git a/cypress/helper.js b/cypress/helper.js
@@ -29,7 +29,7 @@ export function navbarAction(dropdownBtn, actionBtn) {
  * @param  {string} subTab text shown on UI
  */
 export function openSubTab(subTab) {
-  cy.get('b.va-heading2').contains(subTab).click();
+  cy.get('b.va-heading2:visible').contains(subTab).click();
 }
 
 /**
@@ -61,4 +61,17 @@ export function groupBy(algoName, shouldResultCompounds) {
       expect(win.cy.$(':parent').length == 0).to.eq(true);
     }
   });
+}
+
+/**
+ * @param  {string} prop Object type to select
+ * @param  {string} op Operator to select
+ * @param  {string} inp input value as operand 
+ */
+export function addPropertyRule(prop, op, inp) {
+  cy.get('select.prop').select(prop);
+  cy.get('select.prop-op-key').select(op);
+  cy.get('input[placeholder="Filter..."]').clear();
+  cy.get('input[placeholder="Filter..."]').type(inp);
+  cy.get('img[title="Add/Update"]').click();
 }
diff --git a/cypress/integration/queryByRule.spec.js b/cypress/integration/queryByRule.spec.js
@@ -1,4 +1,4 @@
-import { open, openTab, openSubTab, navbarAction } from '../helper';
+import { open, openTab, openSubTab, navbarAction, addPropertyRule } from '../helper';
 
 context('Query By Rule', () => {
 
@@ -9,15 +9,7 @@ context('Query By Rule', () => {
     cy.get('img[alt="Add Rule"]:visible').click();
     cy.wait(250);
   }
-
-  function addPropertyRule(prop, op, inp) {
-    cy.get('select.prop').select(prop);
-    cy.get('select.prop-op-key').select(op);
-    cy.get('input[placeholder="Filter..."]').clear();
-    cy.get('input[placeholder="Filter..."]').type(inp);
-    cy.get('img[title="Add/Update"]').click();
-  }
-
+
   function queryByConditionRuleGetAll(type, isEdge) {
     beginQueryByRule();
     cy.get('button:visible').contains('Condition').click();
@@ -201,7 +193,7 @@ context('Query By Rule', () => {
     });
   });
 
-  it('TC9: Client-side filtering should work properly', () => {
+  it('TC9: Can add/remove query', () => {
     beginQueryByRule();
     cy.get('button:visible').contains('Condition').click();
     cy.get('img[title="Add/Update"]').click();

diff --git a/cypress/integration/timebar.spec.js b/cypress/integration/timebar.spec.js
@@ -0,0 +1,30 @@
+import { open, openTab, openSubTab, navbarAction, addPropertyRule } from '../helper';
+
+context('Timebar', () => {
+
+  beforeEach(open);
+
+  it('TC1: Timebar metric as AND rule birth > 1994 && death < 2020', () => {
+    openTab('Settings');
+    // click to close 'General' settings
+    // cy.wait(3000);
+    openSubTab('General');
+    // click to open 'Timebar' settings
+    openSubTab('Timebar');
+    cy.get('span.va-heading3').contains('Configure Statistics').click();
+    cy.get('b.timebar-metric-name').contains('new').click();
+    cy.get('select[title="Type"]').select('Person');
+
+    cy.get('img[alt="Add Rule"]:visible').click();
+    cy.get('button.dd-item.dropdown-item').contains('AND').click();
+    addPropertyRule('birth_year', '≥', '1994');
+
+    cy.get('img[title="Add"]:visible').click();
+    cy.get('button.dd-item.dropdown-item').contains('Condition').click();
+    addPropertyRule('death_year', '≤', '2020');
+
+    cy.get('input[value="Add"]:visible').click();
+
+  });
+
+});