From 25205bf097b26337cfed1457577161174da8b91e Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Tue, 13 Oct 2020 12:23:11 -0300 Subject: [PATCH] 16718: Adds tests for include_old_version usage on search middleware. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- .../search-results-middleware-service.test.ts | 26 +++++++++++++++++++ .../search-results-middleware-service.ts | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 src/store/search-results-panel/search-results-middleware-service.test.ts diff --git a/src/store/search-results-panel/search-results-middleware-service.test.ts b/src/store/search-results-panel/search-results-middleware-service.test.ts new file mode 100644 index 00000000..34b78809 --- /dev/null +++ b/src/store/search-results-panel/search-results-middleware-service.test.ts @@ -0,0 +1,26 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + +import { initialDataExplorer } from '../data-explorer/data-explorer-reducer' +import { getParams } from './search-results-middleware-service' + +describe('search-results-middleware', () => { + describe('getParams', () => { + it('should use include_old_versions=true when asked', () => { + const dataExplorer = initialDataExplorer; + const query = 'Search term is:pastVersion'; + const apiRev = 20201013; + const params = getParams(dataExplorer, query, apiRev); + expect(params.includeOldVersions).toBe(true); + }); + + it('should not use include_old_versions=true when not asked', () => { + const dataExplorer = initialDataExplorer; + const query = 'Search term'; + const apiRev = 20201013; + const params = getParams(dataExplorer, query, apiRev); + expect(params.includeOldVersions).toBe(false); + }); + }) +}) \ No newline at end of file diff --git a/src/store/search-results-panel/search-results-middleware-service.ts b/src/store/search-results-panel/search-results-middleware-service.ts index 6d2dce7c..9aa49c28 100644 --- a/src/store/search-results-panel/search-results-middleware-service.ts +++ b/src/store/search-results-panel/search-results-middleware-service.ts @@ -70,7 +70,7 @@ export class SearchResultsMiddlewareService extends DataExplorerMiddlewareServic const typeFilters = (columns: DataColumns) => serializeResourceTypeFilters(getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE)); -const getParams = (dataExplorer: DataExplorer, query: string, apiRevision: number) => ({ +export const getParams = (dataExplorer: DataExplorer, query: string, apiRevision: number) => ({ ...dataExplorerToListParams(dataExplorer), filters: joinFilters( queryToFilters(query, apiRevision), -- 2.30.2