Skip to content

Commit ddc4f50

Browse files
author
DavertMik
committed
fixed runner tests
1 parent 674de3b commit ddc4f50

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

lib/container.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ class Container {
141141
if (!name) {
142142
return container.proxySupport
143143
}
144-
return container.support[name] || container.proxySupport[name]
144+
// Always return the proxy to ensure MetaStep creation works
145+
return container.proxySupport[name]
145146
}
146147

147148
/**

lib/listener/helpers.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ export default function () {
4242
})
4343

4444
event.dispatcher.on(event.test.before, test => {
45-
console.log('DEBUG: helpers listener received test.before for:', test.title)
4645
// schedule config to revert changes
4746
runAsyncHelpersHook('_before', test, true)
4847
recorder.catchWithoutStop(e => output.error(e))

lib/mocha/asyncWrapper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ export function injected(fn, suite, hookName) {
148148
async (retry, number) => {
149149
try {
150150
recorder.startUnlessRunning()
151-
const injectedArgs = await getInjectedArguments(fn)
151+
const injectedArgs = await getInjectedArguments(fn, null, suite)
152152
await fn.call(this, { ...injectedArgs, suite, test: currentTest })
153153
await recorder.promise().catch(err => retry(err))
154154
} catch (err) {

lib/mocha/inject.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { getParams } from '../parser.js'
22

3-
const getInjectedArguments = async (fn, test) => {
3+
const getInjectedArguments = async (fn, test, suite) => {
44
const containerModule = await import('../container.js')
55
const container = containerModule.default || containerModule
66

@@ -12,11 +12,15 @@ const getInjectedArguments = async (fn, test) => {
1212
testArgs[key] = {}
1313

1414
// Handle special built-in objects first
15-
if (key === 'suite' && test) {
16-
testArgs[key] = test.parent || test
15+
if (key === 'suite') {
16+
if (test) {
17+
testArgs[key] = test.parent || test
18+
} else if (suite) {
19+
testArgs[key] = suite
20+
}
1721
continue
1822
}
19-
if (key === 'test' && test) {
23+
if (key === 'test') {
2024
testArgs[key] = test
2125
continue
2226
}

0 commit comments

Comments
 (0)