Skip to content

Commit 782affb

Browse files
committed
fix: 🐛 ensure that auto mirage start doesn't happen in test env
1 parent 6e58462 commit 782affb

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

addons/api/README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,13 @@ module.exports = async function (defaults) {
5555
3. Finally, use the `@embroider/macros` config value for `startMirageWithApp` in `app/app.js` to conditionally start mirage:
5656
5757
```js
58-
import { macroCondition, importSync, getOwnConfig } from '@embroider/macros';
58+
import { macroCondition, importSync, getOwnConfig, isTesting } from '@embroider/macros';
5959

60-
if (macroCondition(getOwnConfig().startMirageWithApp)) {
60+
if (macroCondition(getOwnConfig().startMirageWithApp && !isTesting())) {
6161
const startServer = importSync('api/mirage/config').default;
6262
startServer({});
6363
}
6464
```
65-
6665
## Installation
6766
6867
See monorepo README for installation instructions.

ui/admin/app/app.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ import Application from '@ember/application';
77
import Resolver from 'ember-resolver';
88
import loadInitializers from 'ember-load-initializers';
99
import config from 'admin/config/environment';
10-
import { macroCondition, importSync, getOwnConfig } from '@embroider/macros';
10+
import {
11+
macroCondition,
12+
importSync,
13+
getOwnConfig,
14+
isTesting,
15+
} from '@embroider/macros';
1116

1217
export default class App extends Application {
1318
modulePrefix = config.modulePrefix;
@@ -17,7 +22,7 @@ export default class App extends Application {
1722

1823
loadInitializers(App, config.modulePrefix);
1924

20-
if (macroCondition(getOwnConfig().startMirageWithApp)) {
25+
if (macroCondition(getOwnConfig().startMirageWithApp && !isTesting())) {
2126
const startServer = importSync('api/mirage/config').default;
2227
startServer({});
2328
}

ui/desktop/app/app.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ import Application from '@ember/application';
77
import Resolver from 'ember-resolver';
88
import loadInitializers from 'ember-load-initializers';
99
import config from './config/environment';
10-
import { macroCondition, getOwnConfig, importSync } from '@embroider/macros';
10+
import {
11+
macroCondition,
12+
getOwnConfig,
13+
importSync,
14+
isTesting,
15+
} from '@embroider/macros';
1116

1217
export default class App extends Application {
1318
modulePrefix = config.modulePrefix;
@@ -17,7 +22,7 @@ export default class App extends Application {
1722

1823
loadInitializers(App, config.modulePrefix);
1924

20-
if (macroCondition(getOwnConfig().startMirageWithApp)) {
25+
if (macroCondition(getOwnConfig().startMirageWithApp && !isTesting())) {
2126
const startServer = importSync('api/mirage/config').default;
2227
startServer({});
2328
}

0 commit comments

Comments
 (0)