Improve robustness of UI tests

ubccr · Jul 26, 2019 · a2c3b33 · a2c3b33
1 parent 6709325
commit a2c3b33
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/tests/ui/test/specs/xdmod/metricExplorer.page.js b/tests/ui/test/specs/xdmod/metricExplorer.page.js
@@ -116,6 +116,14 @@ class MetricExplorer {
                     addFilter: '#metric-explorer-chartoptions-add-filter'
 
                 },
+                chartContext: {
+                    menuByTitle: function (title) {
+                        return '//div[contains(@class, "x-menu x-menu-floating") and contains(@style, "visibility: visible;")]//span[contains(@class, "menu-title") and contains(text(), "' + title + '")]//ancestor::node()[4]/ul';
+                    },
+                    menuItemByText: function (menuTitle, itemText) {
+                        return module.exports.selectors.chartContext.menuByTitle(menuTitle) + '//li/a//span[text()="' + itemText + '"]';
+                    }
+                },
                 axis: '#metric_explorer .highcharts-yaxis-labels'
             },
             catalog: {
@@ -241,7 +249,7 @@ class MetricExplorer {
     openDataSeriesDefinitionFromDataPoint() {
         this.clickLogoAndWaitForMask();
         this.clickFirstDataPoint();
-        browser.waitAndClick('//div[contains(@class, "x-menu x-menu-floating") and contains(@style, "visibility: visible;")]//li/a//span[text()="Edit Dataset"]');
+        browser.waitUntilAnimEndAndClick(this.selectors.chartContext.menuItemByText('Data Series:', 'Edit Dataset'));
     }
     addFiltersFromDataSeriesDefinition(filter, name) {
         this.clickLogoAndWaitForMask();