Unify hash url strategy (#5866)

* unify hash url startegy

* improve

e2e/search/components/search-check-list.e2e.ts

@@ -19,7 +19,7 @@ import {
     ApiService,
     BrowserActions,
     LocalStorageUtil,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -34,7 +34,7 @@ import { browser } from 'protractor';
 
 describe('Search Checklist Component', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const searchFiltersPage = new SearchFiltersPage();
     const searchDialog = new SearchDialogPage();
     const searchResults = new SearchResultsPage();
@@ -83,7 +83,7 @@ describe('Search Checklist Component', () => {
 
     beforeEach(async () => {
         await navigationBarPage.clickContentServicesButton();
-        await BrowserActions.getUrl(`${browser.params.testConfig.adf.url}/search;q=${randomName}`);
+        await BrowserActions.getUrl(`${browser.baseUrl}/search;q=${randomName}`);
     });
 
     afterAll(async () => {

e2e/search/components/search-date-range.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { DataTableComponentPage, DatePickerCalendarPage, DateUtil, LocalStorageUtil, LoginSSOPage } from '@alfresco/adf-testing';
+import { DataTableComponentPage, DatePickerCalendarPage, DateUtil, LocalStorageUtil, LoginPage } from '@alfresco/adf-testing';
 import { browser, ElementFinder } from 'protractor';
 import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page';
 import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
@@ -25,7 +25,7 @@ import { SearchConfiguration } from '../search.config';
 
 describe('Search Date Range Filter', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const searchDialog = new SearchDialogPage();
     const searchFilters = new SearchFiltersPage();
     const dateRangeFilter = searchFilters.createdDateRangeFilterPage();

e2e/search/components/search-number-range.e2e.ts

@@ -20,7 +20,7 @@ import {
     DataTableComponentPage,
     DateUtil,
     LocalStorageUtil,
-    LoginSSOPage,
+    LoginPage,
     UploadActions,
     UserModel,
     UsersActions
@@ -35,7 +35,7 @@ import { SearchConfiguration } from '../search.config';
 
 describe('Search Number Range Filter', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const searchDialog = new SearchDialogPage();
     const searchFilters = new SearchFiltersPage();
     const sizeRangeFilter = searchFilters.sizeRangeFilterPage();

e2e/search/components/search-radio.e2e.ts

@@ -19,7 +19,7 @@ import {
     ApiService,
     BrowserActions,
     LocalStorageUtil,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -34,7 +34,7 @@ import { browser } from 'protractor';
 
 describe('Search Radio Component', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const searchFiltersPage = new SearchFiltersPage();
     const navigationBarPage = new NavigationBarPage();
     const searchDialog = new SearchDialogPage();
@@ -81,7 +81,7 @@ describe('Search Radio Component', () => {
 
         await loginPage.login(acsUser.email, acsUser.password);
 
-        await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=' + randomName);
+        await BrowserActions.getUrl(browser.baseUrl + '/search;q=' + randomName);
    });
 
     afterAll(async () => {

e2e/search/components/search-slider.e2e.ts

@@ -19,7 +19,7 @@ import {
     ApiService,
     DataTableComponentPage,
     LocalStorageUtil,
-    LoginSSOPage,
+    LoginPage,
     UploadActions,
     UserModel,
     UsersActions
@@ -34,7 +34,7 @@ import { SearchConfiguration } from '../search.config';
 
 describe('Search Slider Filter', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const searchDialog = new SearchDialogPage();
     const searchFilters = new SearchFiltersPage();
     const sizeSliderFilter = searchFilters.sizeSliderFilterPage();

e2e/search/components/search-sorting-picker.e2e.ts

@@ -18,7 +18,7 @@
 import {
     ApiService,
     LocalStorageUtil,
-    LoginSSOPage,
+    LoginPage,
     SearchSortingPickerPage,
     UploadActions,
     UserModel,
@@ -34,7 +34,7 @@ import { SearchConfiguration } from '../search.config';
 
 describe('Search Sorting Picker', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const searchDialog = new SearchDialogPage();
     const searchFilters = new SearchFiltersPage();
     const searchResults = new SearchResultsPage();

e2e/search/components/search-text.e2e.ts

@@ -23,7 +23,7 @@ import {
     ApiService,
     BrowserActions,
     LocalStorageUtil,
-    LoginSSOPage,
+    LoginPage,
     UserModel,
     UsersActions
 } from '@alfresco/adf-testing';
@@ -39,7 +39,7 @@ describe('Search component - Text widget', () => {
     const navigationBarPage = new NavigationBarPage();
     const searchFiltersPage = new SearchFiltersPage();
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const searchDialog = new SearchDialogPage();
     const searchResultPage = new SearchResultsPage();
 
@@ -75,7 +75,7 @@ describe('Search component - Text widget', () => {
     });
 
     it('[C289329] Placeholder should be displayed in the widget when the input string is empty', async () => {
-        await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*');
+        await BrowserActions.getUrl(browser.baseUrl + '/search;q=*');
         await searchResultPage.tableIsLoaded();
 
         await searchFiltersPage.checkNameFilterIsDisplayed();
@@ -90,7 +90,7 @@ describe('Search component - Text widget', () => {
         });
 
         it('[C289330] Should be able to change the Field setting', async () => {
-            await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*');
+            await BrowserActions.getUrl(browser.baseUrl + '/search;q=*');
             await searchResultPage.tableIsLoaded();
 
             await searchFiltersPage.checkCheckListFilterIsDisplayed();

e2e/search/search-component.e2e.ts

@@ -21,7 +21,7 @@ import {
     ApiService,
     BrowserActions,
     LocalStorageUtil,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -47,7 +47,7 @@ describe('Search component - Search Bar', () => {
         }
     };
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const navigationBarPage = new NavigationBarPage();
 
@@ -122,7 +122,7 @@ describe('Search component - Search Bar', () => {
     });
 
     afterEach(async () => {
-        await BrowserActions.getUrl(browser.params.testConfig.adf.url);
+        await BrowserActions.getUrl(browser.baseUrl);
    });
 
     it('[C272798] Search bar should be visible', async () => {

e2e/search/search-filters.e2e.ts

@@ -25,7 +25,7 @@ import {
     BrowserActions,
     DocumentListPage,
     LocalStorageUtil,
-    LoginSSOPage,
+    LoginPage,
     PaginationPage,
     StringUtil,
     UploadActions,
@@ -37,7 +37,7 @@ import { SearchConfiguration } from './search.config';
 
 describe('Search Filters', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const searchDialog = new SearchDialogPage();
     const searchFiltersPage = new SearchFiltersPage();
     const paginationPage = new PaginationPage();
@@ -134,7 +134,7 @@ describe('Search Filters', () => {
     });
 
     it('[C277146] Should Show more/less buttons be hidden when inactive', async () => {
-        await BrowserActions.getUrl(`${browser.params.testConfig.adf.url}/search;q=*`);
+        await BrowserActions.getUrl(`${browser.baseUrl}/search;q=*`);
 
         const searchCheckListPage = searchFiltersPage.creatorCheckListFiltersPage();
 
@@ -146,7 +146,7 @@ describe('Search Filters', () => {
     });
 
     it('[C286556] Search categories should preserve their collapsed/expanded state after the search', async () => {
-        await BrowserActions.getUrl(`${browser.params.testConfig.adf.url}/search;q=*`);
+        await BrowserActions.getUrl(`${browser.baseUrl}/search;q=*`);
 
         await searchFiltersPage.clickFileTypeListFilter();
         await searchFiltersPage.checkFileTypeFilterIsCollapsed();
@@ -160,7 +160,7 @@ describe('Search Filters', () => {
     });
 
     it('[C287796] Should be able to display the correct bucket number after selecting a filter', async () => {
-        await BrowserActions.getUrl(`${browser.params.testConfig.adf.url}/search;q=*`);
+        await BrowserActions.getUrl(`${browser.baseUrl}/search;q=*`);
 
         await searchFiltersPage.fileTypeCheckListFiltersPage().clickCheckListOption('PNG Image');
 
@@ -191,7 +191,7 @@ describe('Search Filters', () => {
     });
 
     it('[C291980] Should group search facets under specified labels', async () => {
-        await BrowserActions.getUrl(`${browser.params.testConfig.adf.url}/search;q=*`);
+        await BrowserActions.getUrl(`${browser.baseUrl}/search;q=*`);
 
         await searchFiltersPage.checkDefaultFacetQueryGroupIsDisplayed();
         await searchFiltersPage.checkTypeFacetQueryGroupIsDisplayed();
@@ -214,7 +214,7 @@ describe('Search Filters', () => {
     });
 
     it('[C297509] Should display search intervals under specified labels from config', async () => {
-        await BrowserActions.getUrl(`${browser.params.testConfig.adf.url}/search;q=*`);
+        await BrowserActions.getUrl(`${browser.baseUrl}/search;q=*`);
 
         await searchFiltersPage.checkFacetIntervalsByCreatedIsDisplayed();
         await searchFiltersPage.checkFacetIntervalsByCreatedIsExpanded();

e2e/search/search-multiselect.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, LoginSSOPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, LoginPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { SearchDialogPage } from '../pages/adf/dialog/search-dialog.page';
 import { SearchResultsPage } from '../pages/adf/search-results.page';
@@ -25,7 +25,7 @@ import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
 import CONSTANTS = require('../util/constants');
 
 describe('Search Component - Multi-Select Facet', () => {
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const searchDialog = new SearchDialogPage();
     const searchResultsPage = new SearchResultsPage();
     const searchFiltersPage = new SearchFiltersPage();

e2e/search/search-page.e2e.ts

@@ -17,7 +17,7 @@
 
 import { browser } from 'protractor';
 
-import { ApiService, LoginSSOPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, LoginPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
 
 import { SearchDialogPage } from '../pages/adf/dialog/search-dialog.page';
 import { ContentServicesPage } from '../pages/adf/content-services.page';
@@ -40,7 +40,7 @@ describe('Search component - Search Page', () => {
         }
     };
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const searchDialog = new SearchDialogPage();
     const searchResultPage = new SearchResultsPage();