Skip to content

Commit 6a54204

Browse files
kobenguyentkobenguyent
committed
fix more tests
1 parent 87d7d09 commit 6a54204

24 files changed

+166
-128
lines changed

‎test/acceptance/codecept.Playwright.CustomLocators.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { config } = require('../acceptance/codecept.Playwright')
1+
import { config } from '../acceptance/codecept.Playwright.js'
22

33
// Extend the base Playwright configuration to add custom locator strategies
44
const customLocatorConfig = {
@@ -31,4 +31,4 @@ const customLocatorConfig = {
3131
},
3232
}
3333

34-
module.exports.config = customLocatorConfig
34+
export { customLocatorConfig as config }

‎test/bdd/defs/faker.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const assert = require('assert');
1+
import assert from 'assert'
22

33
const fields = {};
44

‎test/data/sandbox/configs/html-reporter-plugin/artifacts_test.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
import container from '../../../../../lib/container.js'
2+
13
Feature('HTML Reporter with Artifacts Test')
24

35
Scenario('test with artifacts', async ({ I }) => {
46
I.amInPath('.')
57
I.seeFile('codecept.conf.js')
68

79
// Simulate adding test artifacts
8-
const container = require('../../../../../lib/container')
910
try {
1011
const currentTest = container.mocha().currentTest
1112
if (currentTest) {

‎test/data/sandbox/support/bdd_helper.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import assert from 'assert'
22
import Helper from '../../../../lib/helper.js'
3+
import output from '../../../../lib/output.js'
34

45
class CheckoutHelper extends Helper {
56
constructor(config) {
@@ -52,7 +53,6 @@ class CheckoutHelper extends Helper {
5253

5354
say(message) {
5455
// Use CodeceptJS output system instead of direct console.log
55-
const output = require('../../../../lib/output')
5656
output.log(`[Helper] ${message}`)
5757
}
5858

‎test/graphql/GraphQLDataFactory_test.js‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
require('../support/setup')
2-
const path = require('path')
3-
const fs = require('fs')
4-
5-
const TestHelper = require('../support/TestHelper')
6-
7-
const GraphQLDataFactory = require('../../lib/helper/GraphQLDataFactory')
8-
global.codeceptjs = require('../../lib')
1+
import '../support/setup.js'
2+
import path from 'path'
3+
import fs from 'fs'
4+
import { fileURLToPath } from 'url'
5+
import TestHelper from '../support/TestHelper.js'
6+
import GraphQLDataFactory from '../../lib/helper/GraphQLDataFactory.js'
7+
import * as codeceptjs from '../../lib/index.js'
8+
9+
const __filename = fileURLToPath(import.meta.url)
10+
const __dirname = path.dirname(__filename)
11+
12+
global.codeceptjs = codeceptjs
913

1014
const graphql_url = TestHelper.graphQLServerUrl()
1115

‎test/graphql/GraphQL_test.js‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1-
const path = require('path')
2-
const fs = require('fs')
3-
4-
const TestHelper = require('../support/TestHelper')
5-
const GraphQL = require('../../lib/helper/GraphQL')
6-
const Container = require('../../lib/container')
7-
global.codeceptjs = require('../../lib')
1+
import path from 'path'
2+
import fs from 'fs'
3+
import { fileURLToPath } from 'url'
4+
import TestHelper from '../support/TestHelper.js'
5+
import GraphQL from '../../lib/helper/GraphQL.js'
6+
import Container from '../../lib/container.js'
7+
import * as codeceptjs from '../../lib/index.js'
8+
9+
const __filename = fileURLToPath(import.meta.url)
10+
const __dirname = path.dirname(__filename)
11+
12+
global.codeceptjs = codeceptjs
813

914
const graphql_url = TestHelper.graphQLServerUrl()
1015

‎test/helper/CustomLocator_test.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
const chai = require('chai')
2-
const expect = chai.expect
1+
import chai from 'chai'
2+
import Playwright from '../../lib/helper/Playwright.js'
3+
import Locator from '../../lib/locator.js'
34

4-
const Playwright = require('../../lib/helper/Playwright')
5-
const Locator = require('../../lib/locator')
5+
const expect = chai.expect
66

77
describe('Custom Locator Strategies', function () {
88
this.timeout(5000)

‎test/helper/TestCafe_test.js‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1-
const path = require('path')
2-
const assert = require('assert')
1+
import path from 'path'
2+
import assert from 'assert'
3+
import { fileURLToPath } from 'url'
4+
import TestHelper from '../support/TestHelper.js'
5+
import TestCafe from '../../lib/helper/TestCafe.js'
6+
import webApiTests from './webapi.js'
7+
import * as codeceptjs from '../../lib/index.js'
38

4-
const TestHelper = require('../support/TestHelper')
5-
const TestCafe = require('../../lib/helper/TestCafe')
6-
const webApiTests = require('./webapi')
7-
global.codeceptjs = require('../../lib')
9+
const __filename = fileURLToPath(import.meta.url)
10+
const __dirname = path.dirname(__filename)
11+
12+
global.codeceptjs = codeceptjs
813

914
let I
1015
const siteUrl = TestHelper.siteUrl()
@@ -16,7 +21,6 @@ describe('TestCafe', function () {
1621
before(() => {
1722
global.codecept_dir = path.join(__dirname, '/../data')
1823
global.output_dir = path.join(__dirname, '/../data/output')
19-
global.codeceptjs = require('../../lib/index')
2024

2125
I = new TestCafe({
2226
url: siteUrl,

‎test/runner/only_test.js‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
const path = require('path')
2-
const exec = require('child_process').exec
3-
const assert = require('assert')
1+
import path from 'path'
2+
import { exec } from 'child_process'
3+
import assert from 'assert'
4+
import { fileURLToPath } from 'url'
5+
6+
const __filename = fileURLToPath(import.meta.url)
7+
const __dirname = path.dirname(__filename)
48

59
const runner = path.join(__dirname, '/../../bin/codecept.js')
610
const codecept_dir = path.join(__dirname, '/../data/sandbox/configs/only')

‎test/unit/enhanced_retry_test.js‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
1-
const { expect } = require('chai')
2-
const event = require('../../lib/event')
3-
const Config = require('../../lib/config')
4-
const enhancedGlobalRetry = require('../../lib/listener/enhancedGlobalRetry')
5-
const enhancedRetryFailedStep = require('../../lib/plugin/enhancedRetryFailedStep')
6-
const retryCoordinator = require('../../lib/retryCoordinator')
7-
const store = require('../../lib/store')
8-
const recorder = require('../../lib/recorder')
9-
const { createTest } = require('../../lib/mocha/test')
10-
const { createSuite } = require('../../lib/mocha/suite')
11-
const MochaSuite = require('mocha/lib/suite')
1+
import { expect } from 'chai'
2+
import event from '../../lib/event.js'
3+
import Config from '../../lib/config.js'
4+
import enhancedGlobalRetry from '../../lib/listener/enhancedGlobalRetry.js'
5+
import enhancedRetryFailedStep from '../../lib/plugin/enhancedRetryFailedStep.js'
6+
import * as retryCoordinator from '../../lib/retryCoordinator.js'
7+
import store from '../../lib/store.js'
8+
import recorder from '../../lib/recorder.js'
9+
import { createTest } from '../../lib/mocha/test.js'
10+
import { createSuite } from '../../lib/mocha/suite.js'
11+
import MochaSuite from 'mocha/lib/suite.js'
12+
import output from '../../lib/output.js'
1213

1314
describe('Enhanced Retry Mechanisms', function () {
1415
let originalConfig
1516
let capturedLogs
17+
let originalLog
1618

1719
beforeEach(function () {
1820
// Capture original configuration
1921
originalConfig = Config.get()
2022

2123
// Setup log capturing
2224
capturedLogs = []
23-
const originalLog = require('../../lib/output').log
24-
require('../../lib/output').log = message => {
25+
originalLog = output.log
26+
output.log = message => {
2527
capturedLogs.push(message)
2628
// Comment out to reduce noise: originalLog(message)
2729
}
@@ -34,6 +36,11 @@ describe('Enhanced Retry Mechanisms', function () {
3436
})
3537

3638
afterEach(function () {
39+
// Restore original log
40+
if (originalLog) {
41+
output.log = originalLog
42+
}
43+
3744
// Restore original configuration
3845
Config.create(originalConfig)
3946

@@ -67,8 +74,8 @@ describe('Enhanced Retry Mechanisms', function () {
6774
event.dispatcher.emit(event.test.before, test)
6875

6976
// Check that priority information is tracked
70-
expect(suite.opts.retryPriority).to.equal(enhancedGlobalRetry.RETRY_PRIORITIES.FEATURE_CONFIG)
71-
expect(test.opts.retryPriority).to.equal(enhancedGlobalRetry.RETRY_PRIORITIES.SCENARIO_CONFIG)
77+
expect(suite.opts.retryPriority).to.equal(retryCoordinator.RETRY_PRIORITIES.FEATURE_CONFIG)
78+
expect(test.opts.retryPriority).to.equal(retryCoordinator.RETRY_PRIORITIES.SCENARIO_CONFIG)
7279

7380
// Check logging includes enhanced information
7481
const globalRetryLogs = capturedLogs.filter(log => log.includes('[Global Retry]'))
@@ -89,10 +96,10 @@ describe('Enhanced Retry Mechanisms', function () {
8996
// First set by global retry
9097
event.dispatcher.emit(event.test.before, test)
9198
expect(test.retries()).to.equal(2)
92-
expect(test.opts.retryPriority).to.equal(enhancedGlobalRetry.RETRY_PRIORITIES.SCENARIO_CONFIG)
99+
expect(test.opts.retryPriority).to.equal(retryCoordinator.RETRY_PRIORITIES.SCENARIO_CONFIG)
93100

94101
// Simulate a higher priority mechanism (like manual retry)
95-
test.opts.retryPriority = enhancedGlobalRetry.RETRY_PRIORITIES.MANUAL_STEP
102+
test.opts.retryPriority = retryCoordinator.RETRY_PRIORITIES.MANUAL_STEP
96103
test.retries(1) // Manual override
97104

98105
// Global retry should not override higher priority

0 commit comments

Comments
 (0)