This is an automated email from the ASF dual-hosted git repository. maximebeauchemin pushed a commit to branch cypress-docker-compose in repository https://gitbox.apache.org/repos/asf/superset.git
commit 2ee998be12f37fac1854656340c73dc5437b472a Author: Maxime Beauchemin <[email protected]> AuthorDate: Thu Jan 9 18:17:01 2025 -0800 confused --- docker/docker-bootstrap.sh | 2 +- docker/pythonpath_dev/superset_config.py | 2 ++ .../cypress-base/cypress/support/commands.ts | 37 -------------------- .../cypress/support/component-index.html | 12 ------- .../cypress-base/cypress/support/component.ts | 39 ---------------------- 5 files changed, 3 insertions(+), 89 deletions(-) diff --git a/docker/docker-bootstrap.sh b/docker/docker-bootstrap.sh index 5a4f9b1cd8..ddb591b458 100755 --- a/docker/docker-bootstrap.sh +++ b/docker/docker-bootstrap.sh @@ -29,7 +29,7 @@ REQUIREMENTS_LOCAL="/app/docker/requirements-local.txt" PORT=${PORT:-8088} # If Cypress run – overwrite the password for admin and export env variables if [ "$CYPRESS_CONFIG" == "true" ]; then - export SUPERSET_CONFIG=tests.integration_tests.superset_test_config + #export SUPERSET_CONFIG=tests.integration_tests.superset_test_config export SUPERSET_TESTENV=true export POSTGRES_DB=superset_cypress export SUPERSET__SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://superset:superset@db:5432/superset_cypress diff --git a/docker/pythonpath_dev/superset_config.py b/docker/pythonpath_dev/superset_config.py index 786bbc8a84..100164592e 100644 --- a/docker/pythonpath_dev/superset_config.py +++ b/docker/pythonpath_dev/superset_config.py @@ -109,6 +109,8 @@ log_level_text = os.getenv("SUPERSET_LOG_LEVEL", "INFO") LOG_LEVEL = getattr(logging, log_level_text.upper(), logging.INFO) if os.getenv("CYPRESS_CONFIG") == "true": + # When running the service as a cypress backend, we need to import the config + # located @ tests/integration_tests/superset_test_config.py base_dir = os.path.dirname(__file__) module_folder = os.path.abspath( os.path.join(base_dir, "../../tests/integration_tests/") diff --git a/superset-frontend/cypress-base/cypress/support/commands.ts b/superset-frontend/cypress-base/cypress/support/commands.ts deleted file mode 100644 index 95857aea4c..0000000000 --- a/superset-frontend/cypress-base/cypress/support/commands.ts +++ /dev/null @@ -1,37 +0,0 @@ -/// <reference types="cypress" /> -// *********************************************** -// This example commands.ts shows you how to -// create various custom commands and overwrite -// existing commands. -// -// For more comprehensive examples of custom -// commands please read more here: -// https://on.cypress.io/custom-commands -// *********************************************** -// -// -// -- This is a parent command -- -// Cypress.Commands.add('login', (email, password) => { ... }) -// -// -// -- This is a child command -- -// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... }) -// -// -// -- This is a dual command -- -// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... }) -// -// -// -- This will overwrite an existing command -- -// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... }) -// -// declare global { -// namespace Cypress { -// interface Chainable { -// login(email: string, password: string): Chainable<void> -// drag(subject: string, options?: Partial<TypeOptions>): Chainable<Element> -// dismiss(subject: string, options?: Partial<TypeOptions>): Chainable<Element> -// visit(originalFn: CommandOriginalFn, url: string, options: Partial<VisitOptions>): Chainable<Element> -// } -// } -// } diff --git a/superset-frontend/cypress-base/cypress/support/component-index.html b/superset-frontend/cypress-base/cypress/support/component-index.html deleted file mode 100644 index faf3b5f43b..0000000000 --- a/superset-frontend/cypress-base/cypress/support/component-index.html +++ /dev/null @@ -1,12 +0,0 @@ -<!doctype html> -<html> - <head> - <meta charset="utf-8" /> - <meta http-equiv="X-UA-Compatible" content="IE=edge" /> - <meta name="viewport" content="width=device-width,initial-scale=1.0" /> - <title>Components App</title> - </head> - <body> - <div data-cy-root></div> - </body> -</html> diff --git a/superset-frontend/cypress-base/cypress/support/component.ts b/superset-frontend/cypress-base/cypress/support/component.ts deleted file mode 100644 index 69e1fa9661..0000000000 --- a/superset-frontend/cypress-base/cypress/support/component.ts +++ /dev/null @@ -1,39 +0,0 @@ -// *********************************************************** -// This example support/component.ts is processed and -// loaded automatically before your test files. -// -// This is a great place to put global configuration and -// behavior that modifies Cypress. -// -// You can change the location of this file or turn off -// automatically serving support files with the -// 'supportFile' configuration option. -// -// You can read more here: -// https://on.cypress.io/configuration -// *********************************************************** - -// Import commands.js using ES2015 syntax: -import './commands'; - -// Alternatively you can use CommonJS syntax: -// require('./commands') - -import { mount } from 'cypress/react'; - -// Augment the Cypress namespace to include type definitions for -// your custom command. -// Alternatively, can be defined in cypress/support/component.d.ts -// with a <reference path="./component" /> at the top of your spec. -declare global { - namespace Cypress { - interface Chainable { - mount: typeof mount; - } - } -} - -Cypress.Commands.add('mount', mount); - -// Example use: -// cy.mount(<MyComponent />)
