Merge branch 'master' into 74-integration-with-bookmarks-core-plugin
# Conflicts: # src/custom-sort/custom-sort.spec.ts # src/custom-sort/custom-sort.ts
This commit is contained in:
commit
7a36f46fa8
|
@ -2261,7 +2261,7 @@ describe('CustomSortOrder.byMetadataFieldAlphabeticalReverse', () => {
|
||||||
expect(result2).toBe(SORT_FIRST_GOES_LATER)
|
expect(result2).toBe(SORT_FIRST_GOES_LATER)
|
||||||
expect(result3).toBe(SORT_ITEMS_ARE_EQUAL)
|
expect(result3).toBe(SORT_ITEMS_ARE_EQUAL)
|
||||||
})
|
})
|
||||||
it('should put the item with metadata earlier if the second one has no metadata ', () => {
|
it('should put the item with metadata below the second one w/o metadata (this is reverse order)', () => {
|
||||||
// given
|
// given
|
||||||
const itemA: Partial<FolderItemForSorting> = {
|
const itemA: Partial<FolderItemForSorting> = {
|
||||||
metadataFieldValue: '15',
|
metadataFieldValue: '15',
|
||||||
|
@ -2277,8 +2277,8 @@ describe('CustomSortOrder.byMetadataFieldAlphabeticalReverse', () => {
|
||||||
const result2: number = sorter(itemB as FolderItemForSorting, itemA as FolderItemForSorting)
|
const result2: number = sorter(itemB as FolderItemForSorting, itemA as FolderItemForSorting)
|
||||||
|
|
||||||
// then
|
// then
|
||||||
expect(result1).toBe(SORT_FIRST_GOES_EARLIER)
|
expect(result1).toBe(SORT_FIRST_GOES_LATER)
|
||||||
expect(result2).toBe(SORT_FIRST_GOES_LATER)
|
expect(result2).toBe(SORT_FIRST_GOES_EARLIER)
|
||||||
})
|
})
|
||||||
it('should put the item with metadata later if the second one has no metadata (reverse order)', () => {
|
it('should put the item with metadata later if the second one has no metadata (reverse order)', () => {
|
||||||
// given
|
// given
|
||||||
|
|
Loading…
Reference in New Issue