From b7558dc54b30c214bd60ef35776b0d4a7c2f1c87 Mon Sep 17 00:00:00 2001 From: mahmoud adel <58145645+mahmoudadel54@users.noreply.github.com> Date: Wed, 6 Nov 2024 12:49:37 +0200 Subject: [PATCH] #10648: fix FE test failure for - Issue editing multiple fields in MapStore Attribute Table (#10654) * #10648: fix FE tests failure for savePendingFeatureGridChanges * #10648: remove unit test of 'savePendingFeatureGridChanges' --- .../epics/__tests__/featuregrid-test.js | 100 +----------------- 1 file changed, 2 insertions(+), 98 deletions(-) diff --git a/web/client/epics/__tests__/featuregrid-test.js b/web/client/epics/__tests__/featuregrid-test.js index 72c7193a99..fad283631f 100644 --- a/web/client/epics/__tests__/featuregrid-test.js +++ b/web/client/epics/__tests__/featuregrid-test.js @@ -60,10 +60,7 @@ import { launchUpdateFilterFunc, LAUNCH_UPDATE_FILTER_FUNC, setLayer, - setViewportFilter, SET_VIEWPORT_FILTER, - SAVING, - saveChanges, - SAVE_SUCCESS + setViewportFilter, SET_VIEWPORT_FILTER } from '../../actions/featuregrid'; import { SET_HIGHLIGHT_FEATURES_PATH } from '../../actions/highlight'; @@ -144,16 +141,12 @@ import { toggleSnappingOffOnFeatureGridViewMode, closeFeatureGridOnDrawingToolOpen, setViewportFilterEpic, - deactivateViewportFilterEpic, resetViewportFilter, - savePendingFeatureGridChanges + deactivateViewportFilterEpic, resetViewportFilter } from '../featuregrid'; import { onLocationChanged } from 'connected-react-router'; import { TEST_TIMEOUT, testEpic, addTimeoutEpic } from './epicTestUtils'; import { getDefaultFeatureProjection } from '../../utils/FeatureGridUtils'; import { isEmpty, isNil } from 'lodash'; -import axios from "../../libs/ajax"; -import MockAdapter from "axios-mock-adapter"; - const filterObj = { featureTypeName: 'TEST', groupFields: [ @@ -1829,95 +1822,6 @@ describe('featuregrid Epics', () => { })); }); describe('updateSelectedOnSaveOrCloseFeatureGrid', () => { - let mockAxios; - beforeEach(() => { - mockAxios = new MockAdapter(axios); - }); - afterEach(() => { - mockAxios.restore(); - }); - it("test savePendingFeatureGridChanges", (done) => { - const stateFeaturegrid = { - query: { - featureTypes: { - "mapstore:TEST_LAYER": { - "original": { - "elementFormDefault": "qualified", - "targetNamespace": "http://localhost:8080/geoserver/mapstore", - "targetPrefix": "mapstore", - "featureTypes": [ - { - "typeName": "TEST_LAYER", - "properties": [ - { - "name": "Integer", - "maxOccurs": 1, - "minOccurs": 0, - "nillable": true, - "type": "xsd:int", - "localType": "int" - }, - { - "name": "Long", - "maxOccurs": 1, - "minOccurs": 0, - "nillable": true, - "type": "xsd:int", - "localType": "int" - }, - { - "name": "Point", - "maxOccurs": 1, - "minOccurs": 0, - "nillable": true, - "type": "gml:Point", - "localType": "Point" - } - ] - } - ] - } - } - }, - filterObj: { - featureTypeName: "mapstore:TEST_LAYER" - }, - searchUrl: "https://localhost:8080/geoserver/wfs?authkey=29031b3b8afc" - }, - featuregrid: { - open: true, - selectedLayer: "TEST_LAYER", - mode: 'EDIT', - select: [{id: 'TEST_LAYER', geometry_name: "Point"}], - changes: [ - { - "id": "TEST_LAYER.13", - "updated": { - "Integer": 50 - } - }, - { - "id": "TEST_LAYER.13", - "updated": { - "Long": 55 - } - } - ] - } - }; - const payloadSample = `Integer50,Long55`; - mockAxios.onPost(stateFeaturegrid.query.searchUrl, payloadSample).replyOnce(200); - testEpic( - savePendingFeatureGridChanges, - 2, - saveChanges(), - ([a, b]) => { - expect(a.type).toEqual(SAVING); - expect(b.type).toEqual(SAVE_SUCCESS); - done(); - }, stateFeaturegrid - ); - }); it('on Save', (done) => { testEpic( updateSelectedOnSaveOrCloseFeatureGrid,