diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-30 03:10:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-30 03:10:12 +0300 |
commit | 199a948f6c03fb7771cbf869f2c02c45e83c71ab (patch) | |
tree | dbeae5214b6b8688316b9b924fa7816e65d74e8b /spec | |
parent | 9c0f8fe2d45ad0ea710ea3e3031fa68e8d9e0cbf (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
-rw-r--r-- | spec/frontend/analytics/cycle_analytics/mock_data.js | 6 | ||||
-rw-r--r-- | spec/frontend/analytics/cycle_analytics/store/mutations_spec.js | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/frontend/analytics/cycle_analytics/mock_data.js b/spec/frontend/analytics/cycle_analytics/mock_data.js index 7ad95cab9ad..e0b6f4aa8c4 100644 --- a/spec/frontend/analytics/cycle_analytics/mock_data.js +++ b/spec/frontend/analytics/cycle_analytics/mock_data.js @@ -11,7 +11,7 @@ import { DEFAULT_VALUE_STREAM, PAGINATION_TYPE, PAGINATION_SORT_DIRECTION_DESC, - PAGINATION_SORT_FIELD_END_EVENT, + PAGINATION_SORT_FIELD_DURATION, } from '~/analytics/cycle_analytics/constants'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { getDateInPast } from '~/lib/utils/datetime_utility'; @@ -245,7 +245,7 @@ export const valueStreamStages = rawValueStreamStages.map((s) => export const initialPaginationQuery = { page: 15, - sort: PAGINATION_SORT_FIELD_END_EVENT, + sort: PAGINATION_SORT_FIELD_DURATION, direction: PAGINATION_SORT_DIRECTION_DESC, }; @@ -257,7 +257,7 @@ export const initialPaginationState = { export const basePaginationResult = { pagination: PAGINATION_TYPE, - sort: PAGINATION_SORT_FIELD_END_EVENT, + sort: PAGINATION_SORT_FIELD_DURATION, direction: PAGINATION_SORT_DIRECTION_DESC, page: null, }; diff --git a/spec/frontend/analytics/cycle_analytics/store/mutations_spec.js b/spec/frontend/analytics/cycle_analytics/store/mutations_spec.js index 25fed2b1714..a37f37aaaf4 100644 --- a/spec/frontend/analytics/cycle_analytics/store/mutations_spec.js +++ b/spec/frontend/analytics/cycle_analytics/store/mutations_spec.js @@ -2,7 +2,7 @@ import { useFakeDate } from 'helpers/fake_date'; import * as types from '~/analytics/cycle_analytics/store/mutation_types'; import mutations from '~/analytics/cycle_analytics/store/mutations'; import { - PAGINATION_SORT_FIELD_END_EVENT, + PAGINATION_SORT_FIELD_DURATION, PAGINATION_SORT_DIRECTION_DESC, } from '~/analytics/cycle_analytics/constants'; import { @@ -99,7 +99,7 @@ describe('Project Value Stream Analytics mutations', () => { ${types.SET_LOADING} | ${true} | ${'isLoading'} | ${true} ${types.SET_LOADING} | ${false} | ${'isLoading'} | ${false} ${types.SET_SELECTED_VALUE_STREAM} | ${selectedValueStream} | ${'selectedValueStream'} | ${selectedValueStream} - ${types.SET_PAGINATION} | ${pagination} | ${'pagination'} | ${{ ...pagination, sort: PAGINATION_SORT_FIELD_END_EVENT, direction: PAGINATION_SORT_DIRECTION_DESC }} + ${types.SET_PAGINATION} | ${pagination} | ${'pagination'} | ${{ ...pagination, sort: PAGINATION_SORT_FIELD_DURATION, direction: PAGINATION_SORT_DIRECTION_DESC }} ${types.SET_PAGINATION} | ${{ ...pagination, sort: 'duration', direction: 'asc' }} | ${'pagination'} | ${{ ...pagination, sort: 'duration', direction: 'asc' }} ${types.SET_SELECTED_STAGE} | ${selectedStage} | ${'selectedStage'} | ${selectedStage} ${types.RECEIVE_VALUE_STREAMS_SUCCESS} | ${[selectedValueStream]} | ${'valueStreams'} | ${[selectedValueStream]} |