Skip to content

Commit

Permalink
fix: address #16, improve log for #15
Browse files Browse the repository at this point in the history
  • Loading branch information
Oleksandr Shevtsov committed Jul 20, 2020
1 parent 08b94ae commit 859629d
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 57 deletions.
3 changes: 2 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"fixtures:clear": "rm -r cypress/fixtures/*"
},
"dependencies": {
"allure-js-commons": "^2.0.0-beta.6"
"allure-js-commons": "^2.0.0-beta.6",
"uuid": "^7.0.2"
},
"devDependencies": {
"@types/fs-extra": "^8.1.0",
Expand Down
35 changes: 13 additions & 22 deletions reporter/mocha-allure/AllureReporter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ module.exports = class AllureReporter {
* tags set on test level has higher priority
* to not be overwritten by feature tags
*/
['feature', 'currentScenario'].forEach(function (type) {
['feature', 'currentScenario'].forEach(function(type) {
testState[type] &&
testState[type].tags
// check for labels
.filter(function ({ name }) {
.filter(function({ name }) {
const match = tagToLabel.exec(name);
if (match) {
const [, command, value] = match;
Expand All @@ -129,7 +129,7 @@ module.exports = class AllureReporter {
return !match;
})
// check for links
.filter(function ({ name }) {
.filter(function({ name }) {
const match = tagToLink.exec(name);
if (match) {
const [, command, name, url] = match;
Expand All @@ -147,7 +147,7 @@ module.exports = class AllureReporter {
return !match;
})
// add other tags
.forEach(function ({ name }) {
.forEach(function({ name }) {
currentTest.addLabel('tag', name.replace('@', ''));
});
});
Expand Down Expand Up @@ -308,8 +308,7 @@ module.exports = class AllureReporter {
attributes.type === 'assertion' ||
attributes.name === 'allure' ||
(attributes.args.length &&
attributes.args[1] &&
attributes.args[1].log === false) ||
attributes.args.find((arg) => arg && arg.log === false)) ||
(Object.getOwnPropertyNames(
stubbedAllure.reporter.getInterface()
).includes(attributes.name) &&
Expand Down Expand Up @@ -375,14 +374,12 @@ module.exports = class AllureReporter {
} else {
const executable = this.cyCommandExecutable(command);

const commandArgs =
attributes.args.length &&
attributes.args.map((a) => `"${String(a)}"`).join('; ');

const step = executable.startStep(
`${command.name}${
attributes.args.length
? ` (${attributes.args
.map((a) => `"${String(a)}"`)
.join('; ')})`
: ''
}`
`${command.name}${commandArgs ? ` (${commandArgs})` : ''}`
);

command.step = step;
Expand Down Expand Up @@ -516,7 +513,7 @@ module.exports = class AllureReporter {
// process all not finished steps from chainer left
// usually is executed on fail
this.commands
.filter((c) => !c.finished && c.step && c.step.info.name)
.filter((c) => !c.finished && c.step)
.reverse()
.forEach((command) => {
!command.finished &&
Expand All @@ -534,10 +531,6 @@ module.exports = class AllureReporter {
step.info.stage = Stage.FINISHED;

if (log && log.err) {
step.info.statusDetails = {
message: log.err.message,
trace: log.err.sourceMappedStack || log.err.stack
};
passed = false;
}

Expand All @@ -551,10 +544,8 @@ module.exports = class AllureReporter {
// define step name based on cypress log name or messages
const messages = {
xhr: () =>
`${
(log.consoleProps.Stubbed === 'Yes' ? 'STUBBED ' : '') +
log.consoleProps.Method
} ${log.consoleProps.URL}`,
`${(log.consoleProps.Stubbed === 'Yes' ? 'STUBBED ' : '') +
log.consoleProps.Method} ${log.consoleProps.URL}`,
step: () => `${log.displayName}${log.message.replace(/\*/g, '')}`,
stub: () =>
`${log.name} [ function: ${log.functionName} ] ${
Expand Down
36 changes: 2 additions & 34 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2693,7 +2693,7 @@ debug@^3.0.1, debug@^3.1.0:
dependencies:
ms "^2.1.1"

debuglog@*, debuglog@^1.0.1:
debuglog@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
Expand Down Expand Up @@ -3920,7 +3920,7 @@ import-lazy@^2.1.0:
resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=

imurmurhash@*, imurmurhash@^0.1.4:
imurmurhash@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
Expand Down Expand Up @@ -4790,11 +4790,6 @@ lockfile@^1.0.4:
dependencies:
signal-exit "^3.0.2"

lodash._baseindexof@*:
version "3.1.0"
resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=

lodash._baseuniq@~4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
Expand All @@ -4803,33 +4798,11 @@ lodash._baseuniq@~4.6.0:
lodash._createset "~4.0.0"
lodash._root "~3.0.0"

lodash._bindcallback@*:
version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=

lodash._cacheindexof@*:
version "3.0.2"
resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=

lodash._createcache@*:
version "3.1.2"
resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
dependencies:
lodash._getnative "^3.0.0"

lodash._createset@~4.0.0:
version "4.0.3"
resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=

lodash._getnative@*, lodash._getnative@^3.0.0:
version "3.9.1"
resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=

lodash._root@~3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
Expand Down Expand Up @@ -4875,11 +4848,6 @@ lodash.once@^4.1.1:
resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=

lodash.restparam@*:
version "3.6.1"
resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=

lodash.toarray@^4.4.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
Expand Down

0 comments on commit 859629d

Please sign in to comment.