Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

GDGT-3174: Stabilize dashboard question move warning test (#82646)

Stas Gavrylov18ecd5433abb
diff --git a/e2e/support/helpers/e2e-dashboard-visualizer-helpers.ts b/e2e/support/helpers/e2e-dashboard-visualizer-helpers.ts
index e2062c0406f..41fa8f6f239 100644
--- a/e2e/support/helpers/e2e-dashboard-visualizer-helpers.ts
+++ b/e2e/support/helpers/e2e-dashboard-visualizer-helpers.ts
@@ -107,9 +107,29 @@ export function deselectDatasetFromColumnList(datasetName: string) {
.click({ force: true });
}
-export function selectDataset(datasetName: string) {
+type SelectDatasetOptions = {
+ searchAlias?: string;
+};
+
+export function selectDataset(
+ datasetName: string,
+ { searchAlias }: SelectDatasetOptions = {},
+) {
+ if (searchAlias) {
+ cy.intercept("GET", "/api/search*", (request) => {
+ if (request.query.q === datasetName) {
+ request.alias = searchAlias;
+ }
+ });
+ }
+
cy.findByPlaceholderText("Search for something").clear().type(datasetName);
- cy.findAllByText(datasetName)
+ if (searchAlias) {
+ cy.wait(`@${searchAlias}`).its("response.statusCode").should("eq", 200);
+ }
+ dataImporter()
+ .findByTestId("datasets-list")
+ .findAllByText(datasetName)
.first()
.closest("[data-testid='swap-dataset-button']")
.should("not.have.attr", "aria-pressed", "true")
diff --git a/e2e/test/scenarios/actions/model-actions.cy.spec.js b/e2e/test/scenarios/actions/model-actions.cy.spec.js
index 6748c2ee1e0..4442637dd4a 100644
--- a/e2e/test/scenarios/actions/model-actions.cy.spec.js
+++ b/e2e/test/scenarios/actions/model-actions.cy.spec.js
@@ -296,6 +296,17 @@ describe(
`Write actions on model detail page (${dialect})`,
{ tags: "@external" },
() => {
+ before(() => {
+ H.restore(`${dialect}-writable`);
+ H.resetTestTable({ type: dialect, table: WRITABLE_TEST_TABLE });
+ cy.signInAsAdmin();
+ H.resyncDatabase({
+ dbId: WRITABLE_DB_ID,
+ tableName: WRITABLE_TEST_TABLE,
+ });
+ H.snapshot(`model-actions-${dialect}`);
+ });
+
beforeEach(() => {
cy.intercept("GET", "/api/card/*").as("getModel");
cy.intercept("GET", "/api/action/*").as("getAction");
@@ -309,13 +320,9 @@ describe(
"disableActionSharing",
);
- H.restore(`${dialect}-writable`);
+ H.restore(`model-actions-${dialect}`);
H.resetTestTable({ type: dialect, table: WRITABLE_TEST_TABLE });
cy.signInAsAdmin();
- H.resyncDatabase({
- dbId: WRITABLE_DB_ID,
- tableName: WRITABLE_TEST_TABLE,
- });
H.createModelFromTableName({
tableName: WRITABLE_TEST_TABLE,
@@ -556,6 +563,7 @@ describe(
cy.wait("@updateAction");
cy.findByTestId("action-creator").should("not.exist");
+ cy.intercept("POST", "/api/action/*/execute").as("executeQueryAction");
runActionFor(SAMPLE_QUERY_ACTION.name);
H.modal().within(() => {
@@ -567,6 +575,9 @@ describe(
cy.button(SAMPLE_QUERY_ACTION.name).click();
});
+ cy.wait("@executeQueryAction")
+ .its("response.statusCode")
+ .should("eq", 200);
verifyScoreValue(22, dialect);
});
@@ -795,15 +806,18 @@ describe(
cy.wait("@getModel");
});
+ cy.intercept("POST", "/api/action/*/execute").as(
+ "executeImpersonatedAction",
+ );
runActionFor(SAMPLE_QUERY_ACTION.name);
H.modal().within(() => {
cy.findByLabelText(TEST_PARAMETER.name).type("1");
cy.button(SAMPLE_QUERY_ACTION.name).click();
+ cy.wait("@executeImpersonatedAction", { responseTimeout: 60_000 });
cy.findByText(
"Error executing Action: Error executing write query: ERROR: permission denied for table scoreboard_actions",
- { timeout: 30000 },
);
});
diff --git a/e2e/test/scenarios/dashboard/dashboard-questions.cy.spec.js b/e2e/test/scenarios/dashboard/dashboard-questions.cy.spec.js
index 90383cf953c..d6f2704a500 100644
--- a/e2e/test/scenarios/dashboard/dashboard-questions.cy.spec.js
+++ b/e2e/test/scenarios/dashboard/dashboard-questions.cy.spec.js
@@ -821,7 +821,9 @@ describe("Dashboard > Dashboard Questions", () => {
H.modal().within(() => {
H.switchToAddMoreData();
- H.selectDataset("Blue Question");
+ H.selectDataset("Blue Question", {
+ searchAlias: "searchBlueQuestion",
+ });
cy.button("Save").click();
});
@@ -846,9 +848,17 @@ describe("Dashboard > Dashboard Questions", () => {
});
cy.log("Move the question to an entirely different dashboard");
+ cy.intercept("GET", "/api/collection/root/items*").as(
+ "getMoveDestinations",
+ );
H.openQuestionActions("Move");
- H.entityPickerModal().findByText("Orders in a dashboard").click();
+ cy.wait("@getMoveDestinations")
+ .its("response.statusCode")
+ .should("eq", 200);
+ H.entityPickerModal()
+ .findByText("Orders in a dashboard", { timeout: 10_000 })
+ .click();
H.entityPickerModal().button("Move").click();
cy.log("Should warn about removing from 2 dashboards");