From f1001dc1ac95e0a23a289de3e809fad85007946f Mon Sep 17 00:00:00 2001
From: k-fish <kevan.fisher@sentry.io>
Date: Wed, 9 Sep 2020 16:07:45 -0700
Subject: [PATCH 1/2] fix(ember): Fix ember tests by switching ember-try to
 yarn

Ember-try uses npm to modify the package.json to test different versions of Ember, switching to use yarn should fix the issues it had resolving on new releases
---
 packages/ember/config/ember-try.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/ember/config/ember-try.js b/packages/ember/config/ember-try.js
index 91935e105971..fad8adf3cb71 100644
--- a/packages/ember/config/ember-try.js
+++ b/packages/ember/config/ember-try.js
@@ -4,6 +4,7 @@ const getChannelURL = require('ember-source-channel-url');
 
 module.exports = async function() {
   return {
+    useYarn: true,
     scenarios: [
       {
         name: 'ember-lts-3.12',

From 475537eddad3012ca05b7e311f01bbc23605110d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Og=C3=B3rek?= <kamil.ogorek@gmail.com>
Date: Thu, 10 Sep 2020 10:54:29 +0200
Subject: [PATCH 2/2] Restored ember tests

---
 .github/workflows/build.yml | 2 +-
 scripts/test.sh             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e03b8b044bfc..8178178f3683 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -87,7 +87,7 @@ jobs:
           key: ${{ runner.os }}-${{ github.sha }}
       - run: yarn install
       - name: Unit Tests
-        run: yarn test --ignore="@sentry/ember"
+        run: yarn test
       - uses: codecov/codecov-action@v1
 
   job_browserstack_test:
diff --git a/scripts/test.sh b/scripts/test.sh
index 9a635e41cba2..8d2e1ac2497a 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -10,7 +10,7 @@ if [[ "$(cut -d. -f1 <<< "$TRAVIS_NODE_VERSION")" -le 6 ]]; then
   yarn build --ignore="@sentry/ember" --ignore="@sentry/serverless"
   nvm use 6
   # browser can be tested only on Node >= v8 because Karma is not supporting anything older
-  yarn test --ignore="@sentry/tracing" --ignore="@sentry/react" --ignore="@sentry/gatsby" --ignore="@sentry/ember" --ignore="@sentry-internal/eslint-plugin-sdk" --ignore="@sentry-internal/eslint-config-sdk" --ignore="@sentry/serverless" --ignore="@sentry/browser" --ignore="@sentry/integrations"
+  yarn test --ignore="@sentry/tracing" --ignore="@sentry/react" --ignore="@sentry/gatsby" --ignore="@sentry/ember" --ignore="@sentry-internal/eslint-plugin-sdk" --ignore="@sentry-internal/eslint-config-sdk" --ignore="@sentry/serverless" --ignore="@sentry/browser" --ignore="@sentry/integrations" 
 elif [[ "$(cut -d. -f1 <<< "$TRAVIS_NODE_VERSION")" -le 8 ]]; then
   yarn install --ignore-engines --ignore-scripts
   # ember requires Node >= 10 to build
@@ -20,5 +20,5 @@ elif [[ "$(cut -d. -f1 <<< "$TRAVIS_NODE_VERSION")" -le 8 ]]; then
 else
   yarn install
   yarn build
-  yarn test --ignore="@sentry/ember"
+  yarn test
 fi