From 0d6bb3a1f2730d8176c1a7a1af3713742fded94a Mon Sep 17 00:00:00 2001
From: Sloan Sparger <sloansparger@users.noreply.github.com>
Date: Tue, 23 Apr 2024 16:47:22 -0500
Subject: [PATCH] Fix flaky perms EE to OSS downgrade test (#41759)
---
.../downgrade-ee-to-oss.cy.spec.js | 54 ++++++++++---------
1 file changed, 28 insertions(+), 26 deletions(-)
diff --git a/e2e/test/scenarios/permissions/downgrade-ee-to-oss.cy.spec.js b/e2e/test/scenarios/permissions/downgrade-ee-to-oss.cy.spec.js
index 7cea7984149..5b79f69b045 100644
--- a/e2e/test/scenarios/permissions/downgrade-ee-to-oss.cy.spec.js
+++ b/e2e/test/scenarios/permissions/downgrade-ee-to-oss.cy.spec.js
@@ -41,36 +41,38 @@ describeEE("scenarios > admin > permissions > downgrade ee to oss", () => {
cy.button("Yes").click();
});
- setTokenFeatures("none");
- cy.reload();
-
- assertPermissionTable([["Sample Database", "No"]]);
- isPermissionDisabled(OSS_NATIVE_QUERIES_PERMISSION_INDEX, "No", false);
-
- modifyPermission(
- "Sample Database",
- OSS_NATIVE_QUERIES_PERMISSION_INDEX,
- "Query builder and native",
- );
- cy.button("Save changes").click();
- modal().within(() => {
- cy.findByText("Save permissions?");
- cy.button("Yes").click();
- });
+ setTokenFeatures("none").then(() => {
+ cy.reload();
- setTokenFeatures("all");
- cy.reload();
+ assertPermissionTable([["Sample Database", "No"]]);
+ isPermissionDisabled(OSS_NATIVE_QUERIES_PERMISSION_INDEX, "No", false);
- assertPermissionTable([
- [
+ modifyPermission(
"Sample Database",
- "Can view",
+ OSS_NATIVE_QUERIES_PERMISSION_INDEX,
"Query builder and native",
- "No",
- "No",
- "No",
- ],
- ]);
+ );
+ cy.button("Save changes").click();
+ modal().within(() => {
+ cy.findByText("Save permissions?");
+ cy.button("Yes").click();
+ });
+
+ setTokenFeatures("all").then(() => {
+ cy.reload();
+
+ assertPermissionTable([
+ [
+ "Sample Database",
+ "Can view",
+ "Query builder and native",
+ "No",
+ "No",
+ "No",
+ ],
+ ]);
+ });
+ });
});
// same context as other test, but also make sure that other rows with EE values are
--
GitLab