Skip to content

Commit 9734c63

Browse files
committed
mirage: Replace ember-cli-mirage with direct miragejs usage
1 parent 9bce0eb commit 9734c63

File tree

114 files changed

+111
-148
lines changed

Some content is hidden

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

114 files changed

+111
-148
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ module.exports = {
109109

110110
// mirage files
111111
{
112-
files: ['mirage/**/*.js'],
112+
files: ['tests/mirage/**/*.js'],
113113
rules: {
114114
// disabled because of different `.find()` meaning
115115
'unicorn/no-array-callback-reference': 'off',

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
files_ignore: |
4040
app/**
4141
e2e/**
42-
mirage/**
4342
public/**
4443
tests/**
4544
.eslintrc

config/environment.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ module.exports = function (environment) {
6363

6464
if (environment === 'production') {
6565
// here you can enable a production-specific feature
66-
delete ENV['ember-cli-mirage'];
67-
6866
ENV.sentry = {
6967
dsn: process.env.SENTRY_DSN_WEB,
7068
};

docs/ARCHITECTURE.md

Lines changed: 1 addition & 1 deletion

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
"ember-cli-head": "2.0.0",
8888
"ember-cli-htmlbars": "6.3.0",
8989
"ember-cli-inject-live-reload": "2.1.0",
90-
"ember-cli-mirage": "3.0.4",
9190
"ember-cli-notifications": "9.1.0",
9291
"ember-click-outside": "6.1.1",
9392
"ember-concurrency": "4.0.2",
@@ -98,6 +97,7 @@
9897
"ember-event-helpers": "0.1.1",
9998
"ember-exam": "9.0.0",
10099
"ember-fetch": "8.1.2",
100+
"ember-inflector": "5.0.2",
101101
"ember-keyboard": "9.0.1",
102102
"ember-link": "3.3.0",
103103
"ember-load-initializers": "3.0.1",
@@ -142,8 +142,7 @@
142142
"ember-get-config": "2.1.1",
143143
"ember-inflector": "5.0.2",
144144
"ember-modifier": "4.2.0",
145-
"ember-svg-jar>cheerio": "1.0.0-rc.12",
146-
"miragejs": "0.1.48"
145+
"ember-svg-jar>cheerio": "1.0.0-rc.12"
147146
},
148147
"pnpm": {
149148
"peerDependencyRules": {

pnpm-lock.yaml

Lines changed: 3 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/acceptance/front-page-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import { getPageTitle } from 'ember-page-title/test-support';
99

1010
import { setupApplicationTest } from 'crates-io/tests/helpers';
1111

12-
import { summary } from '../../mirage/route-handlers/summary';
1312
import axeConfig from '../axe-config';
13+
import { summary } from '../mirage/route-handlers/summary';
1414

1515
module('Acceptance | front page', function (hooks) {
1616
setupApplicationTest(hooks);

tests/acceptance/search-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import { getPageTitle } from 'ember-page-title/test-support';
1010

1111
import { setupApplicationTest } from 'crates-io/tests/helpers';
1212

13-
import { list as listCrates } from '../../mirage/route-handlers/crates';
1413
import axeConfig from '../axe-config';
14+
import { list as listCrates } from '../mirage/route-handlers/crates';
1515

1616
module('Acceptance | search', function (hooks) {
1717
setupApplicationTest(hooks);

tests/helpers/setup-mirage.js

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,37 @@
1-
import { setupMirage } from 'ember-cli-mirage/test-support';
1+
import { settled } from '@ember/test-helpers';
2+
23
import window from 'ember-window-mock';
34
import { setupWindowMock } from 'ember-window-mock/test-support';
45

6+
import makeServer from '../mirage/config';
57
import { setupFakeTimers } from './fake-timers';
68

79
export default function (hooks) {
8-
setupMirage(hooks);
910
setupWindowMock(hooks);
1011
setupFakeTimers(hooks, '2017-11-20T12:00:00');
1112

1213
// To have deterministic visual tests, the seed has to be constant
1314
hooks.beforeEach(function () {
15+
this.server = makeServer({
16+
environment: 'test',
17+
});
18+
19+
if (location.search.includes('mirageLogging')) {
20+
this.server.logging = true;
21+
}
22+
1423
this.authenticateAs = user => {
1524
this.server.create('mirage-session', { user });
1625
window.localStorage.setItem('isLoggedIn', '1');
1726
};
1827
});
28+
29+
hooks.afterEach(async function () {
30+
await settled();
31+
32+
if (this.server) {
33+
this.server.shutdown();
34+
delete this.server;
35+
}
36+
});
1937
}
File renamed without changes.

0 commit comments

Comments
 (0)