Skip to content

Commit 53e01ed

Browse files
committed
Fix fixture failures
1 parent 3b497ab commit 53e01ed

10 files changed

Lines changed: 31 additions & 16 deletions

File tree

test/fixtures/input/app/components/.gitkeep

Whitespace-only changes.

test/fixtures/input/app/router.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import EmberRouter from '@ember/routing/router';
2-
import config from 'input/config/environment';
2+
import config from './config/environment';
33

4-
export default class Router extends EmberRouter {
5-
location = config.locationType;
6-
rootURL = config.rootURL;
7-
}
4+
const Router = EmberRouter.extend({
5+
location: config.locationType,
6+
rootURL: config.rootURL,
7+
});
88

99
Router.map(function () {});
10+
11+
export default Router;

test/fixtures/input/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"eslint-plugin-node": "^11.1.0",
5757
"eslint-plugin-prettier": "^4.2.1",
5858
"eslint-plugin-qunit": "^7.3.4",
59+
"ember-welcome-page": "^7.0.1",
5960
"loader.js": "^4.7.0",
6061
"npm-run-all": "^4.1.5",
6162
"prettier": "^2.8.8",

test/fixtures/input/yarn.lock

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,6 +1178,15 @@
11781178
ember-cli-version-checker "^5.1.2"
11791179
semver "^7.3.5"
11801180

1181+
"@embroider/addon-shim@^1.8.4":
1182+
version "1.8.4"
1183+
resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-1.8.4.tgz#0e7f32c5506bf0f3eb0840506e31c36c7053763c"
1184+
integrity sha512-sFhfWC0vI18KxVenmswQ/ShIvBg4juL8ubI+Q3NTSdkCTeaPQ/DIOUF6oR5DCQ8eO/TkIaw+kdG3FkTY6yNJqA==
1185+
dependencies:
1186+
"@embroider/shared-internals" "^2.0.0"
1187+
broccoli-funnel "^3.0.8"
1188+
semver "^7.3.8"
1189+
11811190
"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0":
11821191
version "1.10.0"
11831192
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.10.0.tgz#af3844d5db48f001b85cfb096c76727c72ad6c1e"
@@ -4310,6 +4319,14 @@ ember-template-recast@^6.1.4:
43104319
tmp "^0.2.1"
43114320
workerpool "^6.4.0"
43124321

4322+
ember-welcome-page@^7.0.1:
4323+
version "7.0.1"
4324+
resolved "https://registry.yarnpkg.com/ember-welcome-page/-/ember-welcome-page-7.0.1.tgz#089ce6b4836a1af621dc7506942179efbbfd807b"
4325+
integrity sha512-3Dj7+ap38O/rgQBNqBsd7RPfH81a6DE1xJbipMt9mjOkvLo3OamZiiekAeax3Ydnm3yKYCtbxHPkCIEn4G6B8A==
4326+
dependencies:
4327+
"@embroider/addon-shim" "^1.8.4"
4328+
"@glimmer/component" "^1.1.2"
4329+
43134330
emoji-regex@^8.0.0:
43144331
version "8.0.0"
43154332
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"

test/fixtures/output/app/app.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
import classic from 'ember-classic-decorator';
21
import Application from '@ember/application';
3-
import Resolver from './resolver';
2+
import Resolver from 'ember-resolver';
43
import loadInitializers from 'ember-load-initializers';
5-
import config from './config/environment';
4+
import config from 'input/config/environment';
65

7-
@classic
8-
class App extends Application {
6+
export default class App extends Application {
97
modulePrefix = config.modulePrefix;
108
podModulePrefix = config.podModulePrefix;
119
Resolver = Resolver;
1210
}
1311

1412
loadInitializers(App, config.modulePrefix);
15-
16-
export default App;

test/fixtures/output/app/components/.gitkeep

Whitespace-only changes.

test/fixtures/output/app/resolver.js

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

test/fixtures/output/app/router.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ class Router extends EmberRouter {
88
rootURL = config.rootURL;
99
}
1010

11-
Router.map(function() {});
11+
Router.map(function () {});
1212

1313
export default Router;

test/fixtures/output/app/templates/application.hbs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
{{page-title "Input"}}
2+
13
{{!-- The following component displays Ember's default welcome message. --}}
24
<WelcomePage />
35
{{!-- Feel free to remove this! --}}

test/fixtures/output/app/templates/components/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)