From d96338759a37512c2f00400d01af7868358c8559 Mon Sep 17 00:00:00 2001 From: Tifenn Guillas <tifenn.guillas@gmail.com> Date: Fri, 24 Sep 2021 11:51:04 +0200 Subject: [PATCH] Remove useless comments --- .../effects/search-multiple.effects.spec.ts | 152 +----------------- 1 file changed, 1 insertion(+), 151 deletions(-) diff --git a/client/src/app/instance/store/effects/search-multiple.effects.spec.ts b/client/src/app/instance/store/effects/search-multiple.effects.spec.ts index ed415dad..c3aaca62 100644 --- a/client/src/app/instance/store/effects/search-multiple.effects.spec.ts +++ b/client/src/app/instance/store/effects/search-multiple.effects.spec.ts @@ -9,20 +9,13 @@ import { ToastrService } from 'ngx-toastr'; import { SearchMultipleEffects } from './search-multiple.effects'; import { SearchService } from '../services/search.service'; -import * as searchActions from '../actions/search.actions'; import * as fromSearch from '../reducers/search.reducer'; import * as fromSearchMultiple from '../reducers/search-multiple.reducer'; import * as fromInstance from '../../../metamodel/reducers/instance.reducer'; import * as datasetSelector from '../../../metamodel/selectors/dataset.selector'; -import * as searchSelector from '../selectors/search.selector'; -import * as attributeActions from '../../../metamodel/actions/attribute.actions'; -import * as criteriaFamilyActions from '../../../metamodel/actions/criteria-family.actions'; -import * as outputFamilyActions from '../../../metamodel/actions/output-family.actions'; -import * as outputCategoryActions from '../../../metamodel/actions/output-category.actions'; -import * as attributeSelector from '../../../metamodel/selectors/attribute.selector'; import * as coneSearchSelector from '../selectors/cone-search.selector'; import * as coneSearchActions from '../actions/cone-search.actions'; -import { ConeSearch, Criterion, PaginationOrder, SearchMultipleDatasetLength } from '../models'; +import { ConeSearch, SearchMultipleDatasetLength } from '../models'; import * as searchMultipleSelector from '../selectors/search-multiple.selector'; import * as instanceSelector from '../../../metamodel/selectors/instance.selector'; import * as searchMultipleActions from '../actions/search-multiple.actions'; @@ -322,67 +315,6 @@ describe('SearchMultipleEffects', () => { expect(effects.initSearch$).toBeObservable(expected); }); - - // it('should dispatch a bunch of actions when a dataset is selected or a page is reloaded with steps checked', () => { - // mockDatasetSelectorSelectDatasetNameByRoute = store.overrideSelector( - // datasetSelector.selectDatasetNameByRoute, 'myDatasetName' - // ); - // mockSearchSelectorSelectPristine = store.overrideSelector( - // searchSelector.selectPristine,true - // ); - // mockSearchSelectorSelectCurrentDataset = store.overrideSelector( - // searchSelector.selectCurrentDataset,'myDatasetName' - // ); - // mockSearchSelectorSelectStepsByRoute = store.overrideSelector( - // searchSelector.selectStepsByRoute, '111' - // ); - // - // const action = searchActions.initSearch(); - // actions = hot('-a', { a: action }); - // const expected = cold('-(bcdefghi)', { - // b: searchActions.changeCurrentDataset({ currentDataset: 'myDatasetName' }), - // c: attributeActions.loadAttributeList(), - // d: criteriaFamilyActions.loadCriteriaFamilyList(), - // e: outputFamilyActions.loadOutputFamilyList(), - // f: outputCategoryActions.loadOutputCategoryList(), - // g: searchActions.checkCriteria(), - // h: searchActions.checkOutput(), - // i: searchActions.checkResult() - // }); - // - // expect(effects.initSearch$).toBeObservable(expected); - // }); - // - // it('should dispatch a resetSearch action when user get back to search module', () => { - // mockDatasetSelectorSelectDatasetNameByRoute = store.overrideSelector( - // datasetSelector.selectDatasetNameByRoute, '' - // ); - // mockSearchSelectorSelectPristine = store.overrideSelector( - // searchSelector.selectPristine,false - // ); - // - // const action = searchActions.initSearch(); - // const outcome = searchActions.resetSearch(); - // - // actions = hot('-a', { a: action }); - // const expected = cold('-b', { b: outcome }); - // - // expect(effects.initSearch$).toBeObservable(expected); - // }); - // - // it('should not dispatch action when step changed on same search', () => { - // mockDatasetSelectorSelectDatasetNameByRoute = store.overrideSelector( - // datasetSelector.selectDatasetNameByRoute, '' - // ); - // - // const action = searchActions.initSearch(); - // const outcome = { type: '[No Action] Init Search' }; - // - // actions = hot('-a', { a: action }); - // const expected = cold('-b', { b: outcome }); - // - // expect(effects.initSearch$).toBeObservable(expected); - // }); }); describe('restartSearch$ effect', () => { @@ -487,86 +419,4 @@ describe('SearchMultipleEffects', () => { expect(spy).toHaveBeenCalledWith('Loading Failed', 'The search multiple data length loading failed'); }); }); - - // describe('retrieveData$ effect', () => { - // it('should dispatch the retrieveDataSuccess action on success', () => { - // const action = searchActions.retrieveData( { - // pagination: { dname: 'myDatasetName', page: 1, nbItems: 10, sortedCol: 1, order: PaginationOrder.a } - // }); - // const outcome = searchActions.retrieveDataSuccess({ data: ['data'] }); - // - // actions = hot('-a', { a: action }); - // const response = cold('-b|', { b: ['data'] }); - // const expected = cold('--c', { c: outcome }); - // searchService.retrieveData = jest.fn(() => response); - // - // expect(effects.retrieveData$).toBeObservable(expected); - // }); - // - // it('should dispatch the retrieveDataFail action on failure', () => { - // const action = searchActions.retrieveData({ - // pagination: { dname: 'myDatasetName', page: 1, nbItems: 10, sortedCol: 1, order: PaginationOrder.a } - // }); - // const error = new Error(); - // const outcome = searchActions.retrieveDataFail(); - // - // actions = hot('-a', { a: action }); - // const response = cold('-#|', {}, error); - // const expected = cold('--b', { b: outcome }); - // searchService.retrieveData = jest.fn(() => response); - // - // expect(effects.retrieveData$).toBeObservable(expected); - // }); - // - // it('should pass correct query to the service', () => { - // mockDatasetSelectorSelectDatasetNameByRoute = store.overrideSelector( - // datasetSelector.selectDatasetNameByRoute, 'myDataset' - // ); - // mockSearchSelectorSelectCriteriaList = store.overrideSelector( - // searchSelector.selectCriteriaList, [{'id':1,'type':'field','operator':'eq','value':'one'} as Criterion] - // ); - // mockConeSearchSelectorSelectConeSearch = store.overrideSelector( - // coneSearchSelector.selectConeSearch, { ra: 1, dec: 2, radius: 3 } - // ); - // mockSearchSelectorSelectOutputList = store.overrideSelector( - // searchSelector.selectOutputList, [1, 2] - // ); - // - // jest.spyOn(searchService, 'retrieveData'); - // - // const action = searchActions.retrieveData({ - // pagination: { dname: 'myDatasetName', page: 1, nbItems: 10, sortedCol: 1, order: PaginationOrder.a } - // }); - // const outcome = searchActions.retrieveDataSuccess({ data: ['data'] }); - // - // actions = hot('-a', { a: action }); - // const response = cold('-b|', { b: ['data'] }); - // const expected = cold('--c', { c: outcome }); - // searchService.retrieveData = jest.fn(() => response); - // - // expect(effects.retrieveData$).toBeObservable(expected); - // expect(searchService.retrieveData).toHaveBeenCalledTimes(1); - // expect(searchService.retrieveData).toHaveBeenCalledWith('myDataset?a=1;2&c=1::eq::one&cs=1:2:3&p=10:1&o=1:a'); - // }); - // }); - - // describe('retrieveDataFail$ effect', () => { - // it('should not dispatch', () => { - // expect(metadata.retrieveDataFail$).toEqual( - // expect.objectContaining({ dispatch: false }) - // ); - // }); - // - // it('should display a error notification', () => { - // const spy = jest.spyOn(toastr, 'error'); - // const action = searchActions.retrieveDataFail(); - // - // actions = hot('a', { a: action }); - // const expected = cold('a', { a: action }); - // - // expect(effects.retrieveDataFail$).toBeObservable(expected); - // expect(spy).toHaveBeenCalledTimes(1); - // expect(spy).toHaveBeenCalledWith('Loading Failed', 'The search data loading failed'); - // }); - // }); }); -- GitLab