From a9025e007835b6e15f194839b105d91fc8da6a43 Mon Sep 17 00:00:00 2001
From: Nemanja Glumac <31325167+nemanjaglumac@users.noreply.github.com>
Date: Mon, 7 Jun 2021 21:29:49 +0200
Subject: [PATCH] Unskip merged repros (#16390)

---
 .../scenarios/question/custom_column.cy.spec.js       |  4 ++--
 .../metabase/scenarios/question/filter.cy.spec.js     | 11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/frontend/test/metabase/scenarios/question/custom_column.cy.spec.js b/frontend/test/metabase/scenarios/question/custom_column.cy.spec.js
index 3838990f5a3..622a1586059 100644
--- a/frontend/test/metabase/scenarios/question/custom_column.cy.spec.js
+++ b/frontend/test/metabase/scenarios/question/custom_column.cy.spec.js
@@ -628,7 +628,7 @@ describe("scenarios > question > custom columns", () => {
     });
   });
 
-  it.skip("should maintain data type (metabase#13122)", () => {
+  it("should maintain data type (metabase#13122)", () => {
     openOrdersTable({ mode: "notebook" });
     cy.findByText("Custom column").click();
     popover().within(() => {
@@ -645,7 +645,7 @@ describe("scenarios > question > custom columns", () => {
     cy.findByPlaceholderText("Enter a number").should("not.exist");
   });
 
-  it.skip("filter based on `concat` function should not offer numeric options (metabase#13217)", () => {
+  it("filter based on `concat` function should not offer numeric options (metabase#13217)", () => {
     openPeopleTable({ mode: "notebook" });
     cy.findByText("Custom column").click();
     popover().within(() => {
diff --git a/frontend/test/metabase/scenarios/question/filter.cy.spec.js b/frontend/test/metabase/scenarios/question/filter.cy.spec.js
index 0a662714bd5..bd7fb816882 100644
--- a/frontend/test/metabase/scenarios/question/filter.cy.spec.js
+++ b/frontend/test/metabase/scenarios/question/filter.cy.spec.js
@@ -570,9 +570,8 @@ describe("scenarios > question > filter", () => {
     cy.findByText(/^Created At is before/i);
   });
 
-  it.skip("should display original custom expression filter with dates on subsequent click (metabase#12492)", () => {
-    cy.server();
-    cy.route("POST", "/api/dataset").as("dataset");
+  it("should display original custom expression filter with dates on subsequent click (metabase#12492)", () => {
+    cy.intercept("POST", "/api/dataset").as("dataset");
 
     visitQuestionAdhoc({
       dataset_query: {
@@ -595,11 +594,9 @@ describe("scenarios > question > filter", () => {
     });
 
     cy.wait("@dataset");
-    cy.findByText(/^Created At is after/i)
-      .should("not.contain", "Unknown")
-      .click();
+    cy.findByText(/Created At > Product? → Created At/i).click();
     cy.get("[contenteditable='true']").contains(
-      /\[Created At\] > \[Products? -> Created At\]/,
+      /\[Created At\] > \[Products? → Created At\]/,
     );
   });
 
-- 
GitLab