cypress upgrade

Dockerfile

@@ -20,11 +20,10 @@ ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
 RUN useradd -m -d /frontend redash
 USER redash
 WORKDIR /frontend
-COPY --chown=redash package.json yarn.lock .yarnrc /frontend/
+COPY --chown=redash package.json yarn.lock /frontend/
 COPY --chown=redash viz-lib /frontend/viz-lib
-COPY --chown=redash scripts /frontend/scripts
 
-RUN yarn --frozen-lockfile --network-concurrency 1;
+RUN yarn --frozen-lockfile --network-concurrency 1
 COPY --chown=redash client /frontend/client
 COPY --chown=redash webpack.config.js /frontend/
 RUN yarn build

Dockerfile.cypress

@@ -1,12 +1,18 @@
 FROM cypress/browsers:node18.12.0-chrome106-ff106
 
-ENV APP /usr/src/app
+ENV APP /app
 WORKDIR $APP
 
-COPY package.json yarn.lock .yarnrc $APP/
-COPY viz-lib $APP/viz-lib
-RUN npm install yarn@1.22.22 -g && yarn --frozen-lockfile --network-concurrency 1 > /dev/null
-
-COPY . $APP
-
+RUN npm install yarn@1.22.22 -g
+COPY package.json yarn.lock $APP/
+COPY <<EOF $APP/viz-lib/package.json
+{
+  "version": "0.0.0",
+  "scripts": {
+    "build:babel": "echo build"
+  }
+}
+EOF
+RUN yarn install
+COPY client/cypress $APP/client/cypress
 RUN ./node_modules/.bin/cypress verify

.dockerignore → Dockerfile.dockerignore

@@ -1,4 +1,5 @@
 client/.tmp/
+client/cypress/
 node_modules/
 viz-lib/node_modules/
 .tmp/
@@ -12,3 +13,8 @@ venv/
 /.github/
 /netlify.toml
 /setup/
+.github/
+compose.*
+*.md
+LICENSE*
+Dockerfile*

client/.eslintrc.js

@@ -29,6 +29,7 @@ module.exports = {
       },
     ],
     "jsx-a11y/no-redundant-roles": "error",
+    "cypress/unsafe-to-chain-command": "off",
     "jsx-a11y/no-autofocus": "off",
     "jsx-a11y/click-events-have-key-events": "off", // TMP
     "jsx-a11y/no-static-element-interactions": "off", // TMP

client/cypress/cypress.js

@@ -1,10 +1,8 @@
 /* eslint-disable import/no-extraneous-dependencies, no-console */
-const { find } = require("lodash");
 const { execSync } = require("child_process");
-const { get, post } = require("request").defaults({ jar: true });
 const { seedData } = require("./seed-data");
 const fs = require("fs");
