Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mocha, chai for testomat reporting internal #21400

Merged
merged 40 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
09f2338
[WIP] Added testomatio reporter for ui tests (#21166)
DavertMik Oct 12, 2023
a02470f
Merge branch '5.x-dev' into dev-17222-testomat-internal
achakko Oct 15, 2023
314c304
Merge branch '5.x-dev' into dev-17222-testomat-internal
achakko Oct 30, 2023
61c6637
Merge branch '5.x-dev' into dev-17222-testomat-internal
achakko Oct 31, 2023
e079bd1
Added testomatio environment variable to matomo-tests.yml
achakko Nov 1, 2023
2510eff
Added testomatio environment variable to matomo-tests.yml
achakko Nov 1, 2023
0b0a392
Added testomatio environment variable to matomo-tests.yml
achakko Nov 2, 2023
4de9ec8
Added testomatio environment variable to matomo-tests.yml
achakko Nov 5, 2023
7295be3
Added mocha-multi-reporter to package.jso to enable mocha reporting f…
achakko Nov 5, 2023
f37d85d
Added mocha-multi-reporter to package.jso to enable mocha reporting f…
achakko Nov 5, 2023
2584262
added testomatio reporter in addition regular spec
achakko Nov 5, 2023
404a219
added testomatio reporter in addition regular spec
achakko Nov 6, 2023
67ff02d
Updated one test to ensure it is reported into testomat correctly.
achakko Nov 6, 2023
7d7626c
Merge branch '5.x-dev' into dev-17222-testomat-internal
achakko Nov 6, 2023
a65eb75
Updated one test to ensure it is reported into testomat correctly.
achakko Nov 7, 2023
7ac9a6a
Merge remote-tracking branch 'origin/dev-17222-testomat-internal' int…
achakko Nov 7, 2023
0a77a57
Added comments for multiple mocha reporters
achakko Nov 7, 2023
ce486b0
Adding nyc mocha to report test coverage
achakko Nov 7, 2023
d1fa19c
Updated multiple mocha reporter comment and added mocha-multi-reporte…
achakko Nov 8, 2023
3fabf98
Merge branch '5.x-dev' into dev-17222-testomat-internal
achakko Nov 8, 2023
3591b16
Added mocha-multi-reporter dev dependency to screenshot-testing/packa…
achakko Nov 8, 2023
00557c7
Merge remote-tracking branch 'origin/dev-17222-testomat-internal' int…
achakko Nov 8, 2023
754a6c6
Added mocha-multi-reporter dev dependency to screenshot-testing/packa…
achakko Nov 8, 2023
80cd14e
Added mocha-multi-reporter dev dependency to screenshot-testing/packa…
achakko Nov 8, 2023
1a34fd7
Added mocha-multi-reporter dev dependency to screenshot-testing/packa…
achakko Nov 8, 2023
ad5266a
deleting .npmrc file
achakko Nov 8, 2023
0c29e74
updated lockfile
achakko Nov 8, 2023
b11dc90
Configured mocha-multi-reporter in config and run-tests files
achakko Nov 8, 2023
c421df1
typo in reporters
achakko Nov 8, 2023
d61a636
Trying to force mocha colours
achakko Nov 9, 2023
4916821
Trying to force mocha colours
achakko Nov 9, 2023
381773e
removed deprecated useColors method and kept color method
achakko Nov 9, 2023
1a47e27
Merge branch '5.x-dev' into dev-17222-testomat-internal
achakko Nov 12, 2023
e22f3b8
Updated dependencies in package.json and updated condition to run spe…
achakko Nov 12, 2023
119bd91
Merge remote-tracking branch 'origin/dev-17222-testomat-internal' int…
achakko Nov 12, 2023
c0f175a
Merge branch '5.x-dev' into dev-17222-testomat-internal
achakko Nov 12, 2023
f1dbf13
Update screenshot-testing lockfile
mneudert Nov 13, 2023
f1ec512
Always export reporterOptions from UI config
mneudert Nov 13, 2023
6b019b1
revert changes to package-lock.json
sgiehl Nov 13, 2023
16118fa
Merge branch '5.x-dev' into dev-17222-testomat-internal
sgiehl Nov 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/matomo-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ jobs:
- name: running tests
uses: matomo-org/github-action-tests@main
with:
testomatio: ${{ secrets.TESTOMATIO }}
ui-test-options: '--num-test-groups=4 --test-group=${{ matrix.parts }}'
test-type: 'UI'
php-version: '7.2'
Expand Down
30 changes: 18 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 9 additions & 3 deletions tests/UI/config.dist.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,18 @@ exports.mocha = 'mocha-3.1.2';
exports.chai = 'chai-1.9.0';

/**
* The mocha reporter to use.
* Mocha reporters to use (can be multiple delimited by a comma).
*/
exports.reporter = "spec";
exports.reporter = 'mocha-multi-reporters';
exports.reporterOptions = {
reporterEnabled: 'spec, @testomatio/reporter/lib/adapter/mocha.js',
testomatioReporterLibAdapterMochaJsReporterOptions: {
apiKey: process.env.TESTOMATIO
}
};
sgiehl marked this conversation as resolved.
Show resolved Hide resolved

/**
* The directory that stores expected screenshots. Relative to the UI repo's root directoriy.
* The directory that stores expected screenshots. Relative to the UI repo's root directory.
*/
exports.expectedScreenshotsDir = ["./expected-screenshots", "./expected-ui-screenshots"];

Expand Down
6 changes: 3 additions & 3 deletions tests/UI/specs/ReportExporting_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ describe("ReportExporting", function () {
visitsSummaryGetUrl = baseUrl + "&moduleToWidgetize=VisitsSummary&actionToWidgetize=get&forceView=1&viewDataTable=graphEvolution";

function normalReportTest(format) {
it("should export a normal report correctly when the " + format + " export is chosen", async function () {
it(`should export a normal report correctly when the ${format} export is chosen`, async function () {
if (await page.url() !== referrersGetWebsitesUrl) {
await page.goto(referrersGetWebsitesUrl);
await page.click('.activateExportSelection');
Expand All @@ -39,7 +39,7 @@ describe("ReportExporting", function () {
}

function evolutionReportTest(format) {
it("should export an evolution graph report correctly when the " + format + " export is chosen", async function () {
it(`should export an evolution graph report correctly when the ${format} export is chosen`, async function () {
if (await page.url() !== visitsSummaryGetUrl) {
await page.goto(visitsSummaryGetUrl);
await page.click('.activateExportSelection');
Expand All @@ -65,7 +65,7 @@ describe("ReportExporting", function () {
}

function rowEvolutionReportTest(format) {
it("should export an row evolution graph report correctly when the " + format + " export link is clicked", async function () {
it(`should export an row evolution graph report correctly when the ${format} export link is clicked`, async function () {
if (!page.url() || page.url().indexOf('popover') === -1) {
await page.goto(referrersGetWebsitesUrl);

Expand Down
Loading
Loading