Skip to content

Commit

Permalink
polish up
Browse files Browse the repository at this point in the history
  • Loading branch information
runspired committed Oct 17, 2023
1 parent 5f78d66 commit bc5c429
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 26 deletions.
8 changes: 6 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,12 @@ module.exports = {
},
overrides: [
{
files: ['tests/ember-data__json-api/**', 'tests/ember-data__graph/**', 'tests/ember-data__request/**'],
files: [
'tests/ember-data__json-api/**',
'tests/ember-data__graph/**',
'tests/ember-data__request/**',
'tests/builders/**',
],
rules: {
'qunit/no-assert-equal': 'off',
'qunit/no-assert-logical-expression': 'off',
Expand Down Expand Up @@ -282,7 +287,6 @@ module.exports = {
env: {
browser: false,
node: true,
bun: true,
es6: true,
},
},
Expand Down
1 change: 1 addition & 0 deletions tests/builders/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ module.exports = function (defaults) {
This build file does *not* influence how the addon or the app using it
behave. You most likely want to be modifying `./index.js` or app's build file
*/
app.import('node_modules/@warp-drive/diagnostic/dist/styles/dom-reporter.css');

return app.toTree();
};
4 changes: 3 additions & 1 deletion tests/builders/tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
{{content-for "test-body"}}

<div id="warp-drive__diagnostic"></div>
<div id="warp-drive__diagnostic-fixture"></div>
<div id="warp-drive__diagnostic-fixture">
<div id="ember-testing"></div>
</div>

<script src="{{rootURL}}assets/vendor.js"></script>
<script src="{{rootURL}}assets/test-support.js"></script>
Expand Down
9 changes: 2 additions & 7 deletions tests/builders/tests/integration/create-record-test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { module, test } from '@warp-drive/diagnostic';

import { setupTest } from '@ember-data/unpublished-test-infra/test-support/test-helpers';

import JSONAPICache from '@ember-data/json-api';
import { createRecord } from '@ember-data/json-api/request';
import Model, { attr, instantiateRecord, teardownRecord } from '@ember-data/model';
Expand All @@ -17,6 +15,7 @@ import type { CacheCapabilitiesManager } from '@ember-data/types/q/cache-store-w
import { SingleResourceDocument } from '@ember-data/types/q/ember-data-json-api';
import type { StableExistingRecordIdentifier, StableRecordIdentifier } from '@ember-data/types/q/identifier';
import { JsonApiError } from '@ember-data/types/q/record-data-json-api';
import { setupTest } from '@ember-data/unpublished-test-infra/test-support/test-helpers';

class TestStore extends DataStore {
constructor(args: unknown) {
Expand Down Expand Up @@ -245,11 +244,7 @@ module('Integration - createRecord', function (hooks) {
}>;

assert.equal(nameErrors.length, 1, 'The user has the expected number of errors');
assert.equal(
nameErrors[0]?.message,
'Name must be capitalized',
'The user has the expected error for the field'
);
assert.equal(nameErrors[0]?.message, 'Name must be capitalized', 'The user has the expected error for the field');

assert.verifySteps([
`willCommit ${identifier.lid}`,
Expand Down
3 changes: 1 addition & 2 deletions tests/builders/tests/integration/delete-record-test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { module, test } from '@warp-drive/diagnostic';

import { setupTest } from '@ember-data/unpublished-test-infra/test-support/test-helpers';

import JSONAPICache from '@ember-data/json-api';
import { deleteRecord } from '@ember-data/json-api/request';
import Model, { attr, instantiateRecord, teardownRecord } from '@ember-data/model';
Expand All @@ -17,6 +15,7 @@ import type { CacheCapabilitiesManager } from '@ember-data/types/q/cache-store-w
import { SingleResourceDocument } from '@ember-data/types/q/ember-data-json-api';
import type { StableExistingRecordIdentifier, StableRecordIdentifier } from '@ember-data/types/q/identifier';
import { JsonApiError } from '@ember-data/types/q/record-data-json-api';
import { setupTest } from '@ember-data/unpublished-test-infra/test-support/test-helpers';

class TestStore extends DataStore {
constructor(args: unknown) {
Expand Down
9 changes: 2 additions & 7 deletions tests/builders/tests/integration/update-record-test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { module, test } from '@warp-drive/diagnostic';

import { setupTest } from '@ember-data/unpublished-test-infra/test-support/test-helpers';

import JSONAPICache from '@ember-data/json-api';
import { updateRecord } from '@ember-data/json-api/request';
import Model, { attr, instantiateRecord, teardownRecord } from '@ember-data/model';
Expand All @@ -17,6 +15,7 @@ import type { CacheCapabilitiesManager } from '@ember-data/types/q/cache-store-w
import { SingleResourceDocument } from '@ember-data/types/q/ember-data-json-api';
import type { StableExistingRecordIdentifier, StableRecordIdentifier } from '@ember-data/types/q/identifier';
import { JsonApiError } from '@ember-data/types/q/record-data-json-api';
import { setupTest } from '@ember-data/unpublished-test-infra/test-support/test-helpers';

class TestStore extends DataStore {
constructor(args: unknown) {
Expand Down Expand Up @@ -247,11 +246,7 @@ module('Integration - updateRecord', function (hooks) {
}>;

assert.equal(nameErrors.length, 1, 'The user has the expected number of errors');
assert.equal(
nameErrors[0]?.message,
'Name must be capitalized',
'The user has the expected error for the field'
);
assert.equal(nameErrors[0]?.message, 'Name must be capitalized', 'The user has the expected error for the field');

assert.verifySteps([
`willCommit ${identifier.lid}`,
Expand Down
8 changes: 8 additions & 0 deletions tests/builders/tests/test-helper.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
import { setApplication } from '@ember/test-helpers';

import { setupGlobalHooks } from '@warp-drive/diagnostic';
import { start } from '@warp-drive/diagnostic/runners/dom';

import AbstractTestLoader from 'ember-cli-test-loader/test-support/index';

import Application from '../app';
import config from '../config/environment';

let moduleLoadFailures = [];

setupGlobalHooks((hooks) => {
Expand Down Expand Up @@ -44,7 +49,10 @@ export function loadTests() {

loadTests();

setApplication(Application.create(config.APP));
start({
tryCatch: false,
debug: false,
groupLogs: false,
instrument: true,
hideReport: true,
Expand Down
3 changes: 1 addition & 2 deletions tests/builders/tests/unit/active-record-builder-test.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { module, test } from '@warp-drive/diagnostic';

import { setupTest } from '@ember-data/unpublished-test-infra/test-support/test-helpers';

import { createRecord, deleteRecord, findRecord, query, updateRecord } from '@ember-data/active-record/request';
import { setBuildURLConfig } from '@ember-data/request-utils';
import Store, { recordIdentifierFor } from '@ember-data/store';
import { setupTest } from '@ember-data/unpublished-test-infra/test-support/test-helpers';

import UserSetting from '../../app/models/user-setting';
import { headersToObject } from '../helpers/utils';
Expand Down
3 changes: 1 addition & 2 deletions tests/builders/tests/unit/json-api-builder-test.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { module, test } from '@warp-drive/diagnostic';

import { setupTest } from '@ember-data/unpublished-test-infra/test-support/test-helpers';

import { createRecord, deleteRecord, findRecord, postQuery, query, updateRecord } from '@ember-data/json-api/request';
import { setBuildURLConfig } from '@ember-data/request-utils';
import Store, { recordIdentifierFor } from '@ember-data/store';
import { setupTest } from '@ember-data/unpublished-test-infra/test-support/test-helpers';

import UserSetting from '../../app/models/user-setting';
import { headersToObject } from '../helpers/utils';
Expand Down
3 changes: 1 addition & 2 deletions tests/builders/tests/unit/rest-builder-test.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { module, test } from '@warp-drive/diagnostic';

import { setupTest } from '@ember-data/unpublished-test-infra/test-support/test-helpers';

import { setBuildURLConfig } from '@ember-data/request-utils';
import { createRecord, deleteRecord, findRecord, query, updateRecord } from '@ember-data/rest/request';
import Store, { recordIdentifierFor } from '@ember-data/store';
import { setupTest } from '@ember-data/unpublished-test-infra/test-support/test-helpers';

import UserSetting from '../../app/models/user-setting';
import { headersToObject } from '../helpers/utils';
Expand Down
1 change: 1 addition & 0 deletions tests/ember-data__request/diagnostic.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* global Bun */
import launch from '@warp-drive/diagnostic/server/default-setup.js';

/** @type {import('bun-types')} */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ module('RequestManager | Response Currying', function () {
ok: true,
redirected: false,
headers: [
['content-type', 'application/json;charset=utf-8'],
['content-type', 'application/json;charset=utf-8'],
// ['date', 'Wed, 23 Nov 2022 05:17:11 GMT'],
// ['etag', 'W/"39-1849db13af9"'],
// ['last-modified', 'Tue, 22 Nov 2022 04:55:48 GMT'],
Expand Down

0 comments on commit bc5c429

Please sign in to comment.