Skip to content

Commit

Permalink
re-roll the lockfile + re-run prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanpenner committed Aug 5, 2021
1 parent 641877b commit 6b0398a
Show file tree
Hide file tree
Showing 7 changed files with 1,531 additions and 2,124 deletions.
49 changes: 27 additions & 22 deletions addon-test-support/@ember/test-helpers/-internal/debug-info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,29 +108,34 @@ export class TestDebugInfo implements DebugInfo {
(timer) => timer.stack
);

this._summaryInfo.pendingScheduledQueueItemCount = this._debugInfo.instanceStack
.filter((q) => q)
.reduce((total: Number, item) => {
Object.keys(item).forEach((queueName: string) => {
total += item[queueName].length;
});

return total;
}, 0);
this._summaryInfo.pendingScheduledQueueItemStackTraces = this._debugInfo.instanceStack
.filter((q) => q)
.reduce(
(stacks: string[], deferredActionQueues: DeferredActionQueues) => {
Object.keys(deferredActionQueues).forEach((queue) => {
deferredActionQueues[queue].forEach(
(queueItem: QueueItem) =>
queueItem.stack && stacks.push(queueItem.stack)
);
this._summaryInfo.pendingScheduledQueueItemCount =
this._debugInfo.instanceStack
.filter((q) => q)
.reduce((total: Number, item) => {
Object.keys(item).forEach((queueName: string) => {
total += item[queueName].length;
});
return stacks;
},
[]
);

return total;
}, 0);
this._summaryInfo.pendingScheduledQueueItemStackTraces =
this._debugInfo.instanceStack
.filter((q) => q)
.reduce(
(
stacks: string[],
deferredActionQueues: DeferredActionQueues
) => {
Object.keys(deferredActionQueues).forEach((queue) => {
deferredActionQueues[queue].forEach(
(queueItem: QueueItem) =>
queueItem.stack && stacks.push(queueItem.stack)
);
});
return stacks;
},
[]
);
}

if (this._summaryInfo.hasPendingTestWaiters) {
Expand Down
4 changes: 2 additions & 2 deletions addon-test-support/@ember/test-helpers/build-owner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ export default function buildOwner(
resolver: Resolver | undefined | null
): Promise<Owner> {
if (application) {
return (application
return application
.boot()
.then((app) => app.buildInstance().boot()) as unknown) as Promise<Owner>;
.then((app) => app.buildInstance().boot()) as unknown as Promise<Owner>;
}

if (!resolver) {
Expand Down
12 changes: 7 additions & 5 deletions addon-test-support/@ember/test-helpers/settled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,14 @@ let _internalCheckWaiters: Function;
let loader = (Ember as any).__loader;
if (loader.registry['ember-testing/test/waiters']) {
// Ember <= 3.1
_internalCheckWaiters = loader.require('ember-testing/test/waiters')
.checkWaiters;
_internalCheckWaiters = loader.require(
'ember-testing/test/waiters'
).checkWaiters;
} else if (loader.registry['ember-testing/lib/test/waiters']) {
// Ember >= 3.2
_internalCheckWaiters = loader.require('ember-testing/lib/test/waiters')
.checkWaiters;
_internalCheckWaiters = loader.require(
'ember-testing/lib/test/waiters'
).checkWaiters;
}

/**
Expand All @@ -169,7 +171,7 @@ if (loader.registry['ember-testing/test/waiters']) {
*/
function checkWaiters() {
type Waiter = [any, Function];
let EmberTest = (Ember.Test as any) as { waiters: Array<Waiter> };
let EmberTest = Ember.Test as any as { waiters: Array<Waiter> };

if (_internalCheckWaiters) {
return _internalCheckWaiters();
Expand Down
6 changes: 2 additions & 4 deletions addon-test-support/@ember/test-helpers/setup-onerror.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import Ember from 'ember';
import { BaseContext, getContext } from './setup-context';

let cachedOnerror: Map<
BaseContext,
((error: Error) => void) | undefined
> = new Map();
let cachedOnerror: Map<BaseContext, ((error: Error) => void) | undefined> =
new Map();

/**
* Sets the `Ember.onerror` function for tests. This value is intended to be reset after
Expand Down
5 changes: 2 additions & 3 deletions tests/helpers/module-for-acceptance.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ export default function (name, options = {}) {
.finally(() => {
Ember.testing = false;

document.getElementById(
'ember-testing-container'
).innerHTML = this.fixtureResetValue;
document.getElementById('ember-testing-container').innerHTML =
this.fixtureResetValue;
});
},
});
Expand Down
10 changes: 4 additions & 6 deletions tests/helpers/resolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,11 @@ export default {
export function createCustomResolver(registry) {
if (require.has('ember-native-dom-event-dispatcher')) {
// the raw value looked up by ember and these test helpers
registry[
'event_dispatcher:main'
] = require('ember-native-dom-event-dispatcher').default;
registry['event_dispatcher:main'] =
require('ember-native-dom-event-dispatcher').default;
// the normalized value looked up
registry[
'event-dispatcher:main'
] = require('ember-native-dom-event-dispatcher').default;
registry['event-dispatcher:main'] =
require('ember-native-dom-event-dispatcher').default;
}

return {
Expand Down
Loading

0 comments on commit 6b0398a

Please sign in to comment.