Skip to content

Commit 87608a4

Browse files
author
DavertMik
committed
fixed setting name for test
1 parent 5143d38 commit 87608a4

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

lib/mocha/test.js

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,6 @@ function enhanceMochaTest(test) {
5151
test.uid = genTestId(test)
5252
}
5353

54-
test.toFileName = function () {
55-
let fileName = clearString(test.title)
56-
if (fileName.indexOf('{') !== -1) {
57-
fileName = fileName.substr(0, fileName.indexOf('{') - 3).trim()
58-
}
59-
// TODO: add suite title to file name
60-
// if (test.parent && test.parent.title) {
61-
// fileName = `${clearString(test.parent.title)}_${fileName}`
62-
// }
63-
return fileName
64-
}
65-
6654
test.applyOptions = function (opts) {
6755
if (!opts) opts = {}
6856
test.opts = opts
@@ -134,8 +122,22 @@ function cloneTest(test) {
134122
return deserializeTest(serializeTest(test))
135123
}
136124

125+
function testToFileName(test) {
126+
let fileName = clearString(test.title)
127+
if (fileName.indexOf('{') !== -1) {
128+
fileName = fileName.substr(0, fileName.indexOf('{') - 3).trim()
129+
}
130+
if (test.ctx && test.ctx.test && test.ctx.test.type === 'hook') fileName = clearString(`${test.title}_${test.ctx.test.title}`)
131+
// TODO: add suite title to file name
132+
// if (test.parent && test.parent.title) {
133+
// fileName = `${clearString(test.parent.title)}_${fileName}`
134+
// }
135+
return fileName
136+
}
137+
137138
module.exports = {
138139
createTest,
140+
testToFileName,
139141
enhanceMochaTest,
140142
serializeTest,
141143
deserializeTest,

lib/plugin/pageInfo.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const supportedHelpers = require('./standardActingHelpers')
77
const { scanForErrorMessages } = require('../html')
88
const { output } = require('..')
99
const { humanizeString, ucfirst } = require('../utils')
10-
10+
const { testToFileName } = require('../mocha/test')
1111
const defaultConfig = {
1212
errorClasses: ['error', 'warning', 'alert', 'danger'],
1313
browserLogs: ['error'],
@@ -95,7 +95,7 @@ module.exports = function (config = {}) {
9595
recorder.add('Save page info', () => {
9696
test.addNote('pageInfo', pageStateToMarkdown(pageState))
9797

98-
const pageStateFileName = path.join(global.output_dir, `${test.toFileName()}.pageInfo.md`)
98+
const pageStateFileName = path.join(global.output_dir, `${testToFileName(test)}.pageInfo.md`)
9999
fs.writeFileSync(pageStateFileName, pageStateToMarkdown(pageState))
100100
test.artifacts.pageInfo = pageStateFileName
101101
return pageState

lib/plugin/screenshotOnFail.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ const Container = require('../container')
55
const recorder = require('../recorder')
66
const event = require('../event')
77
const output = require('../output')
8-
const { fileExists, clearString } = require('../utils')
8+
const { fileExists } = require('../utils')
99
const Codeceptjs = require('../index')
10+
const { testToFileName } = require('../mocha/test')
1011

1112
const defaultConfig = {
1213
uniqueScreenshotNames: false,
@@ -81,9 +82,8 @@ module.exports = function (config) {
8182
async () => {
8283
const dataType = 'image/png'
8384
// This prevents data driven to be included in the failed screenshot file name
84-
let fileName = test.toFileName()
85+
let fileName = testToFileName(test)
8586

86-
if (test.ctx && test.ctx.test && test.ctx.test.type === 'hook') fileName = clearString(`${test.title}_${test.ctx.test.title}`)
8787
if (options.uniqueScreenshotNames && test) {
8888
const uuid = _getUUID(test)
8989
fileName = `${fileName.substring(0, 10)}_${uuid}.failed.png`

0 commit comments

Comments
 (0)