Skip to content

Commit 97c85a4

Browse files
authored
DTSSTCI1086 - removing E2E's and all references (#1886)
* DTSSTCI1086 - removing E2E's and all references
1 parent dc7071b commit 97c85a4

Some content is hidden

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

48 files changed

+0
-2981
lines changed

Jenkinsfile_CNP

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -259,23 +259,6 @@ withPipeline(type, product, component) {
259259
}
260260

261261
def githubApi = new GithubAPI(this) as Object
262-
if (githubApi.getLabelsbyPattern(env.BRANCH_NAME, "enable-e2e-tests")) {
263-
afterSuccess('functionalTest:preview') {
264-
try {
265-
builder.gradle('e2eTests')
266-
} finally {
267-
publishHTML target: [
268-
allowMissing : true,
269-
alwaysLinkToLastBuild: true,
270-
keepAll : true,
271-
reportDir : "build/reports/tests/e2eTests",
272-
reportFiles : "index.html",
273-
reportName : "E2E Tests Report"
274-
]
275-
}
276-
}
277-
}
278-
279262
afterSuccess('akschartsinstall') {
280263
onPR {
281264
for (label in githubApi.getLabelsbyPattern(env.BRANCH_NAME, "pr-values:wa") ) {

Jenkinsfile_nightly

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,5 @@ withNightlyPipeline(type, product, component) {
4545

4646
afterAlways('fortify-scan') {
4747
steps.archiveArtifacts allowEmptyArchive: true, artifacts: '**/Fortify Scan/**/*'
48-
49-
stage("Case-API E2E tests") {
50-
try {
51-
builder.gradle('e2eTests')
52-
} finally {
53-
publishHTML target: [
54-
allowMissing : true,
55-
alwaysLinkToLastBuild: true,
56-
keepAll : true,
57-
reportDir : "build/reports",
58-
reportFiles : "index.html",
59-
reportName : "E2E Tests Report"
60-
]
61-
}
62-
}
6348
}
6449
}

build.gradle

Lines changed: 0 additions & 182 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,6 @@ sourceSets {
6464
}
6565
resources.srcDir file('src/contractTest/resources')
6666
}
67-
e2eTests {
68-
java {
69-
compileClasspath += main.output
70-
runtimeClasspath += main.output
71-
srcDir file('src/e2eTests/java')
72-
}
73-
}
7467
}
7568

7669
ext{
@@ -99,8 +92,6 @@ configurations {
9992
integrationTestRuntime.extendsFrom testRuntime
10093
cftlibTestImplementation.extendsFrom testImplementation
10194
cftlibTestRuntime.extendsFrom testRuntime
102-
e2eTestsImplementation.extendsFrom testImplementation
103-
e2eTestsRuntime.extendsFrom testRuntime
10495
}
10596

10697

@@ -143,145 +134,6 @@ task integration(type: Test) {
143134
failFast = true
144135
}
145136

146-
task e2eTestInPrev(type: Test) {
147-
description = "Runs e2e tests in Preview Environment"
148-
group = "Verification"
149-
testClassesDirs = sourceSets.e2eTests.output.classesDirs
150-
classpath = sourceSets.e2eTests.runtimeClasspath
151-
failFast = false
152-
systemProperties([
153-
// Configuration parameters to execute top-level classes in parallel but methods in same thread
154-
'junit.jupiter.execution.parallel.enabled': 'true',
155-
'junit.jupiter.execution.parallel.mode.default': 'same_thread',
156-
'junit.jupiter.execution.parallel.config.fixed.parallelism': '3'
157-
])
158-
environment 'PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD', '0'
159-
environment 'CASE_API_BASE_URL', System.env.TEST_E2E_URL
160-
environment 'DSS_BASE_URL', 'https://sptribs-frontend-pr-345.preview.platform.hmcts.net'
161-
environment 'BROWSER', 'chromium'
162-
environment 'CI', 'true'
163-
environment 'LEGAL_OFFICER', 'st-test1@mailinator.com '
164-
environment 'SENIOR_LEGAL_OFFICER', 'st-senior-caseworker@mailinator.com'
165-
environment 'JUDGE', 'st-judge2@mailinator.com'
166-
environment 'SENIOR_JUDGE', 'st-senior-judge@mailinator.com'
167-
environment 'HEARING_CENTRAL_ADMIN', 'st-hc-team-leader@mailinator.com'
168-
environment 'HEARING_CENTRAL_TEAM_LEAD', 'st-hearingcentretl@mailinator.com'
169-
environment 'RESPONDENT', 'st-respondent5@mailinator.com'
170-
environment 'SUPER_USER', 'st-super@mailinator.com'
171-
environment 'DSS_CITIZEN_USER', 'st-citizen1@mailinator.com'
172-
}
173-
174-
task e2eTestInDemo(type: Test) {
175-
description = "Runs e2e tests in Demo Environment"
176-
group = "Verification"
177-
testClassesDirs = sourceSets.e2eTests.output.classesDirs
178-
classpath = sourceSets.e2eTests.runtimeClasspath
179-
failFast = false
180-
systemProperties([
181-
// Configuration parameters to execute top-level classes in parallel but methods in same thread
182-
'junit.jupiter.execution.parallel.enabled': 'true',
183-
'junit.jupiter.execution.parallel.mode.default': 'same_thread',
184-
'junit.jupiter.execution.parallel.config.fixed.parallelism': '3'
185-
])
186-
environment 'PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD', '0'
187-
environment 'CASE_API_BASE_URL', 'https://manage-case.demo.platform.hmcts.net'
188-
environment 'DSS_BASE_URL', 'https://sptribs-frontend.demo.platform.hmcts.net'
189-
environment 'BROWSER', 'chromium'
190-
environment 'CI', 'true'
191-
environment 'LEGAL_OFFICER', 'st-ciclegal-officer@mailinator.com'
192-
environment 'SENIOR_LEGAL_OFFICER', 'st-cicsenior-legal-officer@mailinator.com'
193-
environment 'JUDGE', 'st-cicjudge@mailinator.com'
194-
environment 'SENIOR_JUDGE', 'st-cicseniorjudge@mailinator.com'
195-
environment 'HEARING_CENTRAL_ADMIN', 'cic-hearing-centreadmin@mailinator.com'
196-
environment 'HEARING_CENTRAL_TEAM_LEAD', 'cic-hearing-centre-leader@mailinator.com'
197-
environment 'RESPONDENT', 'st-cicrespondent@mailinator.com'
198-
environment 'DSS_CITIZEN_USER', 'st-citizen1@mailinator.com'
199-
}
200-
201-
task e2eTests(type: Test) {
202-
description = "Runs e2e tests in AAT environment"
203-
group = "Verification"
204-
testClassesDirs = sourceSets.e2eTests.output.classesDirs
205-
classpath = sourceSets.e2eTests.runtimeClasspath
206-
failFast = false
207-
systemProperties([
208-
// Configuration parameters to execute top-level classes in parallel but methods in same thread
209-
'junit.jupiter.execution.parallel.enabled': 'true',
210-
'junit.jupiter.execution.parallel.mode.default': 'same_thread',
211-
'junit.jupiter.execution.parallel.config.fixed.parallelism': '3'
212-
])
213-
environment 'PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD', '1'
214-
environment 'CASE_API_BASE_URL', 'https://manage-case.aat.platform.hmcts.net'
215-
environment 'DSS_BASE_URL', 'https://sptribs-frontend.aat.platform.hmcts.net'
216-
environment 'BROWSER', 'chromium'
217-
environment 'CI', 'true'
218-
environment 'LEGAL_OFFICER', 'st-test1@mailinator.com '
219-
environment 'SENIOR_LEGAL_OFFICER', 'st-senior-caseworker@mailinator.com'
220-
environment 'JUDGE', 'st-judge2@mailinator.com'
221-
environment 'SENIOR_JUDGE', 'st-senior-judge@mailinator.com'
222-
environment 'HEARING_CENTRAL_ADMIN', 'st-hc-team-leader@mailinator.com'
223-
environment 'HEARING_CENTRAL_TEAM_LEAD', 'st-hearingcentretl@mailinator.com'
224-
environment 'RESPONDENT', 'st-respondent5@mailinator.com'
225-
environment 'SUPER_USER', 'st-super@mailinator.com'
226-
environment 'DSS_CITIZEN_USER', 'st-citizen1@mailinator.com'
227-
}
228-
229-
task e2eTestsNightlyFirefox(type: Test) {
230-
description = "Runs e2e tests nightly using firefox"
231-
group = "Verification"
232-
testClassesDirs = sourceSets.e2eTests.output.classesDirs
233-
classpath = sourceSets.e2eTests.runtimeClasspath
234-
failFast = false
235-
systemProperties([
236-
// Configuration parameters to execute top-level classes in parallel but methods in same thread
237-
'junit.jupiter.execution.parallel.enabled': 'true',
238-
'junit.jupiter.execution.parallel.mode.default': 'same_thread',
239-
'junit.jupiter.execution.parallel.config.fixed.parallelism': '3'
240-
])
241-
environment 'PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD', '1'
242-
environment 'CASE_API_BASE_URL', 'https://manage-case.aat.platform.hmcts.net'
243-
environment 'DSS_BASE_URL', 'https://sptribs-frontend.aat.platform.hmcts.net'
244-
environment 'BROWSER', 'firefox'
245-
environment 'CI', 'true'
246-
environment 'LEGAL_OFFICER', 'st-test1@mailinator.com '
247-
environment 'SENIOR_LEGAL_OFFICER', 'st-senior-caseworker@mailinator.com'
248-
environment 'JUDGE', 'st-judge2@mailinator.com'
249-
environment 'SENIOR_JUDGE', 'st-senior-judge@mailinator.com'
250-
environment 'HEARING_CENTRAL_ADMIN', 'st-hc-team-leader@mailinator.com'
251-
environment 'HEARING_CENTRAL_TEAM_LEAD', 'st-hearingcentretl@mailinator.com'
252-
environment 'RESPONDENT', 'st-respondent5@mailinator.com'
253-
environment 'SUPER_USER', 'st-super@mailinator.com'
254-
environment 'DSS_CITIZEN_USER', 'st-citizen1@mailinator.com'
255-
}
256-
257-
task e2eTestsNightlyMsEdge(type: Test) {
258-
description = "Runs e2e tests nightly using MS Edge"
259-
group = "Verification"
260-
testClassesDirs = sourceSets.e2eTests.output.classesDirs
261-
classpath = sourceSets.e2eTests.runtimeClasspath
262-
failFast = false
263-
systemProperties([
264-
// Configuration parameters to execute top-level classes in parallel but methods in same thread
265-
'junit.jupiter.execution.parallel.enabled': 'true',
266-
'junit.jupiter.execution.parallel.mode.default': 'same_thread',
267-
'junit.jupiter.execution.parallel.config.fixed.parallelism': '3'
268-
])
269-
environment 'PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD', 1
270-
environment 'CASE_API_BASE_URL', 'https://manage-case.aat.platform.hmcts.net'
271-
environment 'DSS_BASE_URL', 'https://sptribs-frontend.aat.platform.hmcts.net'
272-
environment 'BROWSER', 'msedge'
273-
environment 'CI', 'true'
274-
environment 'LEGAL_OFFICER', 'st-test1@mailinator.com '
275-
environment 'SENIOR_LEGAL_OFFICER', 'st-senior-caseworker@mailinator.com'
276-
environment 'JUDGE', 'st-judge2@mailinator.com'
277-
environment 'SENIOR_JUDGE', 'st-senior-judge@mailinator.com'
278-
environment 'HEARING_CENTRAL_ADMIN', 'st-hc-team-leader@mailinator.com'
279-
environment 'HEARING_CENTRAL_TEAM_LEAD', 'st-hearingcentretl@mailinator.com'
280-
environment 'RESPONDENT', 'st-respondent5@mailinator.com'
281-
environment 'SUPER_USER', 'st-super@mailinator.com'
282-
environment 'DSS_CITIZEN_USER', 'st-citizen1@mailinator.com'
283-
}
284-
285137
// Invoked from CftLibConfig when booting with CCD.
286138
task buildCCDXlsx(type: Exec) {
287139
group 'ccd tasks'
@@ -540,11 +392,6 @@ dependencies {
540392
functionalTestImplementation sourceSets.main.runtimeClasspath
541393
functionalTestImplementation sourceSets.test.runtimeClasspath
542394

543-
e2eTestsImplementation sourceSets.main.runtimeClasspath
544-
e2eTestsImplementation sourceSets.test.runtimeClasspath
545-
546-
e2eTestsImplementation 'io.github.artsok:rerunner-jupiter:2.1.6'
547-
548395
functionalTestImplementation group: 'com.github.hmcts', name: 'document-management-client', version: '7.0.1'
549396
functionalTestImplementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '5.1.2'
550397

@@ -707,35 +554,6 @@ task installChromium(type: JavaExec) {
707554

708555
tasks.cftlibTest.dependsOn(installChromium)
709556

710-
task installBrowser(type: JavaExec) {
711-
classpath = sourceSets.e2eTests.runtimeClasspath
712-
mainClass.set('com.microsoft.playwright.CLI')
713-
args = ['install', 'chromium']
714-
}
715-
716-
task installFirefox(type: JavaExec) {
717-
classpath = sourceSets.e2eTests.runtimeClasspath
718-
mainClass.set('com.microsoft.playwright.CLI')
719-
args = ['install', 'firefox']
720-
}
721-
722-
task installMsEdge(type: JavaExec) {
723-
classpath = sourceSets.e2eTests.runtimeClasspath
724-
mainClass.set('com.microsoft.playwright.CLI')
725-
args = ['install', '--force', 'msedge']
726-
}
727-
728-
tasks.e2eTests.dependsOn(installBrowser)
729-
tasks.e2eTestsNightlyFirefox.dependsOn(installFirefox)
730-
tasks.e2eTestsNightlyMsEdge.dependsOn(installMsEdge)
731-
732-
def E2E_MAX_PARALLEL_FORKS = 3
733-
def MAX_PARALLEL_FORKS = Math.min(Runtime.runtime.availableProcessors().intdiv(2), 4) ?: 1
734-
735-
tasks.withType(Test).configureEach {
736-
maxParallelForks = name.contains("e2eTests") ? E2E_MAX_PARALLEL_FORKS : MAX_PARALLEL_FORKS
737-
}
738-
739557
// exclude the logback binding is coming in via cftlib
740558
configurations.testImplementation {
741559
exclude group: 'ch.qos.logback', module: 'logback-classic'

src/e2eTests/java/uk/gov/hmcts/sptribs/e2e/AddNoteTests.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/e2eTests/java/uk/gov/hmcts/sptribs/e2e/Base.java

Lines changed: 0 additions & 81 deletions
This file was deleted.

0 commit comments

Comments
 (0)