This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2
Attachment support #3
Open
lamkovod
wants to merge
2
commits into
mgrybyk:master
Choose a base branch
from
lamkovod:attachment-support
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,6 +29,10 @@ function qTest(runner, options = {}) { | |
const stateFailed = qTestConfig.stateFailed || 'FAIL' | ||
const statePassed = qTestConfig.statePassed || 'PASS' | ||
const statePending = qTestConfig.statePending || 'PENDING' | ||
|
||
const attachmentFolder = qTestConfig.attachmentFolder || 'report/screenshot' | ||
const attachmentType = qTestConfig.attachmentType || 'image/png' | ||
const attachmentTrigger = qTestConfig.attachmentTrigger || stateFailed | ||
|
||
if (!testSuiteId && (!parentId || !testSuiteName || !parentType)) { | ||
if (!qTestConfig.hideWarning) { | ||
|
@@ -106,11 +110,6 @@ function qTest(runner, options = {}) { | |
|
||
test.qTest.executionLog.status = stateFailed | ||
test.qTest.executionLog.note = err.stack | ||
// test.qTest.executionLog.attachments: [{ | ||
// name: 'screenshot.png', | ||
// content_type: 'image/png', | ||
// data: 'base64 string of Sample.docx' | ||
// }] | ||
}, | ||
|
||
onTestSkip(test) { | ||
|
@@ -135,6 +134,10 @@ function qTest(runner, options = {}) { | |
if (!test.qTest.executionLog.status) { | ||
test.qTest.executionLog.status = statePending | ||
} | ||
|
||
if ([test.qTest.executionLog.status, 'ALL'].some(tr => attachmentTrigger === tr)) { | ||
test.qTest.executionLog.file = getAttachment(attachmentFolder, test.title) | ||
} | ||
}, | ||
|
||
onSuiteStart(suite) { | ||
|
@@ -205,7 +208,9 @@ function qTest(runner, options = {}) { | |
{ | ||
name: testRun.name, | ||
automation_content: idsLog, | ||
note: `${testTitle} \n${idsLog}` + (executionLog.note ? `\n\r\n ${executionLog.note}` : '') | ||
note: `${testTitle} \n${idsLog}` + (executionLog.note ? `\n\r\n ${executionLog.note}` : ''), | ||
attachments: executionLog.file ? [ | ||
{ name: `${testTitle}`, content_type: attachmentType, data: executionLog.file, author: {} } ] : undefined | ||
}) | ||
|
||
await qTestClient.postLog(testRun.id, logBody) | ||
|
@@ -339,6 +344,31 @@ function addTest(testTitle, testCaseId, buildUrl) { | |
} | ||
} | ||
|
||
function getAttachment(attachmentFolder, testTitle) { | ||
const attachmentsFolder = path.join(process.cwd(), `${attachmentFolder}`) | ||
|
||
if (fs.existsSync(attachmentsFolder)) { | ||
const attachmentPath = getFiles(attachmentsFolder).find(filename => filename.includes(testTitle)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can you please mention somewhere (in doc/readme) how are you attaching screenshots, please? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
if (attachmentPath) { | ||
return fs.readFileSync(attachmentPath).toString('base64') | ||
} else { | ||
console.log("Attachments with qTestId in name not found") | ||
} | ||
} else { | ||
console.log("Attachments path not found") | ||
} | ||
return undefined | ||
} | ||
|
||
function getFiles (folderPath) { | ||
const dirents = fs.readdirSync(folderPath) | ||
const files = dirents.map((dirent) => { | ||
const res = path.resolve(folderPath, dirent) | ||
return fs.existsSync(res) && fs.lstatSync(res).isDirectory() ? getFiles(res) : res | ||
}) | ||
return [].concat(...files) | ||
} | ||
|
||
/** | ||
* Expose `Mocha qTest Mapping Reporter`. | ||
*/ | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think attachmentFolder can be declared once in the top.
Can't see any reason to pass attachmentFolder in current implementation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure, it's a property of qTestConfig