Skip to content

Commit

Permalink
Merge pull request #621 from buschtoens/fix-tests
Browse files Browse the repository at this point in the history
Make tests pass and CI green
  • Loading branch information
SergeAstapov authored Jul 9, 2024
2 parents 0d5ab68 + 1559816 commit ef5a607
Show file tree
Hide file tree
Showing 49 changed files with 612 additions and 99 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ jobs:
try-scenario:
- ember-lts-4.12
- ember-lts-5.4
- ember-lts-5.8
- ember-release
- ember-beta
- ember-canary
Expand All @@ -83,3 +84,4 @@ jobs:
run: pnpm install --frozen-lockfile
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
working-directory: test-app
2 changes: 1 addition & 1 deletion ember-lazy-mount/.template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';

module.exports = {
extends: 'recommended'
extends: 'recommended',
};
5 changes: 0 additions & 5 deletions ember-lazy-mount/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
},
"scripts": {
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"**/*.css\"",
"lint:css:fix": "concurrently \"pnpm:lint:css -- --fix\"",
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
Expand Down Expand Up @@ -56,9 +54,6 @@
"prettier": "^3.3.2",
"rsvp": "^4.8.5",
"qunit-dom": "^3.2.0",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.1.0",
"webpack": "^5.92.1"
},
"peerDependencies": {
Expand Down
16 changes: 3 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
{
"private": true,
"workspaces": [
"ember-lazy-mount",
"test-app",
"test-engine"
],
"scripts": {
"lint": "concurrently 'pnpm:lint:*(!fix)' --names 'lint:'",
"lint:fix": "concurrently 'pnpm:lint:*:fix' --names 'fix:'",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"prepack": "concurrently 'pnpm:build:*'",
"lint": "pnpm --filter '*' lint",
"lint:fix": "pnpm --filter '*' lint:fix",
"test": "pnpm --filter '*' test"
},
"devDependencies": {
"concurrently": "^8.2.2"
},
"devDependencies": {},
"packageManager": "pnpm@8.15.8",
"volta": {
"node": "18.20.4"
Expand Down
147 changes: 132 additions & 15 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
packages:
- 'ember-lazy-mount'
- 'test-app'
- 'test-engine'
- 'test-engine1'
- 'test-engine2'
8 changes: 8 additions & 0 deletions test-app/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@ module.exports = async function () {
},
},
},
{
name: 'ember-lts-5.8',
npm: {
devDependencies: {
'ember-source': '~5.8.0',
},
},
},
{
name: 'ember-release',
npm: {
Expand Down
2 changes: 2 additions & 0 deletions test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.1.0",
"test-engine1": "workspace:*",
"test-engine2": "workspace:*",
"tracked-built-ins": "^3.3.0",
"webpack": "^5.92.1"
},
Expand Down
Loading

0 comments on commit ef5a607

Please sign in to comment.