Skip to content

Commit

Permalink
Update dependencies and change functional test data value (#284)
Browse files Browse the repository at this point in the history 
* Update dependencies and clean up package-lock.json

Updated the following packages:
- express: 4.20.0 -> 4.21.0
- finalhandler: 1.2.0 -> 1.3.1
- qs: 6.11.0 -> 6.13.0
- serve-static: 1.16.0 -> 1.16.2
- encodeurl: 1.0.2 -> 2.0.0

Removed redundant dependencies:
- node_modules/body-parser/node_modules/qs
- node_modules/serve-static/node_modules/debug
- node_modules/serve-static/node_modules/ms
- node_modules/serve-static/node_modules/send

Updated dependencies within express, finalhandler, and serve-static.
Updated side-channel for qs: ^1.0.4 -> ^1.0.6.
Updated send for serve-static: 0.18.0 -> 0.19.0.
Moved ms package within the dependency tree.
Updated node engine requirements for compatibility.

* Re-add test case for single file name search

Re-order the 'Verify search results for single File name search' test case in `fss-simplified-search-results.spec.ts` with the same content.

* Update test case in fss-simplified-search-results.spec.ts

Extended wait time in 'Verify search results for single File name search' test case from 2000ms to 10000ms. Added a comment with a URL to a work item in Azure DevOps. Other test steps remain unchanged.

* Update attributeFileName constant value in ConstantHelper.ts

Changed the value of the `attributeFileName` constant from 'V01X01'
to 'test' in the `ConstantHelper.ts` file. This update may be for
testing purposes or to meet new application requirements.

* Reduce file download wait time in test from 10s to 2s

The timeout duration for waiting after clicking the file download selector has been reduced from 10,000 milliseconds (10 seconds) to 2,000 milliseconds (2 seconds). This change aims to make the test run faster while still ensuring that the necessary elements have time to load.

* Disable S57 exchange set download test case

Commented out the test case `check user is able to download S57 exchange set for base exchange set` in `ess-ui-esdownloadpage.spec.ts`. This includes all steps within the test case, such as clicking selectors, adding an ENC, validating responses, and checking UI elements. The test is disabled because the S57 exchange set is currently not available (Rhz).

* Disable test cases for exchange set format selection

Disabled test cases in `ess-ui-encselectionpage-nonAdmin.spec.ts`
and `ess-ui-encselectionpage.spec.ts` due to the unavailability
of the S57 format. Specifically, the test case for non-UKHO users
not seeing options on the 'Confirm exchange set content' screen
and the test case for UKHO users seeing options on the same screen
have been commented out.
  • Loading branch information
@richardAhz
richardAhz authored Sep 17, 2024
1 parent c1c20fc commit 4db64e2
Show file tree
Hide file tree
Showing 6 changed files with 115 additions and 194 deletions.
2 changes: 1 addition & 1 deletion Helper/ConstantHelper.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type BatchAttribute = {
export const attributeBusinessUnit: BatchAttribute = { key: 'BusinessUnit', value: 'ADDS' };
export const attributeProductType: BatchAttribute = { key: 'Product Type', value: 'AVCS' };
export const attributeWeekYear: string = 'Year / Week';
export const attributeFileName: BatchAttribute = { key: 'File Name', value: 'V01X01' };
export const attributeFileName: BatchAttribute = { key: 'File Name', value: 'test' };
export const attributeFileSize: BatchAttribute = {key: 'FileSize', value: '1000'};
export const attributeMimeType: BatchAttribute = {key: 'MimeType', value: 'text/plain'};
export const attributeMediaType: BatchAttribute = {key: 'Media Type', value: 'DVD'};
Expand Down
21 changes: 11 additions & 10 deletions Tests/FunctionalTests/ess-ui-encselectionpage-nonAdmin.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,17 @@ test.describe('ESS UI ENCs Selection Page Functional Test Scenarios for Non Admi
})

//https://dev.azure.com/ukhydro/File%20Share%20Service/_workitems/edit/156061
test("check user is not able to see options to choose preferred exchange set format on 'Confirm exchange set content​' screen for Base exchange set @NonUKHOUser",async ({ page}) =>{
await exchangeSetSelectionPageObjects.selectBaseDownloadRadioButton();
await exchangeSetSelectionPageObjects.clickOnProceedButton();
await esslandingPageObjects.uploadradiobtnSelectorClick();
await esslandingPageObjects.uploadFile(page, './Tests/TestData/ENCs_Sorting.csv');
await esslandingPageObjects.proceedButtonSelectorClick();
await encSelectionPageObjects.selectAllSelectorClick();
encSelectionPageObjects.expect.toBeTruthy(await encSelectionPageObjects.s63Radiobutton.isHidden());
encSelectionPageObjects.expect.toBeTruthy(await encSelectionPageObjects.s57Radiobutton.isHidden());
});
// Disabled - this test relates to S57 which is not available at the moment Rhz
//test("check user is not able to see options to choose preferred exchange set format on 'Confirm exchange set content​' screen for Base exchange set @NonUKHOUser",async ({ page}) =>{
// await exchangeSetSelectionPageObjects.selectBaseDownloadRadioButton();
// await exchangeSetSelectionPageObjects.clickOnProceedButton();
// await esslandingPageObjects.uploadradiobtnSelectorClick();
// await esslandingPageObjects.uploadFile(page, './Tests/TestData/ENCs_Sorting.csv');
// await esslandingPageObjects.proceedButtonSelectorClick();
// await encSelectionPageObjects.selectAllSelectorClick();
// encSelectionPageObjects.expect.toBeTruthy(await encSelectionPageObjects.s63Radiobutton.isHidden());
// encSelectionPageObjects.expect.toBeTruthy(await encSelectionPageObjects.s57Radiobutton.isHidden());
//});

//https://dev.azure.com/ukhydro/File%20Share%20Service/_workitems/edit/156212

Expand Down
19 changes: 10 additions & 9 deletions Tests/FunctionalTests/ess-ui-encselectionpage.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,17 +256,18 @@ test.describe('ESS UI ENCs Selection Page Functional Test Scenarios', () => {
//https://dev.azure.com/ukhydro/File%20Share%20Service/_workitems/edit/151271
//https://dev.azure.com/ukhydro/File%20Share%20Service/_workitems/edit/151339
//https://dev.azure.com/ukhydro/File%20Share%20Service/_workitems/edit/151474


//https://dev.azure.com/ukhydro/File%20Share%20Service/_workitems/edit/156059
test("check UKHO user is able to see options to choose preferred exchange set format on 'Confirm exchange set content​' screen for base exchange set.",async ({ page}) =>{
await encSelectionPageObjects.selectAllSelectorClick();
encSelectionPageObjects.expect.toBeTruthy(await encSelectionPageObjects.s63Radiobutton.isVisible());
encSelectionPageObjects.expect.toBeTruthy(await encSelectionPageObjects.s57Radiobutton.isVisible());
encSelectionPageObjects.expect.toBeTruthy(await encSelectionPageObjects.s63Radiobutton.isChecked());
encSelectionPageObjects.expect.toBeTruthy((await encSelectionPageObjects.s63Radiobutton.innerText()).trim() == "S63 exchange set");
encSelectionPageObjects.expect.toBeTruthy((await encSelectionPageObjects.s57Radiobutton.innerText()).trim() == "S57 exchange set");
});
// Disabled - this test relates to S57 which is not available at the moment Rhz
//test("check UKHO user is able to see options to choose preferred exchange set format on 'Confirm exchange set content​' screen for base exchange set.",async ({ page}) =>{
// await encSelectionPageObjects.selectAllSelectorClick();
// encSelectionPageObjects.expect.toBeTruthy(await encSelectionPageObjects.s63Radiobutton.isVisible());
// encSelectionPageObjects.expect.toBeTruthy(await encSelectionPageObjects.s57Radiobutton.isVisible());
// encSelectionPageObjects.expect.toBeTruthy(await encSelectionPageObjects.s63Radiobutton.isChecked());
// encSelectionPageObjects.expect.toBeTruthy((await encSelectionPageObjects.s63Radiobutton.innerText()).trim() == "S63 exchange set");
// encSelectionPageObjects.expect.toBeTruthy((await encSelectionPageObjects.s57Radiobutton.innerText()).trim() == "S57 exchange set");
//});

//https://dev.azure.com/ukhydro/File%20Share%20Service/_workitems/edit/156211

Expand Down
59 changes: 30 additions & 29 deletions Tests/FunctionalTests/ess-ui-esdownloadpage.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,36 +77,37 @@ test.describe('ESS UI ES Download Page Functional Test Scenarios', () => {
await exchangeSetSelectionPageObjects.expect.validateHeaderText("Step 4 of 4\nExchange set creation");
})

//https://dev.azure.com/ukhydro/File%20Share%20Service/_workitems/edit/156097
test('check user is able to download S57 exchange set for base exchange set', async ({ page }) => {
await encSelectionPageObjects.startAgainLinkSelectorClick();
await exchangeSetSelectionPageObjects.selectBaseDownloadRadioButton();
await exchangeSetSelectionPageObjects.clickOnProceedButton();
await encSelectionPageObjects.addSingleENC("DE260001");
await encSelectionPageObjects.selectAllSelectorClick();
await encSelectionPageObjects.s57Radiobutton.click();
await encSelectionPageObjects.requestENCsSelectorClick();
var response = await page.waitForResponse(response => response.url().includes("/productData/productIdentifiers") && response.request().method() == "POST");
await encSelectionPageObjects.expect.toBeTruthy(response.url().includes("exchangeSetStandard=S57"));
await encSelectionPageObjects.page.waitForLoadState();
await esDownloadPageObjects.expect.downloadButtonSelectorHidden();
await esDownloadPageObjects.expect.spinnerSelectorVisible();
await esDownloadPageObjects.downloadButtonSelector.waitFor({state: 'visible'});
await esDownloadPageObjects.expect.spinnerSelectorHidden();
await esDownloadPageObjects.expect.downloadButtonSelectorEnabled();
await esDownloadPageObjects.expect.exchangeSetDownloadGridValidation();
//=========================================
//https://dev.azure.com/ukhydro/File%20Share%20Service/_workitems/edit/156097
// Disabled - S57 not available at the moment Rhz
//test('check user is able to download S57 exchange set for base exchange set', async ({ page }) => {
// await encSelectionPageObjects.startAgainLinkSelectorClick();
// await exchangeSetSelectionPageObjects.selectBaseDownloadRadioButton();
// await exchangeSetSelectionPageObjects.clickOnProceedButton();
// await encSelectionPageObjects.addSingleENC("DE260001");
// await encSelectionPageObjects.selectAllSelectorClick();
// await encSelectionPageObjects.s57Radiobutton.click();
// await encSelectionPageObjects.requestENCsSelectorClick();
// var response = await page.waitForResponse(response => response.url().includes("/productData/productIdentifiers") && response.request().method() == "POST");
// await encSelectionPageObjects.expect.toBeTruthy(response.url().includes("exchangeSetStandard=S57"));
// await encSelectionPageObjects.page.waitForLoadState();
// await esDownloadPageObjects.expect.downloadButtonSelectorHidden();
// await esDownloadPageObjects.expect.spinnerSelectorVisible();
// await esDownloadPageObjects.downloadButtonSelector.waitFor({state: 'visible'});
// await esDownloadPageObjects.expect.spinnerSelectorHidden();
// await esDownloadPageObjects.expect.downloadButtonSelectorEnabled();
// await esDownloadPageObjects.expect.exchangeSetDownloadGridValidation();
// //=========================================

await esDownloadPageObjects.expect.downloadLinkSelectorHidden();
await esDownloadPageObjects.expect.createLinkSelectorHidden();

//=========================================
await esDownloadPageObjects.downloadFile(page, './Tests/TestData/DownloadFile/ExchangeSet.zip');
await esDownloadPageObjects.expect.ValidateFileDownloaded("./Tests/TestData/DownloadFile/ExchangeSet.zip");
await esDownloadPageObjects.expect.ValidateFiledeleted("./Tests/TestData/DownloadFile/ExchangeSet.zip");
await esDownloadPageObjects.expect.downloadLinkSelectorEnabled();
await esDownloadPageObjects.expect.createLinkSelectorEnabled();
});
// await esDownloadPageObjects.expect.downloadLinkSelectorHidden();
// await esDownloadPageObjects.expect.createLinkSelectorHidden();

// //=========================================
// await esDownloadPageObjects.downloadFile(page, './Tests/TestData/DownloadFile/ExchangeSet.zip');
// await esDownloadPageObjects.expect.ValidateFileDownloaded("./Tests/TestData/DownloadFile/ExchangeSet.zip");
// await esDownloadPageObjects.expect.ValidateFiledeleted("./Tests/TestData/DownloadFile/ExchangeSet.zip");
// await esDownloadPageObjects.expect.downloadLinkSelectorEnabled();
// await esDownloadPageObjects.expect.createLinkSelectorEnabled();
//});

//https://dev.azure.com/ukhydro/File%20Share%20Service/_workitems/edit/156248

Expand Down
3 changes: 2 additions & 1 deletion Tests/FunctionalTests/fss-simplified-search-results.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,11 @@ test.describe('Test Search Result Scenario On Simplified Search Page', () => {
await expect(page.getByText(attributeFileName.value).first()).toBeVisible();

//=======================================
await AdmiraltyExpectAllResultsHaveFileAttributeValue(page, attributeFileName.value);
await AdmiraltyExpectAllResultsHaveFileAttributeValue(page, attributeFileName.value);
// verify paginator links are available on the page
expect(await page.getByRole('button', { name: fssSearchPageObjectsConfig.paginatorLinkNext })).toBeTruthy();
expect(await page.getByRole('button', { name: fssSearchPageObjectsConfig.paginatorLinkPrevious })).toBeTruthy();

})

})
Loading

0 comments on commit 4db64e2

Please sign in to comment.