diff --git a/playwright_test/Pages/connection.page.ts b/playwright_test/Pages/connection.page.ts index c4401139..e6f2c0a9 100644 --- a/playwright_test/Pages/connection.page.ts +++ b/playwright_test/Pages/connection.page.ts @@ -87,10 +87,6 @@ class ConnectionPage{ return await this.greenCheckIconSelector.isHidden(); } - async click_resumeProgress(){ - await this.page.waitForTimeout(1000); - await this.resumeProgress.click() - } } export default ConnectionPage; \ No newline at end of file diff --git a/playwright_test/Pages/installationType.page.ts b/playwright_test/Pages/installationType.page.ts index ff69e8c2..7dd89b06 100644 --- a/playwright_test/Pages/installationType.page.ts +++ b/playwright_test/Pages/installationType.page.ts @@ -136,14 +136,14 @@ class InstallationTypePage{ this.selectDownloadZowePax() this.clickLicenseAgreement() this.clickAgreeLicense() - } + } async uploadZowePaxAndNavigateToInstallationPage(uploadPaxPath: any){ this.selectUploadZowePax() await this.page.waitForTimeout(2000) await this.uploadPaxButton.setInputFiles(uploadPaxPath) await this.page.waitForTimeout(2000) - } + } async smpeZowePaxAndNavigateToInstallationPage(runtimeDir: any){ this.selectSmpe() @@ -167,4 +167,4 @@ class InstallationTypePage{ this.click_InitializationStage.click({ timeout: 15000 }) } } - export default InstallationTypePage; + export default InstallationTypePage; \ No newline at end of file diff --git a/playwright_test/Pages/stcs.page.ts b/playwright_test/Pages/stcs.page.ts index 7fa31852..f886d701 100644 --- a/playwright_test/Pages/stcs.page.ts +++ b/playwright_test/Pages/stcs.page.ts @@ -3,23 +3,37 @@ let electronApp: ElectronApplication class StcsPage{ page: Page; - zis: Locator; - zowe: Locator; - aux: Locator; - dataset_proclib: Locator; - readYaml: Locator; - previous_step_button: Locator; - continue_ReviewSelector: Locator; - editor_title_element: Locator; - skip_button:Locator; - view_yaml:Locator; - view_submit_job:Locator; - view_job_output:Locator; - save_and_close:Locator; - previous_step:Locator; - close_button:Locator; - STCS_TITLE: Locator; - continueToComponentInstallation: Locator; + click_stcs = Locator; + Security_title = Locator; + zis = Locator; + zowe = Locator; + aux = Locator; + dataset_proclib = Locator; + readYaml = Locator; + initSTC = Locator; + previous_step_button = Locator; + skip_button = Locator; + editor_title_element = Locator; + STCS_TITLE = Locator; + continueToComponentInstallation = Locator; + view_yaml = Locator; + viewAndSubmitJob = Locator; + view_job_output = Locator; + save_and_close = Locator; + previous_step = Locator; + skip_button = Locator; + close_button = Locator; + certificateTab_title = Locator; + continue_ReviewSelector = Locator; + errorMsg = Locator; + continue_CertificateSelector = Locator; + get_zoweValue = Locator; + get_zisValue = Locator; + get_auxValue = Locator; + get_datasetProclib = Locator; + writeConfig_greenCheckXpath = Locator; + uploadYaml_greenCheckXpath = Locator; + init_stcs_greenCheckXpath = Locator; diff --git a/playwright_test/Tests/Stcs.spec.ts b/playwright_test/Tests/Stcs.spec.ts index eff0b5a5..cc46ff76 100644 --- a/playwright_test/Tests/Stcs.spec.ts +++ b/playwright_test/Tests/Stcs.spec.ts @@ -35,7 +35,6 @@ const JCL_LIB = process.env.JCL_LIB; const LOAD_LIB = process.env.LOAD_LIB; const AUTH_LOAD_LIB = process.env.AUTH_LOAD_LIB; const AUTH_PLUGIN_LIB = process.env.AUTH_PLUGIN_LIB; -const UPLOAD_PAX_PATH = process.env.ZOWE_ROOT_DIR const SECURITY_ADMIN = process.env.SECURITY_ADMIN; const SECURITY_STC = process.env.SECURITY_STC; const SECURITY_SYSPROG = process.env.SECURITY_SYSPROG; @@ -88,7 +87,6 @@ test.describe('StcsTab', () => { await page.waitForTimeout(30000); installationTypePage.clickSkipUnpaxButton() await page.waitForTimeout(2000); -// installationTypePage.clickContinueToInstallation() installationPage.fillInstallationPage(DATASET_PREFIX, PROC_LIB, PARM_LIB, ZIS, JCL_LIB,LOAD_LIB,AUTH_LOAD_LIB,AUTH_PLUGIN_LIB) await page.waitForTimeout(10000) installationPage.clickInstallMvsDatasets() @@ -190,7 +188,7 @@ test.describe('StcsTab', () => { test('Test Resume Progress', async ({ page }) => { await page.waitForTimeout(8000); stcsPage.click_saveAndClose() - connectionPage.click_resumeProgress() + titlePage.clickOnResumeProgress() connectionPage.fillpassword(SSH_PASSWD) await page.waitForTimeout(5000); connectionPage.SubmitValidateCredential()