inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix ordering e2e failing test (#4825)

Browse Source 
* ordering fix use common method in datatable

* ordering fix use common method in datatable

* fix sorting ps e2e

* fix ordering

* move search page in testing and fix sorting boolean flag

* fix import

* fix moment

* use common sort method in document list test

* use common sort method in document list test

* remove unnecesary sort control

* remove duplicate test

* remove e2e suspended removed status

* documentation
This commit is contained in:
Eugenio Romano
2019-06-11 07:34:16 +01:00
committed by GitHub
parent c85df84a01
commit 990fa4625b
43 changed files with 951 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e2e/search/components/search-date-range.e2e.ts
View File

@@ -15,18 +15,16 @@
* limitations under the License.
*/
import { LoginPage, LocalStorageUtil } from '@alfresco/adf-testing';
import { LoginPage, LocalStorageUtil, DatePickerPage, DateUtil } from '@alfresco/adf-testing';
import { SearchDialog } from '../../pages/adf/dialog/searchDialog';
import { DataTableComponentPage } from '@alfresco/adf-testing';
import { SearchResultsPage } from '../../pages/adf/searchResultsPage';
import { DatePickerPage } from '../../pages/adf/material/datePickerPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage';
import { SearchConfiguration } from '../search.config';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { browser } from 'protractor';
import { DateUtil } from '../../util/dateUtil';
describe('Search Date Range Filter', () => {
@@ -131,7 +129,7 @@ describe('Search Date Range Filter', () => {
dateRangeFilter.checkApplyButtonIsEnabled()
.clickApplyButton();
searchResults.sortByCreated(true);
searchResults.sortByCreated('ASC');
browser.controlFlow().execute(async () => {
const results = await dataTable.geCellElementDetail('Created');

15
e2e/search/components/search-number-range.e2e.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { LoginPage, LocalStorageUtil } from '@alfresco/adf-testing';
import { LoginPage, LocalStorageUtil, DateUtil } from '@alfresco/adf-testing';
import { SearchDialog } from '../../pages/adf/dialog/searchDialog';
import { DataTableComponentPage } from '@alfresco/adf-testing';
import { SearchResultsPage } from '../../pages/adf/searchResultsPage';
@@ -29,7 +29,6 @@ import { FileModel } from '../../models/ACS/fileModel';
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { SearchConfiguration } from '../search.config';
import { DateUtil } from '../../util/dateUtil';
describe('Search Number Range Filter', () => {
@@ -165,7 +164,7 @@ describe('Search Number Range Filter', () => {
sizeRangeFilter.clickApplyButton();
searchResults.tableIsLoaded();
searchResults.sortBySize(false);
searchResults.sortBySize('DESC');
browser.controlFlow().execute(async () => {
const results = await dataTable.geCellElementDetail('Size');
@@ -196,7 +195,7 @@ describe('Search Number Range Filter', () => {
expect(sizeRangeFilter.checkApplyButtonIsEnabled()).toBe(true);
sizeRangeFilter.clickApplyButton();
searchResults.sortBySize(false);
searchResults.sortBySize('DESC');
browser.controlFlow().execute(async () => {
const results = await dataTable.geCellElementDetail('Size');
@@ -214,7 +213,7 @@ describe('Search Number Range Filter', () => {
searchFilters.checkNameFilterIsDisplayed()
.checkNameFilterIsExpanded();
nameFilter.searchByName('z*');
searchResults.sortBySize(false);
searchResults.sortBySize('DESC');
browser.controlFlow().execute(async () => {
const results = await dataTable.geCellElementDetail('Size');
@@ -270,7 +269,7 @@ describe('Search Number Range Filter', () => {
sizeRangeFilter.clickApplyButton();
searchResults.tableIsLoaded();
searchResults.sortBySize(false);
searchResults.sortBySize('DESC');
browser.controlFlow().execute(async () => {
const results = await dataTable.geCellElementDetail('Size');
@@ -308,7 +307,7 @@ describe('Search Number Range Filter', () => {
expect(sizeRangeFilter.getToNumber()).toEqual('');
sizeRangeFilter.putFromNumber(0).putToNumber(1).clickApplyButton();
searchResults.sortBySize(false);
searchResults.sortBySize('DESC');
browser.controlFlow().execute(async () => {
const results = await dataTable.geCellElementDetail('Size');
@@ -418,7 +417,7 @@ describe('Search Number Range Filter', () => {
sizeRangeFilter.clickApplyButton();
searchResults.tableIsLoaded();
searchResults.sortByCreated(false);
searchResults.sortByCreated('DESC');
browser.controlFlow().execute(async () => {
const results = await dataTable.geCellElementDetail('Created');

4
e2e/search/components/search-slider.e2e.ts
View File

@@ -118,7 +118,7 @@ describe('Search Number Range Filter', () => {
it('[C276981] Should be able to clear value in Search Size Slider', () => {
const size = 5;
sizeSliderFilter.checkSliderIsDisplayed().setValue(size);
searchResults.sortBySize(false)
searchResults.sortBySize('DESC')
.tableIsLoaded();
browser.controlFlow().execute(async () => {
@@ -137,7 +137,7 @@ describe('Search Number Range Filter', () => {
sizeSliderFilter.checkSliderIsDisplayed()
.clickClearButton();
searchResults.sortBySize(false)
searchResults.sortBySize('DESC')
.tableIsLoaded();
browser.controlFlow().execute(async () => {

45
e2e/search/components/search-sorting-picker.e2e.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { LoginPage, LocalStorageUtil, BrowserActions } from '@alfresco/adf-testing';
import { LoginPage, LocalStorageUtil, BrowserActions, SearchSortingPickerPage } from '@alfresco/adf-testing';
import { SearchDialog } from '../../pages/adf/dialog/searchDialog';
import { SearchResultsPage } from '../../pages/adf/searchResultsPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
@@ -29,7 +29,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { SearchConfiguration } from '../search.config';
import { SearchSortingPickerPage } from '../../pages/adf/content-services/search/components/search-sortingPicker.page';
describe('Search Sorting Picker', () => {
@@ -175,29 +174,20 @@ describe('Search Sorting Picker', () => {
it('[C277280] Should be able to sort the search results by "Name" ASC', () => {
searchFilters.checkSearchFiltersIsDisplayed();
searchFilters.creatorCheckListFiltersPage().filterBy(`${acsUser.firstName} ${acsUser.lastName}`);
searchResults.sortByName(true);
searchResults.sortByName('ASC');
expect(searchResults.checkListIsOrderedByNameAsc()).toBe(true);
});
it('[C277281] Should be able to sort the search results by "Name" DESC', () => {
searchFilters.checkSearchFiltersIsDisplayed();
searchFilters.creatorCheckListFiltersPage().filterBy(`${acsUser.firstName} ${acsUser.lastName}`);
searchResults.sortByName(false);
searchResults.sortByName('DESC');
expect(searchResults.checkListIsOrderedByNameDesc()).toBe(true);
});
it('[C277282] Should be able to sort the search results by "Author" ASC', () => {
searchResults.sortByAuthor(true);
expect(searchResults.checkListIsOrderedByAuthorAsc()).toBe(true);
});
it('[C277283] Should be able to sort the search results by "Author" DESC', () => {
searchResults.sortByAuthor(false);
expect(searchResults.checkListIsOrderedByAuthorDesc()).toBe(true);
});
it('[C277286] Should be able to sort the search results by "Created Date" ASC', () => {
searchResults.sortByCreated(true);
searchResults.sortByCreated('ASC');
browser.controlFlow().execute(async () => {
const results = await searchResults.dataTable.geCellElementDetail('Created');
expect(contentServices.checkElementsDateSortedAsc(results)).toBe(true);
@@ -205,7 +195,7 @@ describe('Search Sorting Picker', () => {
});
it('[C277287] Should be able to sort the search results by "Created Date" DESC', () => {
searchResults.sortByCreated(false);
searchResults.sortByCreated('DESC');
browser.controlFlow().execute(async () => {
const results = await searchResults.dataTable.geCellElementDetail('Created');
expect(contentServices.checkElementsDateSortedDesc(results)).toBe(true);
@@ -230,7 +220,7 @@ describe('Search Sorting Picker', () => {
.enterTextAndPressEnter(search);
searchSortingPicker.checkSortingSelectorIsDisplayed()
.sortBy(true, 'Modified Date');
.sortBy('ASC', 'Modified Date');
browser.controlFlow().execute(async () => {
const idList = await contentServices.getElementsDisplayedId();
@@ -245,25 +235,4 @@ describe('Search Sorting Picker', () => {
});
});
it('[C277301] Should be able to change default sorting option for the search results', async () => {
navigationBar.clickContentServicesButton();
jsonFile = SearchConfiguration.getConfiguration();
jsonFile.sorting.options.push({
'key': 'createdByUser',
'label': 'Author',
'type': 'FIELD',
'field': 'cm:creator',
'ascending': true
});
await LocalStorageUtil.setConfigField('search', JSON.stringify(jsonFile));
searchDialog.checkSearchIconIsVisible()
.clickOnSearchIcon()
.enterTextAndPressEnter(search);
searchSortingPicker.checkSortingSelectorIsDisplayed();
expect(searchResults.checkListIsOrderedByAuthorAsc()).toBe(true);
});
});