Merge pull request #4698 from gblaih/study-charts-button-disabled

Fix e2e tests that use study view charts button
cBioPortal · Aug 16, 2023 · 378093e · 378093e
2 parents 4b6ccab + 0f2f119
commit 378093e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/...ric_assay_chart_should_be_added_in_the_summary_tab_element_chrome_1600x1000.png b/...ric_assay_chart_should_be_added_in_the_summary_tab_element_chrome_1600x1000.png
diff --git a/end-to-end-test/remote/specs/core/studyview.spec.js b/end-to-end-test/remote/specs/core/studyview.spec.js
@@ -395,9 +395,13 @@ describe('crc_msk_2017 study tests', () => {
         $(ADD_CHART_BUTTON).waitForDisplayed({
             timeout: WAIT_FOR_VISIBLE_TIMEOUT,
         });
-        $(ADD_CHART_BUTTON).waitForEnabled({
-            timeout: WAIT_FOR_VISIBLE_TIMEOUT,
-        });
+        browser.waitUntil(
+            () =>
+                !$(ADD_CHART_BUTTON)
+                    .getAttribute('class')
+                    .includes('disabled'),
+            { timeout: WAIT_FOR_VISIBLE_TIMEOUT }
+        );
         setDropdownOpen(
             true,
             ADD_CHART_BUTTON,
@@ -723,9 +727,13 @@ describe('submit genes to results view query', () => {
         });
         it('generic assay chart should be added in the summary tab', function() {
             this.retries(0);
-            $(ADD_CHART_BUTTON).waitForEnabled({
-                timeout: 60000,
-            });
+            browser.waitUntil(
+                () =>
+                    !$(ADD_CHART_BUTTON)
+                        .getAttribute('class')
+                        .includes('disabled'),
+                { timeout: 60000 }
+            );
             $(ADD_CHART_BUTTON).click();
 
             // Change to GENERIC ASSAY tab