Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion apps/repl/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"ember-load-initializers": "^3.0.1",
"ember-page-title": "^9.0.3",
"ember-qunit": "^9.0.4",
"ember-source": "file:ember-source-7.3.0-alpha.1.all-optimizations+5916d3e8.tgz",
"ember-source": "file:ember-source-7.3.0-alpha.1.all-optimizations+60f0fc94.tgz",
"ember-template-lint": "^7.9.3",
"eslint": "^9.39.1",
"execa": "^9.6.1",
Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,12 @@
"side-channel": "npm:@nolyfill/side-channel@^1",
"string.prototype.matchall": "npm:@nolyfill/string.prototype.matchall@^1",
"string.prototype.trimend": "npm:@nolyfill/string.prototype.trimend@^1",
"ember-source": "file:./apps/repl/ember-source-7.3.0-alpha.1.all-optimizations+5916d3e8.tgz"
"ember-source": "file:./apps/repl/ember-source-7.3.0-alpha.1.all-optimizations+60f0fc94.tgz"
},
"patchedDependencies": {
"browserslist-generator": "patches/browserslist-generator.patch"
"browserslist-generator": "patches/browserslist-generator.patch",
"ember-qunit@9.0.4": "patches/ember-qunit@9.0.4.patch",
"@ember/test-helpers@5.4.1": "patches/@ember__test-helpers@5.4.1.patch"
},
"_ember-repl": "workspace:*",
"_repl-sdk": "workspace:*"
Expand Down
65 changes: 65 additions & 0 deletions patches/@ember__test-helpers@5.4.1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
diff --git a/dist/-internal/debug-info.js b/dist/-internal/debug-info.js
index 45733a399fc957c2b01109ce9fb37172dfd7d721..ae723167fdbd88e189c47edb9d9a0a3c9d69e5d5 100644
--- a/dist/-internal/debug-info.js
+++ b/dist/-internal/debug-info.js
@@ -1,4 +1,3 @@
-import { _backburner } from '@ember/runloop';
import { debugInfoHelpers } from './debug-info-helpers.js';
import { getPendingWaiterState } from '@ember/test-waiters';

@@ -22,7 +21,7 @@ const SCHEDULED_AUTORUN = 'Scheduled autorun';
* @returns {boolean} True if `getDebugInfo` is present in backburner, otherwise false.
*/
function backburnerDebugInfoAvailable() {
- return typeof _backburner.getDebugInfo === 'function';
+ return false;
}

/**
@@ -33,7 +32,7 @@ function backburnerDebugInfoAvailable() {
* @returns {MaybeDebugInfo | null} Backburner debugInfo or, if the getDebugInfo method is not present, null
*/
function getDebugInfo() {
- return _backburner.DEBUG === true && backburnerDebugInfoAvailable() ? _backburner.getDebugInfo() : null;
+ return null;
}

/**
diff --git a/dist/setup-context-BSrEM03X.js b/dist/setup-context-BSrEM03X.js
index 0f688234691707c6ee3a1b0326efdd0edb1ea5cb..2a97d25f25ff8c28c099ab6190f679922059c798 100644
--- a/dist/setup-context-BSrEM03X.js
+++ b/dist/setup-context-BSrEM03X.js
@@ -1,4 +1,5 @@
-import { _backburner, run } from '@ember/runloop';
+import { run } from '@ember/runloop';
+import { isRenderPending as _emberIsRenderPending } from '@ember/renderer';
import { set, setProperties, get, getProperties } from '@ember/object';
import { setOwner } from '@ember/application';
import buildOwner from './build-owner.js';
@@ -330,15 +331,15 @@ function _setupAJAXHooks() {
@returns {Object} object with properties for each of the metrics used to determine settledness
*/
function getSettledState() {
- const hasPendingTimers = _backburner.hasTimers();
- const hasRunLoop = Boolean(_backburner.currentInstance);
+ const hasPendingTimers = false;
+ const hasRunLoop = false;
const hasPendingLegacyWaiters = checkWaiters();
const hasPendingTestWaiters = hasPendingWaiters();
const pendingRequestCount = pendingRequests();
const hasPendingRequests = pendingRequestCount > 0;
// TODO: Ideally we'd have a function in Ember itself that can synchronously identify whether
// or not there are any pending render operations, but this will have to suffice for now
- const isRenderPending = !!hasRunLoop;
+ const isRenderPending = _emberIsRenderPending();
return {
hasPendingTimers,
hasRunLoop,
@@ -777,7 +778,6 @@ function setupContext(base, options = {}) {
setContext(context);
const testMetadata = getTestMetadata(context);
testMetadata.setupTypes.push('setupContext');
- _backburner.DEBUG = true;
_prepareOnerror(context);
return Promise.resolve().then(() => {
const application = getApplication();
20 changes: 20 additions & 0 deletions patches/ember-qunit@9.0.4.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/dist/index.js b/dist/index.js
index 6f1b3ebc90b6e359554e890c89e313cf7943be8f..a8c61a735388155100a25b386408db37d73d0a8d 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -4,7 +4,6 @@ import { setAdapter } from 'ember-testing/lib/test/adapter';
import Adapter from './adapter.js';
export { nonTestDoneCallback } from './adapter.js';
import './qunit-configuration.js';
-import { _backburner } from '@ember/runloop';
import { getTestMetadata, setupContext, teardownContext, setupRenderingContext, setupApplicationContext, validateErrorHandler, resetOnerror } from '@ember/test-helpers';
import * as QUnit from 'qunit';
import { installTestNotIsolatedHook } from './test-isolation-validation.js';
@@ -141,7 +140,6 @@ function setupResetOnerror() {
}
function setupTestIsolationValidation(delay) {
waitForSettled = false;
- _backburner.DEBUG = true;
QUnit.on('testStart', () => installTestNotIsolatedHook(delay));
}

Loading
Loading