Skip to content

Commit

Permalink
Move test-app
Browse files Browse the repository at this point in the history
  • Loading branch information
NullVoxPopuli committed Mar 4, 2023
1 parent a5ade60 commit 28fd17f
Show file tree
Hide file tree
Showing 78 changed files with 82 additions and 113 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- uses: ./.github/actions/download-built-package
- name: 'Change TS to ${{ matrix.typescript-scenario }}'
run: 'pnpm add --save-dev ${{ matrix.typescript-scenario}}'
working-directory: ./testing/ember-app
working-directory: ./test-app
- name: 'Type checking'

run: |
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
- uses: ./.github/actions/pnpm
- uses: ./.github/actions/download-built-package
- name: Run Tests
working-directory: ./testing/ember-app
working-directory: ./test-app
run: >-
node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
--skip-cleanup
Expand Down Expand Up @@ -178,12 +178,12 @@ jobs:
- uses: ./.github/actions/pnpm
- uses: ./.github/actions/download-built-package
- name: measure asset sizes
run: node ./build/estimate-bytes/index.js
run: node ./dev/estimate-bytes/index.js
- name: comment on PR
uses: marocchino/sticky-pull-request-comment@v2
with:
header: asset-sizes
path: ./build/estimate-bytes/comment.txt
path: ./dev/estimate-bytes/comment.txt


PublishDocstoCloudflarePages:
Expand Down
66 changes: 0 additions & 66 deletions ci.yml

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"release": "changeset publish",
"dev": "concurrently 'npm:dev:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
"dev:ember": "pnpm run --filter ember-app start",
"dev:ember": "pnpm run --filter test-app start",
"dev:addon": "pnpm run --filter ember-resources start --no-watch.clearScreen",
"dev:docs": "pnpm run --filter docs docs:watch --preserveWatchOutput",
"ci:update": "npx ember-ci-update",
Expand Down
81 changes: 58 additions & 23 deletions pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
packages:
- "ember-resources"
- "docs"
- "testing/*"
- "test-app"
- "dev/*"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion testing/ember-app/app/app.ts → test-app/app/app.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Application from '@ember/application';

import config from 'ember-app/config/environment';
import loadInitializers from 'ember-load-initializers';
import Resolver from 'ember-resolver';
import config from 'test-app/config/environment';

export default class App extends Application {
modulePrefix = config.modulePrefix;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions testing/ember-app/app/index.html → test-app/app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
{{content-for "head"}}

<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css" />
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/ember-app.css" />
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/test-app.css" />

{{content-for "head-footer"}}
</head>
<body>
{{content-for "body"}}

<script src="{{rootURL}}assets/vendor.js"></script>
<script src="{{rootURL}}assets/ember-app.js"></script>
<script src="{{rootURL}}assets/test-app.js"></script>

{{content-for "body-footer"}}
</body>
Expand Down
2 changes: 1 addition & 1 deletion testing/ember-app/app/router.ts → test-app/app/router.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import EmberRouter from '@ember/routing/router';

import config from 'ember-app/config/environment';
import config from 'test-app/config/environment';

export default class Router extends EmberRouter {
location = config.locationType;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 28fd17f

Please sign in to comment.