Skip to content

Commit 1e6d18e

Browse files
authored
Merge pull request #107 from BobrImperator/main
Remove test-support page objects, Migrate to a V2 addon
2 parents 9e522c0 + 37ce14a commit 1e6d18e

77 files changed

Lines changed: 5125 additions & 8500 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ember-cli

Lines changed: 0 additions & 19 deletions
This file was deleted.

.env.development

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
NODE_ENV=development

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
90a25e4fa93b282af8b4cb09e62331617dc07120
2+
24eb84b5ba84bb6481038da2fb5db96ecddfe5e1

.github/workflows/ci.yml

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
name: "Tests"
1717
runs-on: ubuntu-latest
1818
timeout-minutes: 10
19+
outputs:
20+
matrix: ${{ steps.set-matrix.outputs.matrix }}
1921

2022
steps:
2123
- uses: actions/checkout@v4
2224
- uses: pnpm/action-setup@v4
23-
with:
24-
version: 10
2525
- name: Install Node
2626
uses: actions/setup-node@v4
2727
with:
@@ -32,7 +32,9 @@ jobs:
3232
- name: Lint
3333
run: pnpm lint
3434
- name: Run Tests
35-
run: pnpm test:ember
35+
run: pnpm test
36+
- id: set-matrix
37+
run: echo "matrix=$(pnpm -s dlx @embroider/try list)" >> $GITHUB_OUTPUT
3638

3739
floating:
3840
name: "Floating Dependencies"
@@ -42,48 +44,39 @@ jobs:
4244
steps:
4345
- uses: actions/checkout@v4
4446
- uses: pnpm/action-setup@v4
45-
with:
46-
version: 10
4747
- uses: actions/setup-node@v4
4848
with:
4949
node-version: 20
5050
cache: pnpm
5151
- name: Install Dependencies
5252
run: pnpm install --no-lockfile
53+
- name: Build
54+
run: pnpm build
5355
- name: Run Tests
54-
run: pnpm test:ember
56+
run: pnpm test
5557

5658
try-scenarios:
57-
name: ${{ matrix.try-scenario }}
59+
name: ${{ matrix.name }}
5860
runs-on: ubuntu-latest
5961
needs: "test"
6062
timeout-minutes: 10
61-
6263
strategy:
6364
fail-fast: false
64-
matrix:
65-
try-scenario:
66-
- ember-lts-4.12
67-
- ember-lts-5.4
68-
- ember-lts-5.8
69-
- ember-lts-5.12
70-
- ember-release
71-
- ember-beta
72-
- ember-canary
73-
- embroider-safe
74-
- embroider-optimized
65+
matrix: ${{fromJson(needs.test.outputs.matrix)}}
7566

7667
steps:
7768
- uses: actions/checkout@v4
7869
- uses: pnpm/action-setup@v4
79-
with:
80-
version: 10
81-
- name: Install Node
82-
uses: actions/setup-node@v4
70+
- uses: actions/setup-node@v4
8371
with:
8472
node-version: 20
8573
cache: pnpm
74+
- name: Apply Scenario
75+
run: pnpm dlx @embroider/try apply ${{ matrix.name }}
8676
- name: Install Dependencies
87-
run: pnpm install --frozen-lockfile
77+
run: pnpm install --no-lockfile
78+
- run: pnpm build
79+
env: ${{ matrix.env }}
8880
- name: Run Tests
89-
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
81+
run: pnpm test
82+
env: ${{ matrix.env }}

.github/workflows/plan-release.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ jobs:
5252
fetch-depth: 0
5353
ref: 'main'
5454
- uses: pnpm/action-setup@v4
55-
with:
56-
version: 10
5755
- uses: actions/setup-node@v4
5856
with:
5957
node-version: 20

.github/workflows/publish.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ jobs:
2929
steps:
3030
- uses: actions/checkout@v4
3131
- uses: pnpm/action-setup@v4
32-
with:
33-
version: 10
3432
- uses: actions/setup-node@v4
3533
with:
3634
node-version: 20

.gitignore

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
# compiled output
22
/dist/
3+
/dist-tests/
34
/declarations/
45

5-
# dependencies
6-
/node_modules/
6+
# from scenarios
7+
tmp/
8+
config/optional-features.json
9+
ember-cli-build.cjs
10+
11+
# deps & caches
12+
node_modules/
13+
.eslintcache
14+
.prettiercache
15+
16+
# potentially containing secrets
17+
*.local
718

819
# misc
9-
/.env*
1020
/.pnp*
11-
/.eslintcache
1221
/coverage/
1322
/npm-debug.log*
1423
/testem.log
1524
/yarn-error.log
1625

17-
# broccoli-debug
18-
/DEBUG/
19-
2026
# IDE
2127
/.idea/
2228
/*.iml

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
auto-install-peers=false

.prettierrc.js renamed to .prettierrc.mjs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
'use strict';
2-
3-
module.exports = {
1+
export default {
42
plugins: ['prettier-plugin-ember-template-tag'],
53
overrides: [
64
{

.stylelintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33

44
# compiled output
55
/dist/
6+
/dist-tests/

0 commit comments

Comments
 (0)