From 1eb66b78d3b1f1fc60a82ce6dbd16b12f2845e9a Mon Sep 17 00:00:00 2001 From: svishnev Date: Thu, 11 Jan 2018 14:39:45 +0200 Subject: React version upgrade Issue-ID: SDC-894 Change-Id: I7c200a4b0b1d09a8fec638906db4258cafe252b5 Signed-off-by: svishnev --- .../nfvo-components/SubmitErrorResponse.test.js | 18 +++++------ .../nfvo-components/editor/TabulatedEditor.test.js | 21 ++++++------ .../input/dualListBox/dualListbox.test.js | 21 ++++++------ .../nfvo-components/input/validation/input.test.js | 26 ++++++++------- .../nfvo-components/listEditor/listEditor.test.js | 18 +++++------ .../test/nfvo-components/modal/globalModal.test.js | 37 +++++++++++----------- .../VersionController/versionController.test.js | 22 ++++++------- 7 files changed, 83 insertions(+), 80 deletions(-) (limited to 'openecomp-ui/test/nfvo-components') diff --git a/openecomp-ui/test/nfvo-components/SubmitErrorResponse.test.js b/openecomp-ui/test/nfvo-components/SubmitErrorResponse.test.js index 7231fe4abc..ecb7159ee5 100644 --- a/openecomp-ui/test/nfvo-components/SubmitErrorResponse.test.js +++ b/openecomp-ui/test/nfvo-components/SubmitErrorResponse.test.js @@ -1,22 +1,22 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import TestUtils from 'react-dom/test-utils'; import SubmitErrorResponse from 'nfvo-components/SubmitErrorResponse.jsx'; import {SubmitErrorMessageFactory} from 'test-utils/factories/SubnitErrorMessageFactorie.js'; diff --git a/openecomp-ui/test/nfvo-components/editor/TabulatedEditor.test.js b/openecomp-ui/test/nfvo-components/editor/TabulatedEditor.test.js index 5f9f06b714..505bc91636 100644 --- a/openecomp-ui/test/nfvo-components/editor/TabulatedEditor.test.js +++ b/openecomp-ui/test/nfvo-components/editor/TabulatedEditor.test.js @@ -1,22 +1,23 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import ShallowRenderer from 'react-test-renderer/shallow'; +import TestUtils from 'react-dom/test-utils'; import TabulatedEditor from 'nfvo-components/editor/TabulatedEditor.jsx'; import { Provider } from 'react-redux'; import {storeCreator} from 'sdc-app/AppStore.js'; @@ -24,7 +25,7 @@ import {storeCreator} from 'sdc-app/AppStore.js'; describe('Tabulated Editor test: ', function () { const store = storeCreator(); it('basic view test', () => { - let renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render( ); diff --git a/openecomp-ui/test/nfvo-components/input/dualListBox/dualListbox.test.js b/openecomp-ui/test/nfvo-components/input/dualListBox/dualListbox.test.js index c578178d35..2df15c61b1 100644 --- a/openecomp-ui/test/nfvo-components/input/dualListBox/dualListbox.test.js +++ b/openecomp-ui/test/nfvo-components/input/dualListBox/dualListbox.test.js @@ -1,22 +1,23 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import TestUtils from 'react-dom/test-utils'; import DualListboxView from 'nfvo-components/input/dualListbox/DualListboxView.jsx'; +import ShallowRenderer from 'react-test-renderer/shallow'; const ITEMS = [{id: '1', name: 'aaa'}, {id: '2', name: 'bbb'}, {id: '3', name: 'ccc'}]; @@ -24,7 +25,7 @@ describe('dualListBox Module Tests', function () { it('should render basically', () => { - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render({}}/>); var renderedOutput = renderer.getRenderOutput(); expect(renderedOutput).toBeTruthy(); diff --git a/openecomp-ui/test/nfvo-components/input/validation/input.test.js b/openecomp-ui/test/nfvo-components/input/validation/input.test.js index 7743483603..719e01fb97 100644 --- a/openecomp-ui/test/nfvo-components/input/validation/input.test.js +++ b/openecomp-ui/test/nfvo-components/input/validation/input.test.js @@ -1,24 +1,25 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import TestUtils from 'react-dom/test-utils'; import {scryRenderedDOMComponentsWithTestId} from 'test-utils/Util.js'; import Input from 'nfvo-components/input/validation/Input.jsx'; import Overlay from 'react-bootstrap/lib/Overlay.js'; +import {shallow} from 'enzyme'; describe('Input', function () { it('should render with type text', () => { @@ -72,10 +73,11 @@ describe('Input', function () { }); it('should render error overlay when invalid', () => { - let renderedOutput = TestUtils.renderIntoDocument(); - const elem = TestUtils.findRenderedComponentWithType(renderedOutput,Overlay); + const elem = shallow(); expect(elem).toBeTruthy(); - expect(elem.props.show).toBe(true); + const overlay = elem.find(Overlay); + expect(overlay).toBeTruthy(); + expect(overlay.props().show).toBe(true); }); it('should not render error overlay when valid', () => { diff --git a/openecomp-ui/test/nfvo-components/listEditor/listEditor.test.js b/openecomp-ui/test/nfvo-components/listEditor/listEditor.test.js index b1127386f7..a0c1c9978c 100644 --- a/openecomp-ui/test/nfvo-components/listEditor/listEditor.test.js +++ b/openecomp-ui/test/nfvo-components/listEditor/listEditor.test.js @@ -1,22 +1,22 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; import {mount} from 'enzyme'; -import TestUtils from 'react-addons-test-utils'; +import TestUtils from 'react-dom/test-utils'; import ListEditorView from 'src/nfvo-components/listEditor/ListEditorView.jsx'; import ListEditorItemView from 'src/nfvo-components/listEditor/ListEditorItemView.jsx'; diff --git a/openecomp-ui/test/nfvo-components/modal/globalModal.test.js b/openecomp-ui/test/nfvo-components/modal/globalModal.test.js index f27b1359f8..0636aed6e1 100644 --- a/openecomp-ui/test/nfvo-components/modal/globalModal.test.js +++ b/openecomp-ui/test/nfvo-components/modal/globalModal.test.js @@ -1,22 +1,22 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import GlobalModal, {GlobalModalView, mapStateToProps} from 'src/nfvo-components/modal/GlobalModal.js'; import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import ShallowRenderer from 'react-test-renderer/shallow'; import store from 'sdc-app/AppStore.js'; import {actionTypes, typeEnum} from 'src/nfvo-components/modal/GlobalModalConstants.js'; @@ -31,7 +31,7 @@ describe('Global Modal tests: ', function () { it ('mapStateToProps should return show as true', () => { let state = { modal: { - type: '' + type: '' } }; let props = mapStateToProps(state); @@ -49,15 +49,15 @@ describe('Global Modal tests: ', function () { const modal = store.getState().modal; expect(modal).toBeTruthy(); expect(modal.title).toBe(title); - expect(modal.msg).toBe(msg); + expect(modal.msg).toBe(msg); }); it('global modal should show with type success with connected component', () => { store.dispatch({type: actionTypes.GLOBAL_MODAL_SHOW, data: {title, msg}}); expect(store.getState().modal).toBeTruthy(); - - let renderer = TestUtils.createRenderer(); + + const renderer = new ShallowRenderer(); renderer.render(); let renderedOutput = renderer.getRenderOutput(); expect(renderedOutput).toBeTruthy(); @@ -67,10 +67,9 @@ describe('Global Modal tests: ', function () { it('global modal should show with type success with connected component and closed after', () => { store.dispatch({type: actionTypes.GLOBAL_MODAL_SHOW, data: {title, msg}}); - + expect(store.getState().modal).toBeTruthy(); - - let renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render(); let renderedOutput = renderer.getRenderOutput(); expect(renderedOutput).toBeTruthy(); @@ -82,11 +81,11 @@ describe('Global Modal tests: ', function () { it('checking component default render', ()=> { expect(window.document).toBeTruthy(); - let renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render({}} />); - let globalModalView = renderer.getRenderOutput(); + const globalModalView = renderer.getRenderOutput(); expect(globalModalView).toBeTruthy(); - }); +}); }); diff --git a/openecomp-ui/test/nfvo-components/panel/VersionController/versionController.test.js b/openecomp-ui/test/nfvo-components/panel/VersionController/versionController.test.js index f2db01f3f1..64304ab9de 100644 --- a/openecomp-ui/test/nfvo-components/panel/VersionController/versionController.test.js +++ b/openecomp-ui/test/nfvo-components/panel/VersionController/versionController.test.js @@ -1,23 +1,23 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; - -import TestUtils from 'react-addons-test-utils'; +import ShallowRenderer from 'react-test-renderer/shallow'; +import TestUtils from 'react-dom/test-utils'; import VersionController from 'nfvo-components/panel/versionController/VersionController.jsx'; import {actionsEnum} from 'nfvo-components/panel/versionController/VersionControllerConstants.js'; import {scryRenderedDOMComponentsWithTestId} from 'test-utils/Util.js'; @@ -36,7 +36,7 @@ describe('versionController UI Component', () => { const store = storeCreator(); it('function does exist', () => { - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render(); var renderedOutput = renderer.getRenderOutput(); -- cgit 1.2.3-korg