-var Cookie = require("request-cookies").Cookie;
+const axios = require("axios");
 
 let cypressConfigBaseUrl;
 try {
@@ -13,32 +11,47 @@ try {
 } catch (e) {}
 
 const baseUrl = process.env.CYPRESS_baseUrl || cypressConfigBaseUrl || "http://localhost:5001";
+const instance = axios.create({
+  baseURL: baseUrl,
+});
 
-function seedDatabase(seedValues) {
-  get(baseUrl + "/login", (_, { headers }) => {
-    const request = seedValues.shift();
-    const data = request.type === "form" ? { formData: request.data } : { json: request.data };
+let config = {
+  maxRedirects: 0,
+  validateStatus: status => {
+    return status >= 200 && status < 303;
+  },
+  headers: {},
+};
 
-    if (headers["set-cookie"]) {
-      const cookies = headers["set-cookie"].map(cookie => new Cookie(cookie));
-      const csrfCookie = find(cookies, { key: "csrf_token" });
-      if (csrfCookie) {
-        if (request.type === "form") {
-          data["formData"] = { ...data["formData"], csrf_token: csrfCookie.value };
-        } else {
-          data["headers"] = { "X-CSRFToken": csrfCookie.value };
-        }
-      }
-    }
+let csrfToken;
 
-    post(baseUrl + request.route, data, (err, response) => {
-      const result = response ? response.statusCode : err;
-      console.log("POST " + request.route + " - " + result);
+function seedDatabase(seedValues) {
+  const request = seedValues.shift();
+  const headers = Object.assign({}, config.headers, request.config.headers);
+  const reqConfig = Object.assign({}, config, request.config, { headers });
+  if (csrfToken) {
+    const csrfValue = csrfToken.substring(csrfToken.indexOf("=") + 1, csrfToken.indexOf(";"));
+    if (request.type === "form") {
+      reqConfig["data"]["csrf_token"] = csrfValue;
+    } else {
+      reqConfig["headers"]["X-CSRFToken"] = csrfValue;
+    }
+  }
+  instance
+    .request(reqConfig)
+    .then(res => {
+      if (res.headers["set-cookie"]) {
+        csrfToken = res.headers["set-cookie"].find(cookie => cookie.startsWith("csrf_token="));
+        config["headers"]["Cookie"] = res.headers["set-cookie"].join(";");
+      }
+      console.log(`${reqConfig.method} ${reqConfig.url} - ${res.status}`);
       if (seedValues.length) {
         seedDatabase(seedValues);
       }
+    })
+    .catch(err => {
+      console.log(`${reqConfig.method} ${reqConfig.url} -  ${err}`);
     });
-  });
 }
 
 function buildServer() {

client/cypress/integration/alert/view_alert_spec.js

@@ -22,9 +22,8 @@ describe("View Alert", () => {
       .contains("Test Email Destination")
       .should("not.exist");
 
-    cy.server();
-    cy.route("GET", "**/api/destinations").as("Destinations");
-    cy.route("GET", "**/api/alerts/*/subscriptions").as("Subscriptions");
+    cy.intercept("GET", "**/api/destinations").as("Destinations");
+    cy.intercept("GET", "**/api/alerts/*/subscriptions").as("Subscriptions");
 
     cy.visit(this.alertUrl);
 
@@ -49,8 +48,7 @@ describe("View Alert", () => {
     });
 
     it("hides remove button from non-author", function() {
-      cy.server();
-      cy.route("GET", "**/api/alerts/*/subscriptions").as("Subscriptions");
+      cy.intercept("GET", "**/api/alerts/*/subscriptions").as("Subscriptions");
 
       cy.logout()
         .then(() => cy.login()) // as admin
@@ -81,8 +79,7 @@ describe("View Alert", () => {
     });
 
     it("shows remove button for non-author admin", function() {
-      cy.server();
-      cy.route("GET", "**/api/alerts/*/subscriptions").as("Subscriptions");
+      cy.intercept("GET", "**/api/alerts/*/subscriptions").as("Subscriptions");
 
       cy.logout()
         .then(() => cy.login("user@redash.io", "password"))

client/cypress/integration/dashboard/dashboard_spec.js

@@ -14,8 +14,7 @@ describe("Dashboard", () => {
     cy.getByTestId("CreateButton").click();
     cy.getByTestId("CreateDashboardMenuItem").click();
 
-    cy.server();
-    cy.route("POST", "**/api/dashboards").as("NewDashboard");
+    cy.intercept("POST", "**/api/dashboards").as("NewDashboard");
 
     cy.getByTestId("CreateDashboardDialog").within(() => {
       cy.getByTestId("DashboardSaveButton").should("be.disabled");
@@ -57,8 +56,7 @@ describe("Dashboard", () => {
   });
 
   it("is accessible through multiple urls", () => {
-    cy.server();
-    cy.route("GET", "**/api/dashboards/*").as("LoadDashboard");
+    cy.intercept("GET", "**/api/dashboards/*").as("LoadDashboard");
     cy.createDashboard("Dashboard multiple urls").then(({ id, slug }) => {
       [`/dashboards/${id}`, `/dashboards/${id}-anything-here`, `/dashboard/${slug}`].forEach(url => {
         cy.visit(url);

client/cypress/integration/dashboard/dashboard_tags_spec.js

@@ -7,8 +7,7 @@ describe("Dashboard Tags", () => {
   });
 
   it("is possible to add and edit tags", () => {
-    cy.server();
-    cy.route("POST", "**/api/dashboards/*").as("DashboardSave");
+    cy.intercept("POST", "**/api/dashboards/*").as("DashboardSave");
 
     cy.getByTestId("TagsControl").contains(".label", "Unpublished");
 

client/cypress/integration/dashboard/grid_compliant_widgets_spec.js

@@ -48,8 +48,7 @@ describe("Grid compliant widgets", () => {
     });
 
     it("auto saves after drag", () => {
-      cy.server();
-      cy.route("POST", "**/api/widgets/*").as("WidgetSave");
+      cy.intercept("POST", "**/api/widgets/*").as("WidgetSave");
 
       editDashboard();
       cy.get("@textboxEl").dragBy(330);
@@ -116,8 +115,7 @@ describe("Grid compliant widgets", () => {
     });
 
     it("auto saves after resize", () => {
-      cy.server();
-      cy.route("POST", "**/api/widgets/*").as("WidgetSave");
+      cy.intercept("POST", "**/api/widgets/*").as("WidgetSave");
 
       editDashboard();
       resizeBy(cy.get("@textboxEl"), 200);

client/cypress/integration/dashboard/parameter_spec.js

@@ -53,6 +53,7 @@ describe("Dashboard Parameters", () => {
       .then(() => {
         if (closeMappingMenu) {
           cy.contains("button", "OK").click();
+          return cy.get("@Popover").should("not.exist");
         }
         return cy.get("@Popover").should("not.be.visible");
       });

client/cypress/integration/dashboard/textbox_spec.js

@@ -141,7 +141,7 @@ describe("Textbox", () => {
       })
       .should($el => {
         const { top, left } = $el.offset();
-        expect(top).to.be.oneOf([162, 162.015625]);
+        expect(top).to.be.oneOf([162.0078125]);
         expect(left).to.eq(282);
         expect($el.width()).to.eq(545);
         expect($el.height()).to.eq(185);

client/cypress/integration/dashboard/widget_spec.js

@@ -103,8 +103,7 @@ describe("Widget", () => {
 
       it("grows when dynamically adding table rows", () => {
         // listen to results
-        cy.server();
-        cy.route("GET", "**/api/query_results/*").as("FreshResults");
+        cy.intercept("GET", "**/api/query_results/*").as("FreshResults");
 
         // start with 1 table row
         cy.get("@paramInput")
@@ -131,8 +130,7 @@ describe("Widget", () => {
 
       it("revokes auto height after manual height adjustment", () => {
         // listen to results
-        cy.server();
-        cy.route("GET", "**/api/query_results/*").as("FreshResults");
+        cy.intercept("GET", "**/api/query_results/*").as("FreshResults");
 
         editDashboard();
 

client/cypress/integration/data-source/create_data_source_spec.js

@@ -5,8 +5,7 @@ describe("Create Data Source", () => {
 
   it("opens the creation dialog when clicking in the create link or button", () => {
     cy.visit("/data_sources");
-    cy.server();
-    cy.route("**/api/data_sources", []); // force an empty response
+    cy.intercept("**/api/data_sources", []); // force an empty response
 
     ["CreateDataSourceButton", "CreateDataSourceLink"].forEach(createElementTestId => {
       cy.getByTestId(createElementTestId).click();
@@ -18,8 +17,7 @@ describe("Create Data Source", () => {
 
   it("renders the page and takes a screenshot", function() {
     cy.visit("/data_sources/new");
-    cy.server();
-    cy.route("**/api/data_sources/types").as("DataSourceTypesRequest");
+    cy.intercept("**/api/data_sources/types").as("DataSourceTypesRequest");
 
     cy.wait("@DataSourceTypesRequest")
       .then(({ response }) => response.body.filter(type => type.deprecated))

client/cypress/integration/destination/create_destination_spec.js

@@ -5,8 +5,7 @@ describe("Create Destination", () => {
 
   it("renders the page and takes a screenshot", function() {
     cy.visit("/destinations/new");
-    cy.server();
-    cy.route("**/api/destinations/types").as("DestinationTypesRequest");
+    cy.intercept("**/api/destinations/types").as("DestinationTypesRequest");
 
     cy.wait("@DestinationTypesRequest")
       .then(({ response }) => response.body.filter(type => type.deprecated))

client/cypress/integration/query/parameter_spec.js

@@ -491,8 +491,7 @@ describe("Parameter", () => {
 
       cy.location("search").should("not.contain", "Redash");
 
-      cy.server();
-      cy.route("POST", "**/api/queries/*/results").as("Results");
+      cy.intecept("POST", "**/api/queries/*/results").as("Results");
 
       apply(cy.get("@Input"));
 
@@ -512,8 +511,7 @@ describe("Parameter", () => {
         },
       };
 
-      cy.server();
-      cy.route("GET", "**/api/data_sources/*/schema").as("Schema");
+      cy.intercept("GET", "**/api/data_sources/*/schema").as("Schema");
 
       cy.createQuery(queryData, false)
         .then(({ id }) => cy.visit(`/queries/${id}/source`))
@@ -603,8 +601,7 @@ describe("Parameter", () => {
     });
 
     it("is possible to rearrange parameters", function() {
-      cy.server();
-      cy.route("POST", "**/api/queries/*").as("QuerySave");
+      cy.intercept("POST", "**/api/queries/*").as("QuerySave");
 
       dragParam("param1", this.paramWidth, 1);
       cy.wait("@QuerySave");

client/cypress/integration/query/query_tags_spec.js

@@ -13,8 +13,7 @@ describe("Query Tags", () => {
   });
 
   it("is possible to add and edit tags", () => {
-    cy.server();
-    cy.route("POST", "**/api/queries/*").as("QuerySave");
+    cy.intercept("POST", "**/api/queries/*").as("QuerySave");
 
     cy.getByTestId("TagsControl").contains(".label", "Unpublished");
 

client/cypress/integration/visualizations/pivot_spec.js

@@ -63,8 +63,7 @@ describe("Pivot", () => {
 
     const visualizationName = "Pivot";
 
-    cy.server();
-    cy.route("POST", "**/api/visualizations").as("SaveVisualization");
+    cy.intercept("POST", "**/api/visualizations").as("SaveVisualization");
 
     createPivotThroughUI(visualizationName, { hideControls: true });