From e3671e943fb9660c2704a52b56cc5eb8ab79c86c Mon Sep 17 00:00:00 2001 From: NullVoxPopuli Date: Thu, 16 Dec 2021 17:41:03 -0500 Subject: [PATCH] Remove jQuery integration scenario from ember-try --- blueprints/addon/files/.github/workflows/ci.yml | 1 - blueprints/addon/files/.travis.yml | 1 - blueprints/addon/files/addon-config/ember-try.js | 13 ------------- tests/fixtures/addon/defaults-travis/.travis.yml | 1 - .../addon/defaults-travis/config/ember-try.js | 13 ------------- .../addon/defaults/.github/workflows/ci.yml | 1 - tests/fixtures/addon/defaults/config/ember-try.js | 13 ------------- tests/fixtures/addon/yarn/.github/workflows/ci.yml | 1 - tests/fixtures/addon/yarn/.travis.yml | 1 - tests/fixtures/addon/yarn/config/ember-try.js | 13 ------------- 10 files changed, 58 deletions(-) diff --git a/blueprints/addon/files/.github/workflows/ci.yml b/blueprints/addon/files/.github/workflows/ci.yml index e63868c1f1..2b610b8a1c 100644 --- a/blueprints/addon/files/.github/workflows/ci.yml +++ b/blueprints/addon/files/.github/workflows/ci.yml @@ -60,7 +60,6 @@ jobs: - ember-beta - ember-canary - ember-classic - - ember-default-with-jquery - embroider-safe - embroider-optimized diff --git a/blueprints/addon/files/.travis.yml b/blueprints/addon/files/.travis.yml index 31a30f0d19..df683d2817 100644 --- a/blueprints/addon/files/.travis.yml +++ b/blueprints/addon/files/.travis.yml @@ -56,7 +56,6 @@ jobs: - env: EMBER_TRY_SCENARIO=ember-release - env: EMBER_TRY_SCENARIO=ember-beta - env: EMBER_TRY_SCENARIO=ember-canary - - env: EMBER_TRY_SCENARIO=ember-default-with-jquery - env: EMBER_TRY_SCENARIO=ember-classic - env: EMBER_TRY_SCENARIO=embroider-safe - env: EMBER_TRY_SCENARIO=embroider-optimized diff --git a/blueprints/addon/files/addon-config/ember-try.js b/blueprints/addon/files/addon-config/ember-try.js index cc564ade16..bb9e656003 100644 --- a/blueprints/addon/files/addon-config/ember-try.js +++ b/blueprints/addon/files/addon-config/ember-try.js @@ -47,19 +47,6 @@ module.exports = async function () { }, }, }, - { - name: 'ember-default-with-jquery', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ - 'jquery-integration': true, - }), - }, - npm: { - devDependencies: { - '@ember/jquery': '^1.1.0', - }, - }, - }, { name: 'ember-classic', env: { diff --git a/tests/fixtures/addon/defaults-travis/.travis.yml b/tests/fixtures/addon/defaults-travis/.travis.yml index 379505e38e..c9b0a15140 100644 --- a/tests/fixtures/addon/defaults-travis/.travis.yml +++ b/tests/fixtures/addon/defaults-travis/.travis.yml @@ -52,7 +52,6 @@ jobs: - env: EMBER_TRY_SCENARIO=ember-release - env: EMBER_TRY_SCENARIO=ember-beta - env: EMBER_TRY_SCENARIO=ember-canary - - env: EMBER_TRY_SCENARIO=ember-default-with-jquery - env: EMBER_TRY_SCENARIO=ember-classic - env: EMBER_TRY_SCENARIO=embroider-safe - env: EMBER_TRY_SCENARIO=embroider-optimized diff --git a/tests/fixtures/addon/defaults-travis/config/ember-try.js b/tests/fixtures/addon/defaults-travis/config/ember-try.js index 707dae202d..b9798d0ba3 100644 --- a/tests/fixtures/addon/defaults-travis/config/ember-try.js +++ b/tests/fixtures/addon/defaults-travis/config/ember-try.js @@ -46,19 +46,6 @@ module.exports = async function () { }, }, }, - { - name: 'ember-default-with-jquery', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ - 'jquery-integration': true, - }), - }, - npm: { - devDependencies: { - '@ember/jquery': '^1.1.0', - }, - }, - }, { name: 'ember-classic', env: { diff --git a/tests/fixtures/addon/defaults/.github/workflows/ci.yml b/tests/fixtures/addon/defaults/.github/workflows/ci.yml index 396fcfe491..909069093e 100644 --- a/tests/fixtures/addon/defaults/.github/workflows/ci.yml +++ b/tests/fixtures/addon/defaults/.github/workflows/ci.yml @@ -60,7 +60,6 @@ jobs: - ember-beta - ember-canary - ember-classic - - ember-default-with-jquery - embroider-safe - embroider-optimized diff --git a/tests/fixtures/addon/defaults/config/ember-try.js b/tests/fixtures/addon/defaults/config/ember-try.js index 2612023fa0..9dbefdd3ae 100644 --- a/tests/fixtures/addon/defaults/config/ember-try.js +++ b/tests/fixtures/addon/defaults/config/ember-try.js @@ -46,19 +46,6 @@ module.exports = async function () { }, }, }, - { - name: 'ember-default-with-jquery', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ - 'jquery-integration': true, - }), - }, - npm: { - devDependencies: { - '@ember/jquery': '^1.1.0', - }, - }, - }, { name: 'ember-classic', env: { diff --git a/tests/fixtures/addon/yarn/.github/workflows/ci.yml b/tests/fixtures/addon/yarn/.github/workflows/ci.yml index 59b30ad982..1c3df72ec4 100644 --- a/tests/fixtures/addon/yarn/.github/workflows/ci.yml +++ b/tests/fixtures/addon/yarn/.github/workflows/ci.yml @@ -60,7 +60,6 @@ jobs: - ember-beta - ember-canary - ember-classic - - ember-default-with-jquery - embroider-safe - embroider-optimized diff --git a/tests/fixtures/addon/yarn/.travis.yml b/tests/fixtures/addon/yarn/.travis.yml index 1ab83d9aa4..a0e0d7ddde 100644 --- a/tests/fixtures/addon/yarn/.travis.yml +++ b/tests/fixtures/addon/yarn/.travis.yml @@ -51,7 +51,6 @@ jobs: - env: EMBER_TRY_SCENARIO=ember-release - env: EMBER_TRY_SCENARIO=ember-beta - env: EMBER_TRY_SCENARIO=ember-canary - - env: EMBER_TRY_SCENARIO=ember-default-with-jquery - env: EMBER_TRY_SCENARIO=ember-classic - env: EMBER_TRY_SCENARIO=embroider-safe - env: EMBER_TRY_SCENARIO=embroider-optimized diff --git a/tests/fixtures/addon/yarn/config/ember-try.js b/tests/fixtures/addon/yarn/config/ember-try.js index 8e178a63ca..1852784641 100644 --- a/tests/fixtures/addon/yarn/config/ember-try.js +++ b/tests/fixtures/addon/yarn/config/ember-try.js @@ -47,19 +47,6 @@ module.exports = async function () { }, }, }, - { - name: 'ember-default-with-jquery', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ - 'jquery-integration': true, - }), - }, - npm: { - devDependencies: { - '@ember/jquery': '^1.1.0', - }, - }, - }, { name: 'ember-classic', env: {