Skip to content

Commit

Permalink
Load ember-try as an in-repo addon from smoke-test-app.
Browse files Browse the repository at this point in the history
This allows us to remove hte custom `npm pack` work that was being done
in `run-smoke-test.sh` and simplify the testing of the smoke-test-app.
  • Loading branch information
rwjblue committed Oct 28, 2020
1 parent 250ae78 commit 6dd5973
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 21 deletions.
12 changes: 10 additions & 2 deletions .github/workflows/ci.yml
Expand Up @@ -146,7 +146,11 @@ jobs:
with:
node-version: ${{ matrix.node }}

- run: yarn install
- name: install deps
run: yarn install
- name: install smoke-test-app deps
run: npm install
working-directory: smoke-test-app
- run: npm run smoke-test

yarn-smoke-tests:
Expand All @@ -168,5 +172,9 @@ jobs:
with:
node-version: ${{ matrix.node }}

- run: yarn install
- name: install deps
run: yarn install
- name: install smoke-test-app deps
run: yarn install
working-directory: smoke-test-app
- run: yarn smoke-test-yarn
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -29,8 +29,8 @@
"lint:js": "eslint .",
"node-test": "mocha test/**/*.js",
"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",
"smoke-test": "cd smoke-test-app && ./smoke-test.sh",
"smoke-test-yarn": "cd smoke-test-app && ./smoke-test-yarn.sh",
"start": "ember serve",
"test": "npm run-script lint && npm run-script node-test"
},
Expand Down
16 changes: 0 additions & 16 deletions run-smoke-test.sh

This file was deleted.

7 changes: 6 additions & 1 deletion smoke-test-app/package.json
Expand Up @@ -40,7 +40,6 @@
"ember-qunit": "^4.6.0",
"ember-resolver": "^8.0.2",
"ember-source": "~3.22.0",
"ember-try": "file:../",
"eslint-plugin-ember": "^8.14.0",
"loader.js": "^4.7.0",
"qunit-dom": "^1.5.0"
Expand All @@ -50,5 +49,11 @@
},
"engines": {
"node": "6.* || 8.* || >= 10.*"
},
"ember-addon": {
"#": "use ember-try as an 'in-repo' addon",
"paths": [
"../"
]
}
}

0 comments on commit 6dd5973

Please sign in to comment.