12858 fss UI simplified search acceptance tests for new developed features

NVDSuppressions.xml

@@ -1,33 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
-<suppress>
-   <notes><![CDATA[
-   file name: ansi-html:0.0.7
-   Vunerability is if an attacker provides a malicious string, it will get stuck processing the input for an extremely long time.
-   For now there is no patch available for this vulnerability.
-   ]]></notes>
-   <packageUrl regex="true">^pkg:npm/ansi\-html@.*$</packageUrl>
-   <vulnerabilityName>CVE-2021-23424</vulnerabilityName>
-</suppress>
-<suppress>
-   <notes><![CDATA[
-   file name: ansi-html:0.0.7
-   Vunerability is if an attacker provides a malicious string, it will get stuck processing the input for an extremely long time.
-   For now there is no patch available for this vulnerability.
-   ]]></notes>
-   <packageUrl regex="true">^pkg:npm/ansi\-html@.*$</packageUrl>
-   <vulnerabilityName>1002522</vulnerabilityName>
-</suppress>
-<suppress>
-   <notes><![CDATA[
-   file name: ansi-html:0.0.7
-   Vunerability is if an attacker provides a malicious string, it will get stuck processing the input for an extremely long time.
-   For now there is no patch available for this vulnerability.
-   ]]></notes>
-   <packageUrl regex="true">^pkg:npm/ansi\-html@.*$</packageUrl>
-   <vulnerabilityName>1005059</vulnerabilityName>
-</suppress>
 <suppress>
    <notes><![CDATA[
    file name: json-schema:0.2.3

Tests/FunctionalTests/fss-signin-page.spec.ts

@@ -25,7 +25,7 @@ describe('Test Sign In Page Scenario', () => {
     await LoginPortal(page,autoTestConfig.user, autoTestConfig.password, pageObjectsConfig.loginSignInLinkSelector);
 
     await page.waitForSelector(pageObjectsConfig.loginAccountSelector);
-    expect(await page.innerHTML(pageObjectsConfig.loginAccountLinkSelector)).toEqual(autoTestConfig.userFullName);
+    expect(await page.innerHTML(pageObjectsConfig.loginAccountLinkSelector)).toContain(autoTestConfig.userFullName);
 
   })
 

Tests/FunctionalTests/fss-simplified-search-results.spec.ts

@@ -3,8 +3,8 @@ const { pageObjectsConfig, pageTimeOut } = require('./pageObjects');
 import {AcceptCookies, InsertSearchText,
   ExpectAllResultsHaveBatchUserAttValue,
   ExpectAllResultsContainAnyBatchUserAttValue,
-  GetTotalResultCount} from './helpermethod';
-import {attributeProductType, searchNonExistBatchAttribute} from './helperconstant';
+  GetTotalResultCount,GetSpecificAttributeCount,filterCheckBox,ExpectAllResultsContainBatchUserAttValue} from './helpermethod';
+import {attributeProductType, searchNonExistBatchAttribute,batchAttributeKeys,attributeMediaType} from './helperconstant';
 
 describe('Test Search Result Scenario On Simplified Search Page', () => {
   jest.setTimeout(pageTimeOut.timeOutInMilliSeconds);
@@ -81,8 +81,7 @@ describe('Test Search Result Scenario On Simplified Search Page', () => {
 
     //verify Choose files to download and  Download buttons are available on the page
     expect(await page.isVisible(pageObjectsConfig.chooseFileDownloadSelector)).toBeTruthy();
-    expect(await page.isVisible(pageObjectsConfig.fileDownloadButton)).toBeTruthy();    
-
+
      //Click on expand button
      await page.click(pageObjectsConfig.chooseFileDownloadSelector);
 
@@ -94,4 +93,77 @@ describe('Test Search Result Scenario On Simplified Search Page', () => {
      expect(fileDownloadStatus).toContain("check");    
   })
 
+  it('Verify search results specific batch attributes on filter panel', async () => {
+    await InsertSearchText(page, attributeProductType.value);
+
+    await page.waitForSelector(pageObjectsConfig.searchResultTableSelector);
+    await ExpectAllResultsHaveBatchUserAttValue(page, attributeProductType.value);
+
+    const filterSpeficAttributeCount=await GetSpecificAttributeCount(page, attributeProductType.key, attributeProductType.value );
+
+    expect(filterSpeficAttributeCount).toEqual(1);    
+
+  })
+
+  it('Verify configured batch attributes will be displayed on the filter panel', async () => {
+    await InsertSearchText(page, attributeProductType.value);
+
+    await page.waitForSelector(pageObjectsConfig.searchResultTableSelector);
+    await ExpectAllResultsHaveBatchUserAttValue(page, attributeProductType.value);
+
+    const configuredBatchAttibutes=await page.$$eval(pageObjectsConfig.filterBatchAttributes ,elements => { return elements.map(element => element.textContent) });
+
+    var match = (batchAttributeKeys.length == configuredBatchAttibutes.length) && batchAttributeKeys.every(function(element, index) {
+      return element === configuredBatchAttibutes[index]; 
+     });
+
+    expect(match).toBeTruthy();           
+
+  })
+
+  it('Verify batch attributes filter can select or deselect', async () => {
+    await InsertSearchText(page, attributeProductType.value);
+
+    await page.waitForSelector(pageObjectsConfig.searchResultTableSelector);
+    await ExpectAllResultsHaveBatchUserAttValue(page, attributeProductType.value);
+    //select filter check box 
+    await page.check(await filterCheckBox(attributeProductType.key, attributeProductType.value));
+    await page.check(await filterCheckBox(attributeMediaType.key, attributeMediaType.value)); 
+
+    // Assert the filter checked state
+    expect(await page.isChecked(await filterCheckBox(attributeProductType.key, attributeProductType.value))).toBeTruthy()
+    expect(await page.isChecked(await filterCheckBox(attributeMediaType.key, attributeMediaType.value))).toBeTruthy()   
+
+   //clicks on clear filter buttton
+    await page.click(pageObjectsConfig.clearFilterButton);
+
+    // Assert the filter checked state
+    expect(await page.isChecked(await filterCheckBox(attributeProductType.key, attributeProductType.value))).toBeFalsy()
+    expect(await page.isChecked(await filterCheckBox(attributeMediaType.key, attributeMediaType.value))).toBeFalsy()   
+
+  })
+
+  it('Select batch attributes filter and clicks on Apply filters button and refine the search', async () => {
+    await InsertSearchText(page, attributeProductType.value);
+
+    await page.waitForSelector(pageObjectsConfig.searchResultTableSelector);
+    await ExpectAllResultsHaveBatchUserAttValue(page, attributeProductType.value);
+    //select batch attributes filter
+    await page.check(await filterCheckBox(attributeProductType.key, attributeProductType.value));
+    await page.check(await filterCheckBox(attributeMediaType.key, attributeMediaType.value)); 
+
+    // Assert the filter checked state
+    expect(await page.isChecked(await filterCheckBox(attributeProductType.key, attributeProductType.value))).toBeTruthy()
+    expect(await page.isChecked(await filterCheckBox(attributeMediaType.key, attributeMediaType.value))).toBeTruthy()   
+
+   //clicks on clear filter buttton
+    await page.click(pageObjectsConfig.applyFilterButton);
+
+    await page.waitForSelector(pageObjectsConfig.searchResultTableSelector);
+    await ExpectAllResultsContainBatchUserAttValue(page,attributeProductType.value);
+    await ExpectAllResultsContainBatchUserAttValue(page,attributeMediaType.value);  
+  })
+
+
+
 })

Tests/FunctionalTests/helperconstant.ts

@@ -39,5 +39,13 @@ export const attributeBusinessUnit: BatchAttribute = { key: 'BusinessUnit', valu
 export const attributeProductType: BatchAttribute = { key: 'Product Type', value: 'AVCS' };
 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'};
 
 export const searchNonExistBatchAttribute = 'pqtestresult';
+
+export const batchAttributeKeys = [
+  'Media Type',
+  'Product Type',
+  'Week Number',
+  'Year'
+]

Tests/FunctionalTests/helpermethod.ts

@@ -217,3 +217,18 @@ export async function GetCountOfBatchRows(page: Page): Promise<number> {
   //  count the result rows
   return await page.$$eval(`//table[@class='${pageObjectsConfig.searchAttributeTable.substring(1)}']`, matches => matches.length);
 }
+
+export async function GetSpecificAttributeCount(page: Page,batchAtributeType : string, batchAttributeValue : string) : Promise<number>{
+
+  let searchString=`//ukho-expansion[.//h3[text()='${batchAtributeType}']]//ukho-checkbox/label[text()='${batchAttributeValue}']`
+  const resultCount = await page.$$eval(searchString, matches => matches.length);
+  return resultCount
+
+}
+
+export async function filterCheckBox(batchAtributeType: string, batchAttributeValue : string) : Promise<string>{
+
+  let checkBoxMatch=`//ukho-expansion[.//h3[text()='${batchAtributeType}']]//ukho-checkbox/label[text()='${batchAttributeValue}']`;
+  return checkBoxMatch;
+
+}

Tests/FunctionalTests/pageObjects.json

@@ -1,12 +1,12 @@
 {
     "pageObjectsConfig":
     {
-       "homePageHeaderSelector":"#main-menu h2",
+       "homePageHeaderSelector":"#main-menu h1",
        "homePageHeaderText":"File Share Service",
        "searchLinkSelector":"ukho-header #Search >a",
        "searchLinkText":"Search",
-       "signinLinkSelector":"ukho-header [id='signInButton'] >a",
-       "signinLinkText":"Sign In",
+       "signinLinkSelector":"ukho-header [id='signInButton']",
+       "signinLinkText":"Sign in",
        "accessibilityLinkSelector": "text=Accessibility",
        "privacypolicyLinkSelector": "text=Privacy policy",
        "marinedataportalLinkSelector" : "a > img[alt='Admiralty - Maritime Data Solutions Logo']",
@@ -24,8 +24,8 @@
        "loginPopupSignInPasswordSelector" : "#password",
        "loginPopupSignInButtonSelector" : "#next",
        "loginSignInLinkSelector" : "#signInButton",
-       "loginAccountSelector" : "#accountSection",
-       "loginAccountLinkSelector" : "#accountSection #profile > a",
+       "loginAccountSelector" : ".sectionDropdown",
+       "loginAccountLinkSelector" : "button[aria-describedby='signedInButtonTextDescription']",
        "searchPageContainerHeaderSelector" : "h1#main",
        "searchPageContainerHeaderText" : "Search files",
        "searchButtonSelector": "#Search",
@@ -55,8 +55,8 @@
        "groupCheckBox2Selector" : "#fss-querytable-group-2 input",
        "groupingButton" : ".delete.grouping",
        "chooseFileDownloadSelector" : "(//h3[text()='Choose files to download'])[1]",
-       "fileDownloadButton" : "(//h3[text()='Choose files to download'])[1]/following::div[@class='fileDownload'][1]",
-       "fileDownloadButtonStatus" : "(//h3[text()='Choose files to download'])[1]/following::div[@class='fileDownload'][1]/i",
+       "fileDownloadButton" : "(//h3[text()='Choose files to download'])[1]/following::button[contains(@aria-label,'Download')][1]",
+       "fileDownloadButtonStatus" : "(//h3[text()='Choose files to download'])[1]/following::button[contains(@aria-label,'Download')][1]",
        "attributeTableCellNameSelector" : "(//table[@class='attribute-table']//tr[2]//td[1])[1]",
        "systemTableBatchExpirySelector" : "(//table[@class='system-attribute-table']//tr[2]//td[3])[1]",
        "SystemAttributeCellName" : "//table[@class='attribute-table']//tr[2]//td[1]",
@@ -81,7 +81,10 @@
        "simplifiedTableRowsSelector" :  "//*[contains(@class, 'SimplifiedSearchResult')]//table[@class='attribute-table']//tr[.//td]",
        "paginatorTextSelector" : "[aria-label='pagination']>p",
        "paginatorLinkPrevious" : "a[aria-label='Previous Page']",
-       "paginatorLinkNext":"a[aria-label='Next Page']"  
+       "paginatorLinkNext":"a[aria-label='Next Page']",
+       "filterBatchAttributes" : ".filters h3",
+       "clearFilterButton": "button.text-link[type='reset']",
+       "applyFilterButton": "//button[text()='Apply filters']"
     },
     "pageTimeOut":
     {

Tests/UnitTests/fss-header.component.spec.ts

@@ -63,7 +63,7 @@ describe('FssHeaderComponent', () => {
     const fixture = TestBed.createComponent(FssHeaderComponent);
     fixture.detectChanges();
     const header = fixture.debugElement.query(By.css('ukho-header')).nativeElement;
-    expect(header.querySelector('h2').textContent).toContain(AppConfigService.settings["fssConfig"].fssTitle);
+    expect(header.querySelector('h1').textContent).toContain(AppConfigService.settings["fssConfig"].fssTitle);
   });
 
   test('should exist', () => {

Tests/UnitTests/fss-search-results.component.spec.ts

@@ -170,16 +170,21 @@ describe('FssSearchResultsComponent', () => {
     component.ngOnChanges();
     tick(100);
     fixture.detectChanges();
+    expect(batches.length).toBeGreaterThan(0);
     fixture.whenStable().then(() => {
       batches.forEach((item: SearchResultViewModel) => {
-        let css = "[id='" + item.BatchID.value + "']";
-        const home = fixture.debugElement.query(By.css(css)).nativeElement;
+        let pnlBatchDetailsId = "[id='" + item.BatchID.value + "']";
+        const pnlBatchDetails = fixture.debugElement.query(By.css(pnlBatchDetailsId)).nativeElement;
         if (item.allFilesZipSize) {
-          expect(home.querySelector("ukho-button").textContent).toEqual("Download all");
+          expect(pnlBatchDetails.querySelector("a").textContent).toEqual("Download all");
+          expect(pnlBatchDetails.querySelector("a").classList.contains('isDownloadAllDisabled')).toBe(false);
+          expect(pnlBatchDetails.querySelector("ukho-dialogue")).toBeNull();
         }
         else
         {
-          expect(home.querySelector("ukho-button")).toBeNull();
+          expect(pnlBatchDetails.querySelector("a").textContent).toEqual("Download all");
+          expect(pnlBatchDetails.querySelector("a").classList.contains('isDownloadAllDisabled')).toBe(true);
+          expect(pnlBatchDetails.querySelector("ukho-dialogue").textContent).toEqual("'Download all' function will be available when the files have been prepared You can select and download individual files, or try again later ");
         }
       });
     });

Tests/UnitTests/fss-search.component.spec.ts

@@ -6,16 +6,20 @@ import { PublicClientApplication } from '@azure/msal-browser';
 import { HttpClientModule } from '@angular/common/http';
 import { AppConfigService } from '../../src/app/core/services/app-config.service';
 import { AnalyticsService } from '../../src/app/core/services/analytics.service';
+import { RouterTestingModule } from '@angular/router/testing';
+import { ActivatedRoute, Router } from '@angular/router';
 
 describe('FssSearchComponent', () => {
    let component: FssSearchComponent;
    let fixture: ComponentFixture<FssSearchComponent>;
    let msalService: MsalService;
    let analyticsService: AnalyticsService;
+   let router : Router;
+   let route : ActivatedRoute;
 
    beforeEach(async () => {
       await TestBed.configureTestingModule({
-         imports: [HttpClientModule],
+         imports: [HttpClientModule, RouterTestingModule.withRoutes([])],
          declarations: [FssSearchComponent],
          schemas: [NO_ERRORS_SCHEMA],
          providers: [
@@ -58,8 +62,11 @@ describe('FssSearchComponent', () => {
 
    beforeEach(() => {
       fixture = TestBed.createComponent(FssSearchComponent);
+      router = TestBed.get(Router);
+      route = TestBed.get(ActivatedRoute);
       component = fixture.componentInstance;
       fixture.detectChanges();
+
    });
 
    it('should create FssSearchComponent', () => {