explicitly separating yarn and npm scenarios

Co-authored-by: Katie Gengler <[email protected]>

Author: mansona

.travis.yml

@@ -32,22 +32,25 @@ jobs:
   - stage: tests
     name: Node 10 With Coverage
     script:
-    - yarn lint
-    - yarn node-test-with-coverage
+      - yarn lint
+      - yarn node-test-with-coverage
   - stage: additional tests
     name: floating dependencies
     install: yarn install --no-lockfile
   - name: All Commands Smoke Test
-    script:
-    - npm run client-test
+    script: npm run client-test
   - name: Node 6 Smoke Test
     node_js: '6'
-    script:
-    - npm run smoke-test
+    script: npm run smoke-test
   - name: Node 8 Smoke Test
     node_js: '8'
-    script:
-    - npm run smoke-test
+    script: npm run smoke-test
+  - name: Node 6 Yarn Smoke Test
+    node_js: '6'
+    script: yarn smoke-test-yarn
+  - name: Node 8 Yarn Smoke Test
+    node_js: '8'
+    script: yarn smoke-test-yarn
   - stage: deploy
     if: tag IS present
     node_js: "10"

package.json

@@ -13,6 +13,7 @@
     "all-test": "npm run-script node-test && npm run-script smoke-test",
     "node-test-with-coverage": "nyc --reporter lcov npm run-script node-test && node_modules/.bin/codecov",
     "smoke-test": "./run-smoke-test.sh smoke-test.sh",
+    "smoke-test-yarn": "./run-smoke-test.sh smoke-test-yarn.sh",
     "lint": "eslint lib test"
   },
   "engines": {

run-smoke-test.sh

@@ -5,4 +5,9 @@ rm ember-try*.tgz || true
 npm pack
 now=$(date +%s)
 mv ember-try*.tgz "ember-try-${now}.tgz"
-cd smoke-test-app && npm i && npm i --save-dev "../ember-try-${now}.tgz" && "./${1}"
+if [[ $npm_execpath =~ ^.*yarn.*$ ]]; then
+  cd smoke-test-app && yarn upgrade "ember-try@file:../ember-try-${now}.tgz" && yarn install && "./${1}"
+else
+  cd smoke-test-app && npm install --save-dev "../ember-try-${now}.tgz" && npm install && "./${1}"
+fi
+

smoke-test-app/smoke-test-yarn.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -ex
+
+ember try:one test2 --config-path='../test/fixtures/dummy-ember-try-config-with-yarn-scenarios.js'

test/fixtures/dummy-ember-try-config-with-npm-scenarios.js

@@ -1,5 +1,4 @@
 module.exports = {
-  useYarn: true,
   scenarios: [
     {
       name: 'test1',

test/fixtures/dummy-ember-try-config-with-yarn-scenarios.js

@@ -0,0 +1,22 @@
+module.exports = {
+  useYarn: true,
+  scenarios: [
+    {
+      name: 'test1',
+      bower: {
+        dependencies: {
+          ember: '2.18.0'
+        }
+      }
+    },
+    {
+      name: 'test2',
+      command: 'ember test',
+      npm: {
+        dependencies: {
+          'ember-moment': '7.5.0'
+        }
+      }
+    }
+  ]
+};