Skip to content

Commit 840a1e3

Browse files
mmistymmisty
authored
Fixed defects, tests, experimental setting to wrap custom commands (#3) 0.7.0
1 parent 1bc27e4 commit 840a1e3

File tree

66 files changed

+4835
-310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+4835
-310
lines changed

‎.github/workflows/build.yml

+18-5
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,25 @@ jobs:
2525
- name: Install
2626
run: npm ci
2727

28-
- name: Built
29-
run: npm run pre
28+
- name: Lint
29+
run: npm run lint
30+
31+
- name: Build
32+
run: npm run build:all
33+
34+
- name: Test
35+
run: npm run test:cov
36+
37+
- name: Archive code coverage results
38+
uses: actions/upload-artifact@v3
39+
with:
40+
name: code-coverage-report
41+
path: ./reports/coverage-cypress/
3042

3143
- name: Monitor coverage
32-
uses: slavcodev/coverage-monitor-action@v1
44+
uses: danhunsaker/clover-reporter-action@v0.2.17-clover
3345
with:
34-
github_token: ${{ secrets.GITHUB_TOKEN }}
35-
coverage_path: "reports/coverage-full/clover.xml"
46+
github-token: ${{ secrets.GITHUB_TOKEN }}
47+
clover-file: ./reports/coverage-cypress/clover.xml
48+
3649

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/integration/videos
1313
/integration/downloads
1414
/integration/screenshots
15+
/integration/e2e/temp/
1516

1617
# coverage and test reports
1718
/reports

‎README.pack.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ export default defineConfig({
100100
setupNodeEvents(on, config) {
101101
const reporter = configureAllureAdapterPlugins(on, config);
102102
103-
on('after:spec', (spec, results) => {
103+
on('after:spec', async (spec, results) => {
104104
// your code in after spec
105-
reporter.afterSpec({ results });
105+
await reporter.afterSpec({ results });
106106
})
107107
108108
return config;

‎cypress.config.ts

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export default defineConfig({
2525
allureSkipCommands: 'wrap', // separated comma
2626
allureAddVideoOnPass: 'true',
2727
allureShowDuplicateWarn: 'true',
28+
allureWrapCustomCommandsExperimental: 'true',
2829

2930
tmsPrefix: 'http://jira',
3031
issuePrefix: 'http://jira/*',

‎integration/e2e/commands/custom-command.cy.ts

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
describe('should pass', () => {
2+
it('custom command nesting test', () => {
3+
cy.myLog('hello');
4+
});
5+
6+
it('custom command nesting test 2', () => {
7+
cy.otherCmd('hello');
8+
});
9+
});

‎integration/e2e/hooks/before-all-in-suite.cy.ts

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
describe('hello suite', () => {
2+
before(() => {
3+
cy.wrap(null).then(() => {
4+
throw new Error('Test FAIL on purpose');
5+
});
6+
});
7+
8+
beforeEach(() => {
9+
cy.log('before');
10+
});
11+
12+
it('hello test', () => {
13+
cy.log('123');
14+
});
15+
16+
afterEach(() => {
17+
cy.log('after');
18+
});
19+
});

‎integration/e2e/hooks/before-each-fail-retry-fail.cy.ts

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
describe('before each fail with retry fails @beforeEachRetry', { retries: 2 }, () => {
2+
beforeEach(() => {
3+
cy.log('no name hook - before each');
4+
});
5+
6+
beforeEach('Named hook', () => {
7+
cy.log('before each');
8+
cy.wrap(null).then(() => {
9+
throw new Error('BEFORE EACH FAIL');
10+
});
11+
});
12+
13+
for (let i = 1; i <= 10; i++) {
14+
it(`test ${`0${i}`.slice(-2)}`, () => {
15+
cy.log(`test ${i}`);
16+
});
17+
}
18+
19+
afterEach(() => {
20+
cy.log('log after each');
21+
});
22+
23+
afterEach('Named after', () => {
24+
cy.log('log after each');
25+
});
26+
27+
after(() => {
28+
cy.log('after');
29+
});
30+
31+
after('named hook all after', () => {
32+
cy.log('after');
33+
});
34+
});

‎integration/e2e/hooks/before-each-fail-retry.cy.ts ‎integration/e2e/hooks/before-each-fail-retry-pass.cy.ts

File renamed without changes.

‎integration/e2e/hooks/before-each-retry-one-fail.cy.ts

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
describe('before each retry fails one @beforeEachRetry', { retries: 0 }, () => {
2+
beforeEach('Named hook', () => {
3+
cy.log('before each');
4+
cy.wrap(null).then(() => {
5+
throw new Error('BEFORE EACH FAIL');
6+
});
7+
});
8+
9+
it('test that fails because of before each', () => {
10+
cy.log('not reachable');
11+
});
12+
13+
/* it('test that has unknown status because of before each', () => {
14+
cy.log('not reachable');
15+
});*/
16+
});

‎integration/e2e/hooks/hook.attach.cy.ts

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
import { ContentType } from '@src/plugins/allure-types';
2+
13
describe('hooks test.attachments', () => {
24
before(() => {
35
cy.log('before');
4-
cy.allure().attachment('1.txt', 'before all', 'text/plain');
6+
cy.allure().attachment('1.txt', 'before all', ContentType.TEXT);
57
});
68

79
beforeEach('Named hook', () => {
810
cy.log('before each');
9-
cy.allure().attachment('2.txt', 'before each', 'text/plain');
11+
cy.allure().attachment('2.txt', 'before each', ContentType.TEXT);
1012
});
1113

1214
it('test 1', () => {
@@ -19,11 +21,11 @@ describe('hooks test.attachments', () => {
1921

2022
afterEach(() => {
2123
cy.log('log after each');
22-
cy.allure().attachment('3.txt', 'after each', 'text/plain');
24+
cy.allure().attachment('3.txt', 'after each', ContentType.TEXT);
2325
});
2426

2527
after('Named after', () => {
2628
cy.log('log after');
27-
cy.allure().attachment('4.txt', 'after', 'text/plain');
29+
cy.allure().attachment('4.txt', 'after', ContentType.TEXT);
2830
});
2931
});

‎integration/e2e/hooks/hook.cy.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ after('Global teardown', () => {
1010

1111
describe('hooks test', () => {
1212
before(() => {
13-
cy.log('before');
13+
cy.log('before 1');
1414
});
1515

1616
before('named hook before', () => {
17-
cy.log('before');
17+
cy.log('before 2');
1818
});
1919

2020
beforeEach('Named hook', () => {

‎integration/support/index.ts

+11-7
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,9 @@ const setupCoverage = () => {
1414
}
1515
};
1616

17-
if (Cypress.env('allure') === 'true' || Cypress.env('allure') === true) {
18-
beforeEach('Register allure test', () => {
19-
cy.log('log', 'Registered allureAdapterSetup');
20-
});
21-
}
22-
2317
allureAdapterSetup();
2418

19+
/*
2520
Cypress.Allure.on('test:started', test => {
2621
console.log(`AFTER TEST STARTED: ${test.title}`);
2722
Cypress.Allure.label('event', 'started');
@@ -30,12 +25,16 @@ Cypress.Allure.on('test:started', test => {
3025
Cypress.Allure.addDescriptionHtml(Cypress.spec.relative);
3126
});
3227
28+
Cypress.Allure.on('test:started', () => {
29+
Cypress.Allure.step('after start2');
30+
});
31+
3332
Cypress.Allure.on('test:ended', test => {
3433
console.log(`BEFORE ENDING TEST: ${test.title}`);
3534
Cypress.Allure.label('event', 'ended');
3635
Cypress.Allure.label('tag', 'ended');
3736
Cypress.Allure.step('before end');
38-
});
37+
});*/
3938

4039
redirectTestLogs({
4140
isLogCommandDetails: false,
@@ -55,6 +54,11 @@ Cypress.Commands.add('myLog', (message: string) => {
5554
cy.task('log', message);
5655
});
5756

57+
Cypress.Commands.add('otherCmd', (message: string) => {
58+
cy.task('log', message);
59+
cy.get('div:eq(100)').should('not.exist');
60+
});
61+
5862
if (Cypress.config('isInteractive')) {
5963
console.log('DELETE');
6064
Cypress.Allure.deleteResults();

‎integration/support/setup.d.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ declare namespace Cypress {
77
* @param message - message
88
*/
99

10-
myLog(message: string): Chainable<void>; // todo remove
10+
myLog(message: string): Chainable<void>;
11+
otherCmd(message: string): Chainable<void>;
1112
}
1213
}

‎jest.config.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ export default {
3636
testEnvironment: 'node',
3737

3838
// The glob patterns Jest uses to detect test files
39-
testMatch: ['**/tests/**/?(*.)+(spec|test).[tj]s?(x)', '!**/lib/**/*.*'],
39+
testMatch: [
40+
'**/tests/test-folder/**/?(*.)+(spec|test).[tj]s?(x)',
41+
'!**/tests/test-folder/allure-plugin/**/?(*.)+(spec|test).[tj]s?(x)',
42+
'!**/lib/**/*.*',
43+
],
4044

4145
// A map from regular expressions to paths to transformers
4246
transform: {

‎nyc.config.js

+5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ module.exports = {
1313
'tests',
1414
'reports',
1515
'cypress/e2e',
16+
'coverage-nyc/**',
17+
'coverage-nyc/**/*.*',
18+
'**/coverage-nyc/**/*.*',
19+
'**/integration/**/*.*',
20+
'integration/**/*.*',
1621
'cypress/plugins',
1722
'cypress/*.*',
1823
'src/cypress',

‎package-lock.json

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"husky:install": "husky install",
2626
"lint": "eslint --fix '**/*.{ts,tsx,js}'",
2727
"test": "jest --runInBand",
28-
"test:cov": "jest --runInBand --coverage --coverageDirectory reports/coverage-jest",
28+
"test:cov": "CI=true COVERAGE=true jest --runInBand --coverage --coverageDirectory reports/coverage-jest",
2929
"cy": "cypress",
3030
"cy:open": "npm run cy -- open",
3131
"cy:run": "npm run cy -- run --browser chrome --headless",
@@ -37,14 +37,13 @@
3737
"build:tests": "tsc && cd tests && tsc",
3838
"build:cy": "cd integration && tsc",
3939
"build:all": "npm run build && npm run build:cy && npm run build:tests",
40-
"test:all": "npm run test:cov",
4140
"cov:merge": "node ./.scripts/merge.js --cypress reports/coverage-cypress --jest reports/coverage-jest --out reports/coverage-temp --report reports/coverage-full",
4241
"cov": "http-server reports/coverage-full/lcov-report",
4342
"cov:jest": "http-server reports/coverage-jest/lcov-report",
4443
"cov:cy": "http-server reports/coverage-cypress/lcov-report",
4544
"cov:check": "COVERAGE_TEMP=reports/coverage-temp nyc check-coverage",
4645
"all": "npm run pre && npm run cov:check && npm run cov",
47-
"pre": "rm -rf ./node_modules/.cache lib reports coverage-nyc .nyc_output && npm run lint && npm run build:all && npm run test:all && npm run cov:merge",
46+
"pre": "rm -rf ./node_modules/.cache lib reports coverage-nyc .nyc_output && npm run lint && npm run build:all && npm run test:cov && npm run cov:merge",
4847
"pack": "npm run build && cp package.json ./lib/package.json && cp README.pack.md ./lib/README.md && sh .scripts/remove.sh && cd lib && npm version $ver --no-git-tag-version ",
4948
"prepublish": "npm run lint",
5049
"prepublishOnly": "{ echo \"Run script 'npm run publish:pack', 'npm run publish:minor', etc from package.json\n\"; exit 1; }",
@@ -70,8 +69,8 @@
7069
"@typescript-eslint/eslint-plugin": "^5.44.0",
7170
"@typescript-eslint/parser": "^5.44.0",
7271
"allure-commandline": "^2.22.4",
73-
"cypress": "^12.17.0",
74-
"cypress-redirect-browser-log": "^1.1.0",
72+
"cypress": "^12.17.1",
73+
"cypress-redirect-browser-log": "^1.1.1",
7574
"eslint": "^8.28.0",
7675
"eslint-config-prettier": "^8.5.0",
7776
"eslint-plugin-cypress": "^2.12.1",

‎src/plugins/allure-global-hook.ts

+8-3
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ export class GlobalHooks {
6161
this.currentHook.steps = [];
6262
}
6363
this.currentHook.steps.push({ name, event: 'start', date: Date.now() });
64+
log(`this.currentHook.steps: ${JSON.stringify(this.currentHook.steps.map(t => t.name))}`);
6465
}
6566

6667
endStep(status?: Status, details?: StatusDetails) {
@@ -78,6 +79,8 @@ export class GlobalHooks {
7879
this.currentHook.steps.push({ name: '', event: 'stop', date: Date.now() });
7980
this.currentStep.status = status;
8081
this.currentStep.details = details;
82+
83+
log(`this.currentHook.steps: ${JSON.stringify(this.currentHook.steps.map(t => t.name))}`);
8184
}
8285

8386
end(status: StatusType, details?: StatusDetails) {
@@ -105,7 +108,7 @@ export class GlobalHooks {
105108
log(`added attachement: ${name}`);
106109
}
107110

108-
// proces attachements
111+
// proces attachments
109112
processForTest() {
110113
log('process global hooks for test');
111114
const res = this.hooks;
@@ -124,6 +127,8 @@ export class GlobalHooks {
124127
process() {
125128
log('process global hooks');
126129
const res = this.hooks;
130+
this.hooks = [];
131+
log(res.map(t => t.title));
127132

128133
res.forEach(hook => {
129134
this.reporter.hookStarted({
@@ -132,6 +137,7 @@ export class GlobalHooks {
132137
date: hook.start,
133138
});
134139

140+
log(`hook steps: ${hook.steps?.length}` ?? 'undef');
135141
hook.steps?.forEach(step => {
136142
if (step.event === 'start') {
137143
this.reporter.startStep({ name: step.name, date: step.date });
@@ -145,14 +151,13 @@ export class GlobalHooks {
145151
});
146152
}
147153
});
148-
154+
this.reporter.endAllSteps({ status: hook.status || UNKNOWN });
149155
this.reporter.hookEnded({
150156
title: hook.title,
151157
result: hook.status || UNKNOWN,
152158
details: hook.details as StatusDetails,
153159
date: hook.stop,
154160
});
155161
});
156-
this.hooks = [];
157162
}
158163
}

0 commit comments

Comments
 (0)