From c3be67a9a763cd37444266e19df41ccebd9127df Mon Sep 17 00:00:00 2001 From: jsmid1 Date: Wed, 16 Oct 2024 11:59:34 +0200 Subject: [PATCH] [RHTAP-3026] Adds test groups --- jest.config.js | 3 ++- package.json | 3 ++- tests/gpts/github/dotnet.jenkins.test.ts | 9 +++++++++ tests/gpts/github/dotnet.tekton.test.ts | 9 +++++++++ tests/gpts/github/go.jenkins.test.ts | 9 +++++++++ tests/gpts/github/go.tekton.test.ts | 11 ++++++++++- tests/gpts/github/nodejs.jenkins.test.ts | 9 +++++++++ tests/gpts/github/nodejs.tekton.test.ts | 9 +++++++++ tests/gpts/github/python.jenkins.test.ts | 9 +++++++++ tests/gpts/github/python.tekton.test.ts | 9 +++++++++ tests/gpts/github/quarkus.jenkins.test.ts | 9 +++++++++ tests/gpts/github/quarkus.tekton.test.ts | 9 +++++++++ tests/gpts/github/springboot.jenkins.test.ts | 9 +++++++++ tests/gpts/github/springboot.tekton.test.ts | 9 +++++++++ tests/gpts/gitlab/dotnet.test.ts | 9 +++++++++ tests/gpts/gitlab/go.test.ts | 10 ++++++++++ tests/gpts/gitlab/nodejs.test.ts | 9 +++++++++ tests/gpts/gitlab/python.test.ts | 9 +++++++++ tests/gpts/gitlab/quarkus.test.ts | 9 +++++++++ tests/gpts/gitlab/springboot.test.ts | 9 +++++++++ yarn.lock | 5 +++++ 21 files changed, 173 insertions(+), 3 deletions(-) diff --git a/jest.config.js b/jest.config.js index c7acb4d..ad96b73 100644 --- a/jest.config.js +++ b/jest.config.js @@ -45,5 +45,6 @@ module.exports = { "expand": true, "pageTitle": "Red Hat Trusted Application Pipeline e2e report", }], - ] + ], + runner: "groups" }; diff --git a/package.json b/package.json index beb279f..011c262 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "eslint-plugin-no-null": "^1.0.2", "jest": "^29.7.0", "jest-junit": "^16.0.0", + "jest-runner-groups": "^2.2.0", "jest-stare": "^2.5.1", "prettier": "^2.5.1", "ts-jest": "^29.1.1", @@ -41,4 +42,4 @@ "jest-html-reporters": "^3.1.7", "unique-names-generator": "^4.7.1" } -} \ No newline at end of file +} diff --git a/tests/gpts/github/dotnet.jenkins.test.ts b/tests/gpts/github/dotnet.jenkins.test.ts index 7d4b789..2a8eee0 100644 --- a/tests/gpts/github/dotnet.jenkins.test.ts +++ b/tests/gpts/github/dotnet.jenkins.test.ts @@ -2,6 +2,15 @@ import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "./test-config/config.ts"; import { gitHubJenkinsBasicGoldenPathTemplateTests } from "./test-config/github_suite_jenkins.ts"; +/** + * Tests dotnet template in GitHub with Jenkins + * + * @group jenkins + * @group dotnet + * @group github + * @group basic + */ + const dotNetTemplateName = 'dotnet-basic'; const stringOnRoute = 'Welcome'; diff --git a/tests/gpts/github/dotnet.tekton.test.ts b/tests/gpts/github/dotnet.tekton.test.ts index 0318b1d..667fe26 100644 --- a/tests/gpts/github/dotnet.tekton.test.ts +++ b/tests/gpts/github/dotnet.tekton.test.ts @@ -2,6 +2,15 @@ import { gitHubBasicGoldenPathTemplateTests } from "./test-config/github_positiv import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "./test-config/config.ts"; +/** + * Tests dotnet template in GitHub with Tekton + * + * @group tekton + * @group dotnet + * @group github + * @group basic + */ + const dotNetTemplateName = 'dotnet-basic'; const runDotNetBasicTests = () => { diff --git a/tests/gpts/github/go.jenkins.test.ts b/tests/gpts/github/go.jenkins.test.ts index 30a97b6..c3929cd 100644 --- a/tests/gpts/github/go.jenkins.test.ts +++ b/tests/gpts/github/go.jenkins.test.ts @@ -2,6 +2,15 @@ import { gitHubJenkinsBasicGoldenPathTemplateTests } from "./test-config/github_ import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "./test-config/config.ts"; +/** + * Tests Go template in GitHub with Jenkins + * + * @group jenkins + * @group go + * @group github + * @group basic + */ + const golangTemplateName = 'go'; const stringOnRoute = 'Hello World!'; diff --git a/tests/gpts/github/go.tekton.test.ts b/tests/gpts/github/go.tekton.test.ts index 54077ad..982a055 100644 --- a/tests/gpts/github/go.tekton.test.ts +++ b/tests/gpts/github/go.tekton.test.ts @@ -2,13 +2,22 @@ import { gitHubBasicGoldenPathTemplateTests } from "./test-config/github_positiv import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "./test-config/config.ts"; +/** + * Tests Go template in GitHub with Tekton + * + * @group tekton + * @group go + * @group github + * @group basic + */ + const golangTemplateName = 'go'; const runGolangBasicTests = () => { const configuration = loadSoftwareTemplatesTestsGlobals() if (configuration.templates.includes(golangTemplateName) && configuration.github.active && configuration.github.tekton) { - gitHubBasicGoldenPathTemplateTests(golangTemplateName); + gitHubBasicGoldenPathTemplateTests(golangTemplateName); } else { skipSuite(golangTemplateName); } diff --git a/tests/gpts/github/nodejs.jenkins.test.ts b/tests/gpts/github/nodejs.jenkins.test.ts index 16103a7..bbb7f75 100644 --- a/tests/gpts/github/nodejs.jenkins.test.ts +++ b/tests/gpts/github/nodejs.jenkins.test.ts @@ -2,6 +2,15 @@ import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "./test-config/config.ts"; import { gitHubJenkinsBasicGoldenPathTemplateTests } from "./test-config/github_suite_jenkins.ts"; +/** + * Tests Nodejs template in GitHub with Jenkins + * + * @group jenkins + * @group nodejs + * @group github + * @group basic + */ + const nodejsTemplateName = 'nodejs'; const stringOnRoute = 'Hello from Node.js Starter Application!'; diff --git a/tests/gpts/github/nodejs.tekton.test.ts b/tests/gpts/github/nodejs.tekton.test.ts index b2c57b1..1388142 100644 --- a/tests/gpts/github/nodejs.tekton.test.ts +++ b/tests/gpts/github/nodejs.tekton.test.ts @@ -2,6 +2,15 @@ import { gitHubBasicGoldenPathTemplateTests } from "./test-config/github_positiv import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "./test-config/config.ts"; +/** + * Tests Nodejs template in GitHub with Tekton + * + * @group tekton + * @group nodejs + * @group github + * @group basic + */ + const nodejsTemplateName = 'nodejs'; const runNodeJSBasicTests = () => { diff --git a/tests/gpts/github/python.jenkins.test.ts b/tests/gpts/github/python.jenkins.test.ts index 40c0858..0d6473d 100644 --- a/tests/gpts/github/python.jenkins.test.ts +++ b/tests/gpts/github/python.jenkins.test.ts @@ -2,6 +2,15 @@ import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "./test-config/config.ts"; import { gitHubJenkinsBasicGoldenPathTemplateTests } from "./test-config/github_suite_jenkins.ts"; +/** + * Tests Python template in GitHub with Jenkins + * + * @group jenkins + * @group python + * @group github + * @group basic + */ + const pythonTemplateName = 'python'; const stringOnRoute = 'Hello World!'; diff --git a/tests/gpts/github/python.tekton.test.ts b/tests/gpts/github/python.tekton.test.ts index 77bdbd2..d9740a9 100644 --- a/tests/gpts/github/python.tekton.test.ts +++ b/tests/gpts/github/python.tekton.test.ts @@ -2,6 +2,15 @@ import { gitHubBasicGoldenPathTemplateTests } from "./test-config/github_positiv import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "./test-config/config.ts"; +/** + * Tests Python template in GitHub with Tekton + * + * @group tekton + * @group python + * @group github + * @group basic + */ + const pythonTemplateName = 'python'; const runPythonBasicTests = () => { diff --git a/tests/gpts/github/quarkus.jenkins.test.ts b/tests/gpts/github/quarkus.jenkins.test.ts index becb21f..313af74 100644 --- a/tests/gpts/github/quarkus.jenkins.test.ts +++ b/tests/gpts/github/quarkus.jenkins.test.ts @@ -2,6 +2,15 @@ import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "./test-config/config.ts"; import { gitHubJenkinsBasicGoldenPathTemplateTests } from "./test-config/github_suite_jenkins.ts"; +/** + * Tests Quarkus template in GitHub with Jenkins + * + * @group jenkins + * @group quarkus + * @group github + * @group basic + */ + const quarkusTemplateName = 'java-quarkus'; const stringOnRoute = 'Congratulations, you have created a new Quarkus cloud application.'; diff --git a/tests/gpts/github/quarkus.tekton.test.ts b/tests/gpts/github/quarkus.tekton.test.ts index 4a0b4ab..31b1f95 100644 --- a/tests/gpts/github/quarkus.tekton.test.ts +++ b/tests/gpts/github/quarkus.tekton.test.ts @@ -2,6 +2,15 @@ import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "./test-config/config.ts"; import { githubSoftwareTemplatesAdvancedScenarios } from "./test-config/github_advanced_scenario.ts"; +/** + * Tests Quarkus template in Github with Tekton + * + * @group tekton + * @group quarkus + * @group github + * @group advanced + */ + const quarkusTemplateName = 'java-quarkus'; const runQuarkusBasicTests = () => { diff --git a/tests/gpts/github/springboot.jenkins.test.ts b/tests/gpts/github/springboot.jenkins.test.ts index f53430c..7f701b4 100644 --- a/tests/gpts/github/springboot.jenkins.test.ts +++ b/tests/gpts/github/springboot.jenkins.test.ts @@ -2,6 +2,15 @@ import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "./test-config/config.ts"; import { gitHubJenkinsBasicGoldenPathTemplateTests } from "./test-config/github_suite_jenkins.ts"; +/** + * Tests SpringBoot template in GitHub with Jenkins + * + * @group jenkins + * @group springboot + * @group github + * @group basic + */ + const springBootTemplateName = 'java-springboot'; const stringOnRoute = 'Hello World!'; diff --git a/tests/gpts/github/springboot.tekton.test.ts b/tests/gpts/github/springboot.tekton.test.ts index f24c4c0..aba8356 100644 --- a/tests/gpts/github/springboot.tekton.test.ts +++ b/tests/gpts/github/springboot.tekton.test.ts @@ -2,6 +2,15 @@ import { gitHubBasicGoldenPathTemplateTests } from "./test-config/github_positiv import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "./test-config/config.ts"; +/** + * Tests SpringBoot template in GitHub with Tekton + * + * @group tekton + * @group springboot + * @group github + * @group basic + */ + const springBootTemplateName = 'java-springboot'; const runSpringBootBasicTests = () => { diff --git a/tests/gpts/gitlab/dotnet.test.ts b/tests/gpts/gitlab/dotnet.test.ts index d000db5..a9b2d00 100644 --- a/tests/gpts/gitlab/dotnet.test.ts +++ b/tests/gpts/gitlab/dotnet.test.ts @@ -2,6 +2,15 @@ import { gitLabProviderBasicTests } from "./suites-config/gitlab_positive_suite. import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "../github/test-config/config.ts"; +/** + * Tests dotnet template in GitLab with Tekton + * + * @group tekton + * @group dotnet + * @group gitlab + * @group basic + */ + const dotNetTemplateName = 'dotnet-basic'; const runDotNetBasicTests = () => { diff --git a/tests/gpts/gitlab/go.test.ts b/tests/gpts/gitlab/go.test.ts index 1141147..68b6f47 100644 --- a/tests/gpts/gitlab/go.test.ts +++ b/tests/gpts/gitlab/go.test.ts @@ -1,6 +1,16 @@ import { gitLabProviderBasicTests } from "./suites-config/gitlab_positive_suite.ts"; import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "../github/test-config/config.ts"; + +/** + * Tests Go template in GitLab with Tekton + * + * @group tekton + * @group go + * @group gitlab + * @group basic + */ + const golangTemplateName = 'go'; const runGolangBasicTests = () => { diff --git a/tests/gpts/gitlab/nodejs.test.ts b/tests/gpts/gitlab/nodejs.test.ts index 75c6e9c..ae38510 100644 --- a/tests/gpts/gitlab/nodejs.test.ts +++ b/tests/gpts/gitlab/nodejs.test.ts @@ -2,6 +2,15 @@ import { gitLabProviderBasicTests } from "./suites-config/gitlab_positive_suite. import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "../github/test-config/config.ts"; +/** + * Tests Nodejs template in GitLab with Tekton + * + * @group tekton + * @group nodejs + * @group gitlab + * @group basic + */ + const nodejsTemplateName = 'nodejs'; const runNodeJSBasicTests = () => { diff --git a/tests/gpts/gitlab/python.test.ts b/tests/gpts/gitlab/python.test.ts index cb4df53..752c39d 100644 --- a/tests/gpts/gitlab/python.test.ts +++ b/tests/gpts/gitlab/python.test.ts @@ -2,6 +2,15 @@ import { gitLabProviderBasicTests } from "./suites-config/gitlab_positive_suite. import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "../github/test-config/config.ts" +/** + * Tests Python template in GitLab with Tekton + * + * @group tekton + * @group python + * @group gitlab + * @group basic + */ + const pythonTemplateName = 'python'; const runPythonBasicTests = () => { diff --git a/tests/gpts/gitlab/quarkus.test.ts b/tests/gpts/gitlab/quarkus.test.ts index f9cede8..306feeb 100644 --- a/tests/gpts/gitlab/quarkus.test.ts +++ b/tests/gpts/gitlab/quarkus.test.ts @@ -2,6 +2,15 @@ import { gitLabSoftwareTemplatesAdvancedScenarios } from "./suites-config/gitlab import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "../github/test-config/config.ts" +/** + * Tests Quarkus template in GitLab with Tekton + * + * @group tekton + * @group quarkus + * @group gitlab + * @group advanced + */ + const quarkusTemplateName = 'java-quarkus'; const runQuarkusBasicTests = () => { diff --git a/tests/gpts/gitlab/springboot.test.ts b/tests/gpts/gitlab/springboot.test.ts index 8cf92d4..ba81576 100644 --- a/tests/gpts/gitlab/springboot.test.ts +++ b/tests/gpts/gitlab/springboot.test.ts @@ -2,6 +2,15 @@ import { gitLabProviderBasicTests } from "./suites-config/gitlab_positive_suite. import { skipSuite } from "../../test-utils.ts"; import { loadSoftwareTemplatesTestsGlobals } from "../github/test-config/config.ts"; +/** + * Tests SpringBoot template in GitLab with Tekton + * + * @group tekton + * @group springboot + * @group gitlab + * @group basic + */ + const springBootTemplateName = 'java-springboot'; const runSpringBootBasicTests = () => { diff --git a/yarn.lock b/yarn.lock index 51041e5..2e441eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5148,6 +5148,11 @@ jest-resolve@^29.7.0: resolve.exports "^2.0.0" slash "^3.0.0" +jest-runner-groups@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/jest-runner-groups/-/jest-runner-groups-2.2.0.tgz#e8ac453322c1f001086f4ea0299b8c4c5bd89166" + integrity sha512-Sp/B9ZX0CDAKa9dIkgH0sGyl2eDuScV4SVvOxqhBMxqWpsNAkmol/C58aTFmPWZj+C0ZTW1r1BSu66MTCN+voA== + jest-runner@^29.7.0: version "29.7.0" resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.7.0.tgz#809af072d408a53dcfd2e849a4c976d3132f718e"