Commit 34ede2dd authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch '9-add-default-cypress-config-js-for-configuration' into 'master' 

Resolve "Add default cypress.config.js for configuration"

Closes #9

See merge request to-be-continuous/cypress!28
parents 5ff82758 d4f30117

README.md

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ It uses the following variable: 


| Name                  | description                              | default value     |

| --------------------- | ---------------------------------------- | ----------------- |

| `CYPRESS_IMAGE`       | The Docker image used to run Cypress (use [included images](https://github.com/cypress-io/cypress-docker-images/tree/master/included) only). | `cypress/included:4.6.0` |

| `CYPRESS_PROJECT_DIR` | The Cypress project directory (containing `cypress.json`) | `.` |

| `CYPRESS_IMAGE`       | The Docker image used to run Cypress (use [included images](https://github.com/cypress-io/cypress-docker-images/tree/master/included) only). | `cypress/included:12.0.2` |

| `CYPRESS_PROJECT_DIR` | The Cypress project directory (containing `cypress.config.js` or `cypress.config.ts`) | `.` |

| `CYPRESS_EXTRA_ARGS`  | Cypress extra [run options](https://docs.cypress.io/guides/guides/command-line.html#cypress-run) (to select a different browser, configuration or spec files for e.g.) | _none_ |

| `REVIEW_ENABLED`      | Set to `true` to enable Cypress tests on review environments (dynamic environments instantiated on development branches) | _none_ (disabled) |

kicker.json

+2 −2
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ 
    {

      "name": "CYPRESS_IMAGE",

      "description": "The Docker image used to run Cypress (use [included images](https://github.com/cypress-io/cypress-docker-images/tree/master/included) only).",

      "default": "cypress/included:4.6.0"

      "default": "cypress/included:12.0.2"

    },

    {

      "name": "CYPRESS_PROJECT_DIR",

      "description": "The Cypress project directory (containing `cypress.json`)",

      "description": "The Cypress project directory (containing `cypress.config.js` or `cypress.config.ts`)",

      "default": "."

    },

    {

templates/gitlab-ci-cypress.yml

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ variables: 
  TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"



  # Default Docker image (can be overridden)

  CYPRESS_IMAGE: "cypress/included:4.6.0"

  CYPRESS_IMAGE: "cypress/included:12.0.2"

  CYPRESS_PROJECT_DIR: "."

  # default production ref name (pattern)

  PROD_REF: '/^(master|main)$/'