diff --git a/integration-tests/support/pages/ComponentsPage.ts b/integration-tests/support/pages/ComponentsPage.ts index c0719d6dd..b4d66e806 100644 --- a/integration-tests/support/pages/ComponentsPage.ts +++ b/integration-tests/support/pages/ComponentsPage.ts @@ -35,7 +35,11 @@ export class ComponentPage extends AbstractWizardPage { cy.get(ComponentsPagePO.create).should('be.enabled').click(); } - openPipelinePlanModal() { + clickManageBuildPipelinesLink() { + cy.contains('button', 'Manage build pipelines').should('be.visible').click(); + } + + clickMergePullRequest() { cy.contains('button', 'Merge pull request').should('be.visible').click(); } diff --git a/integration-tests/support/pages/tabs/PipelinerunsTabPage.ts b/integration-tests/support/pages/tabs/PipelinerunsTabPage.ts index 91aabfaa6..f39cdf843 100644 --- a/integration-tests/support/pages/tabs/PipelinerunsTabPage.ts +++ b/integration-tests/support/pages/tabs/PipelinerunsTabPage.ts @@ -185,7 +185,7 @@ export class TaskRunsTab { { name: `${pipelineName}-init`, task: 'init', status: 'Succeeded' }, { name: `${pipelineName}-clone-repository`, task: 'clone-repository', status: 'Succeeded' }, { name: `${pipelineName}-build-container`, task: 'build-container', status: 'Succeeded' }, - { name: `${pipelineName}-show-summary`, task: 'show-summary', status: 'Succeeded' }, + { name: `${pipelineName}-show-sbom`, task: 'show-sbom', status: 'Succeeded' }, ]; } diff --git a/integration-tests/tests/advanced-happy-path.spec.ts b/integration-tests/tests/advanced-happy-path.spec.ts index c2dc542c6..830aadf7d 100644 --- a/integration-tests/tests/advanced-happy-path.spec.ts +++ b/integration-tests/tests/advanced-happy-path.spec.ts @@ -31,6 +31,7 @@ describe('Advanced Happy path', () => { const repoLink = `https://github.com/${repoOwner}/${repoName}`; const gitHubUser = Cypress.env('GH_USERNAME'); const componentName = Common.generateAppName('go'); + // testing other then default option, may take longer const pipeline = 'docker-build'; const dockerfilePath = 'docker/Dockerfile'; @@ -100,7 +101,7 @@ describe('Advanced Happy path', () => { describe('Trigger a new Pipelinerun related to push event', () => { it('Merge the auto-generated PR, and verify the event status on modal', () => { Applications.goToComponentsTab(); - componentPage.openPipelinePlanModal(); + componentPage.clickManageBuildPipelinesLink(); componentPage.verifyAndWaitForPRIsSent(); APIHelper.mergePR( diff --git a/integration-tests/tests/basic-happy-path.spec.ts b/integration-tests/tests/basic-happy-path.spec.ts index 949640d43..2b1df8719 100644 --- a/integration-tests/tests/basic-happy-path.spec.ts +++ b/integration-tests/tests/basic-happy-path.spec.ts @@ -31,9 +31,10 @@ describe('Basic Happy Path', () => { const repoOwner = 'redhat-hac-qe'; const publicRepo = `https://github.com/${repoOwner}/${repoName}`; const componentName: string = Common.generateAppName('java-quarkus'); - const piplinerunlogsTasks = ['init', 'clone-repository', 'build-container', 'show-summary']; + const piplinerunlogsTasks = ['init', 'clone-repository', 'build-container', 'show-sbom']; const quarkusDeplomentBody = 'Congratulations, you have created a new Quarkus cloud application'; - const pipeline = 'docker-build'; + // this is default option and should be the fastest one + const pipeline = 'docker-build-oci-ta'; before(function () { APIHelper.createRepositoryFromTemplate(sourceOwner, sourceRepo, repoOwner, repoName); @@ -106,7 +107,7 @@ describe('Basic Happy Path', () => { // Pipeline build plan was removed from the Pipeline runs Tab // See https://issues.redhat.com/browse/KFLUXBUGS-603 ComponentsTabPage.openComponent(componentName); - componentPage.openPipelinePlanModal(); + componentPage.clickMergePullRequest(); componentPage.verifyAndWaitForPRIsSent(); APIHelper.mergePR( @@ -177,7 +178,7 @@ describe('Basic Happy Path', () => { applicationDetailPage.openBuildLog(componentName); applicationDetailPage.verifyBuildLogTaskslist(piplinerunlogsTasks); //TO DO : Fetch the piplinerunlogsTasks from cluster using api At runtime. applicationDetailPage.verifyFailedLogTasksNotExists(); - applicationDetailPage.checkBuildLog('show-summary', 'Image is in : quay.io'); + applicationDetailPage.checkBuildLog('push-dockerfile', 'Selecting auth for quay.io'); applicationDetailPage.closeBuildLog(); }); });