diff --git a/.circleci/config.yml b/.circleci/config.yml index 3658e56fe2fe..2201c13d29f1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -159,7 +159,7 @@ jobs: command: yarn info @storybook/core - run: name: run e2e tests - command: yarn test:e2e-framework yarn2Cra + command: yarn test:e2e-framework yarn_2_cra - store_artifacts: path: /tmp/storybook/cypress destination: cypress diff --git a/scripts/run-e2e-config.ts b/scripts/run-e2e-config.ts index 8f979c256702..7bd98044930d 100644 --- a/scripts/run-e2e-config.ts +++ b/scripts/run-e2e-config.ts @@ -116,8 +116,8 @@ export const react: Parameters = { generator: fromDeps('react', 'react-dom'), }; -export const reactTypescript: Parameters = { - name: 'react-typescript', +export const react_typescript: Parameters = { + name: 'react_typescript', version: 'latest', generator: fromDeps('react'), typescript: true, @@ -171,14 +171,14 @@ export const web_components: Parameters = { additionalDeps: ['react', 'react-dom'], }; -export const webpackReact: Parameters = { - name: 'webpackReact', +export const webpack_react: Parameters = { + name: 'webpack_react', version: 'latest', generator: fromDeps('react', 'react-dom', 'webpack'), }; -export const yarn2Cra: Parameters = { - name: 'yarn2Cra', +export const yarn_2_cra: Parameters = { + name: 'yarn_2_cra', version: 'latest', generator: [ `yarn set version 2`, @@ -190,8 +190,8 @@ export const yarn2Cra: Parameters = { ].join(' && '), }; -export const reactInYarnWorkspace: Parameters = { - name: 'reactInYarnWorkspace', +export const react_in_yarn_workspace: Parameters = { + name: 'react_in_yarn_workspace', version: 'latest', generator: [ 'cd {{name}}-v{{version}}', diff --git a/scripts/run-e2e.ts b/scripts/run-e2e.ts index 1d9e8a7c9314..1ecc8803eb28 100644 --- a/scripts/run-e2e.ts +++ b/scripts/run-e2e.ts @@ -301,7 +301,7 @@ if (frameworkArgs.length > 0) { e2eConfigs = typedConfigs; // FIXME: For now Yarn 2 E2E tests must be run by explicitly call `yarn test:e2e-framework yarn2Cra@latest` // Because it is telling Yarn to use version 2 - delete e2eConfigs.yarn2Cra; + delete e2eConfigs.yarn_2_cra; } const perform = () => {