From 91765834449663acf01ae812237684d660cd1add Mon Sep 17 00:00:00 2001 From: Atharva Rane Date: Tue, 21 May 2024 12:25:34 -0400 Subject: [PATCH 1/3] update pre-release numbering --- suites/pre-release/dcf/2.googleCredentialsTest.js | 2 +- suites/pre-release/dcf/3.preSignedURLTest.js | 2 +- suites/pre-release/dcf/4.oidcFlowTest.js | 2 +- suites/pre-release/dcf/5.indexdTest.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/suites/pre-release/dcf/2.googleCredentialsTest.js b/suites/pre-release/dcf/2.googleCredentialsTest.js index effc41d9b..92204c855 100644 --- a/suites/pre-release/dcf/2.googleCredentialsTest.js +++ b/suites/pre-release/dcf/2.googleCredentialsTest.js @@ -1,6 +1,6 @@ // Feature # 3 in the sequence of testing // This test plan has a few pre-requisites: Check prereq.md for more details. -Feature('3. Google Credentials - DCF Staging testing for release sign off - PXP-3836'); +Feature('2. Google Credentials - DCF Staging testing for release sign off - PXP-3836'); // To be executed with GEN3_SKIP_PROJ_SETUP=true // No need to set up program / retrieve access token, etc. diff --git a/suites/pre-release/dcf/3.preSignedURLTest.js b/suites/pre-release/dcf/3.preSignedURLTest.js index 199a0d0e7..32b19aac6 100644 --- a/suites/pre-release/dcf/3.preSignedURLTest.js +++ b/suites/pre-release/dcf/3.preSignedURLTest.js @@ -1,7 +1,7 @@ /* eslint-disable max-len */ // Feature # 4 in the sequence of testing // This test plan has a few pre-requisites: Check prereq.md for more details. -Feature('4. PreSigned URLs - DCF Staging testing for release sign off - PXP-3836'); +Feature('3. PreSigned URLs - DCF Staging testing for release sign off - PXP-3836'); // To be executed with GEN3_SKIP_PROJ_SETUP=true // No need to set up program / retrieve access token, etc. diff --git a/suites/pre-release/dcf/4.oidcFlowTest.js b/suites/pre-release/dcf/4.oidcFlowTest.js index eedb9cf6f..8d5edeaac 100644 --- a/suites/pre-release/dcf/4.oidcFlowTest.js +++ b/suites/pre-release/dcf/4.oidcFlowTest.js @@ -1,7 +1,7 @@ /*eslint-disable */ // Feature # 5 in the sequence of testing // This test plan has a few pre-requisites: Check prereq.md for more details. -Feature('5. OIDC Flow - DCF Staging testing for release sign off - PXP-3836'); +Feature('4. OIDC Flow - DCF Staging testing for release sign off - PXP-3836'); // To be executed with GEN3_SKIP_PROJ_SETUP=true // No need to set up program / retrieve access token, etc. diff --git a/suites/pre-release/dcf/5.indexdTest.js b/suites/pre-release/dcf/5.indexdTest.js index 18ece053a..39a3eddaf 100644 --- a/suites/pre-release/dcf/5.indexdTest.js +++ b/suites/pre-release/dcf/5.indexdTest.js @@ -1,6 +1,6 @@ // Feature # 6 in the sequence of testing // This test plan has a few pre-requisites: Check prereq.md for more details. -Feature('6. IndexD - DCF Staging testing for release sign off - PXP-3836'); +Feature('5. IndexD - DCF Staging testing for release sign off - PXP-3836'); // To be executed with GEN3_SKIP_PROJ_SETUP=true // No need to set up program / retrieve access token, etc. From 9c917bf537ac0c7b8b73474fe6d01ffeff62b058 Mon Sep 17 00:00:00 2001 From: Atharva Rane Date: Tue, 21 May 2024 12:27:09 -0400 Subject: [PATCH 2/3] Revert "update pre-release numbering" This reverts commit 91765834449663acf01ae812237684d660cd1add. --- suites/pre-release/dcf/2.googleCredentialsTest.js | 2 +- suites/pre-release/dcf/3.preSignedURLTest.js | 2 +- suites/pre-release/dcf/4.oidcFlowTest.js | 2 +- suites/pre-release/dcf/5.indexdTest.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/suites/pre-release/dcf/2.googleCredentialsTest.js b/suites/pre-release/dcf/2.googleCredentialsTest.js index 92204c855..effc41d9b 100644 --- a/suites/pre-release/dcf/2.googleCredentialsTest.js +++ b/suites/pre-release/dcf/2.googleCredentialsTest.js @@ -1,6 +1,6 @@ // Feature # 3 in the sequence of testing // This test plan has a few pre-requisites: Check prereq.md for more details. -Feature('2. Google Credentials - DCF Staging testing for release sign off - PXP-3836'); +Feature('3. Google Credentials - DCF Staging testing for release sign off - PXP-3836'); // To be executed with GEN3_SKIP_PROJ_SETUP=true // No need to set up program / retrieve access token, etc. diff --git a/suites/pre-release/dcf/3.preSignedURLTest.js b/suites/pre-release/dcf/3.preSignedURLTest.js index 32b19aac6..199a0d0e7 100644 --- a/suites/pre-release/dcf/3.preSignedURLTest.js +++ b/suites/pre-release/dcf/3.preSignedURLTest.js @@ -1,7 +1,7 @@ /* eslint-disable max-len */ // Feature # 4 in the sequence of testing // This test plan has a few pre-requisites: Check prereq.md for more details. -Feature('3. PreSigned URLs - DCF Staging testing for release sign off - PXP-3836'); +Feature('4. PreSigned URLs - DCF Staging testing for release sign off - PXP-3836'); // To be executed with GEN3_SKIP_PROJ_SETUP=true // No need to set up program / retrieve access token, etc. diff --git a/suites/pre-release/dcf/4.oidcFlowTest.js b/suites/pre-release/dcf/4.oidcFlowTest.js index 8d5edeaac..eedb9cf6f 100644 --- a/suites/pre-release/dcf/4.oidcFlowTest.js +++ b/suites/pre-release/dcf/4.oidcFlowTest.js @@ -1,7 +1,7 @@ /*eslint-disable */ // Feature # 5 in the sequence of testing // This test plan has a few pre-requisites: Check prereq.md for more details. -Feature('4. OIDC Flow - DCF Staging testing for release sign off - PXP-3836'); +Feature('5. OIDC Flow - DCF Staging testing for release sign off - PXP-3836'); // To be executed with GEN3_SKIP_PROJ_SETUP=true // No need to set up program / retrieve access token, etc. diff --git a/suites/pre-release/dcf/5.indexdTest.js b/suites/pre-release/dcf/5.indexdTest.js index 39a3eddaf..18ece053a 100644 --- a/suites/pre-release/dcf/5.indexdTest.js +++ b/suites/pre-release/dcf/5.indexdTest.js @@ -1,6 +1,6 @@ // Feature # 6 in the sequence of testing // This test plan has a few pre-requisites: Check prereq.md for more details. -Feature('5. IndexD - DCF Staging testing for release sign off - PXP-3836'); +Feature('6. IndexD - DCF Staging testing for release sign off - PXP-3836'); // To be executed with GEN3_SKIP_PROJ_SETUP=true // No need to set up program / retrieve access token, etc. From c6fd45aa5e4fd35feb4892f81d8dbf44fee8673c Mon Sep 17 00:00:00 2001 From: Atharva Rane Date: Mon, 5 Aug 2024 12:21:10 -0400 Subject: [PATCH 3/3] Dummy PR to test jenkins gitops change --- Jenkinsfile | 2 +- services/portal/login/loginTasks.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e2a334a7e..2cd8c7fa4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ #!groovy -@Library('cdis-jenkins-lib@master') _ +@Library('cdis-jenkins-lib@test/jenkins_guppy_change') _ testPipeline { // tell the pipeline to not checkout `gen3-qa:master` diff --git a/services/portal/login/loginTasks.js b/services/portal/login/loginTasks.js index 7756f85fa..e403f5088 100644 --- a/services/portal/login/loginTasks.js +++ b/services/portal/login/loginTasks.js @@ -41,6 +41,7 @@ module.exports = { */ logout() { portal.clickProp(loginProps.logoutButton); + console.log('logged out'); }, logoutThroughDropdown() {