From 3ad0c4d009a16dece040d26475ddaf79759e149d Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 27 Mar 2021 10:49:23 +0100 Subject: [PATCH] Deleted modals that were used to edit short URLs, since now there's a dedicated section --- src/short-urls/helpers/EditMetaModal.tsx | 101 --------------- src/short-urls/helpers/EditShortUrlModal.tsx | 56 --------- src/short-urls/helpers/EditTagsModal.tsx | 53 -------- src/short-urls/helpers/ShortUrlsRowMenu.tsx | 27 ---- src/short-urls/services/provideServices.ts | 23 +--- .../short-urls/helpers/EditMetaModal.test.tsx | 84 ------------- .../helpers/EditShortUrlModal.test.tsx | 80 ------------ .../short-urls/helpers/EditTagsModal.test.tsx | 119 ------------------ .../helpers/ShortUrlsRowMenu.test.tsx | 22 +--- 9 files changed, 4 insertions(+), 561 deletions(-) delete mode 100644 src/short-urls/helpers/EditMetaModal.tsx delete mode 100644 src/short-urls/helpers/EditShortUrlModal.tsx delete mode 100644 src/short-urls/helpers/EditTagsModal.tsx delete mode 100644 test/short-urls/helpers/EditMetaModal.test.tsx delete mode 100644 test/short-urls/helpers/EditShortUrlModal.test.tsx delete mode 100644 test/short-urls/helpers/EditTagsModal.test.tsx diff --git a/src/short-urls/helpers/EditMetaModal.tsx b/src/short-urls/helpers/EditMetaModal.tsx deleted file mode 100644 index 688cf9be..00000000 --- a/src/short-urls/helpers/EditMetaModal.tsx +++ /dev/null @@ -1,101 +0,0 @@ -import { ChangeEvent, useState } from 'react'; -import { Modal, ModalBody, ModalFooter, ModalHeader, FormGroup, Input, UncontrolledTooltip } from 'reactstrap'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { faInfoCircle as infoIcon } from '@fortawesome/free-solid-svg-icons'; -import { ExternalLink } from 'react-external-link'; -import moment from 'moment'; -import { isEmpty, pipe } from 'ramda'; -import { ShortUrlMetaEdition } from '../reducers/shortUrlMeta'; -import DateInput from '../../utils/DateInput'; -import { formatIsoDate } from '../../utils/helpers/date'; -import { ShortUrl, ShortUrlMeta, ShortUrlModalProps } from '../data'; -import { handleEventPreventingDefault, Nullable, OptionalString } from '../../utils/utils'; -import { Result } from '../../utils/Result'; -import { ShlinkApiError } from '../../api/ShlinkApiError'; - -interface EditMetaModalConnectProps extends ShortUrlModalProps { - shortUrlMeta: ShortUrlMetaEdition; - resetShortUrlMeta: () => void; - editShortUrlMeta: (shortCode: string, domain: OptionalString, meta: Nullable) => Promise; -} - -const dateOrNull = (shortUrl: ShortUrl | undefined, dateName: 'validSince' | 'validUntil') => { - const date = shortUrl?.meta?.[dateName]; - - return date ? moment(date) : null; -}; - -const EditMetaModal = ( - { isOpen, toggle, shortUrl, shortUrlMeta, editShortUrlMeta, resetShortUrlMeta }: EditMetaModalConnectProps, -) => { - const { saving, error, errorData } = shortUrlMeta; - const url = shortUrl && (shortUrl.shortUrl || ''); - const [ validSince, setValidSince ] = useState(dateOrNull(shortUrl, 'validSince')); - const [ validUntil, setValidUntil ] = useState(dateOrNull(shortUrl, 'validUntil')); - const [ maxVisits, setMaxVisits ] = useState(shortUrl?.meta?.maxVisits); - - const close = pipe(resetShortUrlMeta, toggle); - const doEdit = async () => editShortUrlMeta(shortUrl.shortCode, shortUrl.domain, { - maxVisits: maxVisits && !isEmpty(maxVisits) ? maxVisits : null, - validSince: validSince && formatIsoDate(validSince), - validUntil: validUntil && formatIsoDate(validUntil), - }).then(close); - - return ( - - - Edit metadata for - -

Using these metadata properties, you can limit when and how many times your short URL can be visited.

-

If any of the params is not met, the URL will behave as if it was an invalid short URL.

- - -
- - - - - - - - - ) => setMaxVisits(Number(e.target.value))} - /> - - - {error && ( - - - - )} - - - - - -
- - ); -}; - -export default EditMetaModal; diff --git a/src/short-urls/helpers/EditShortUrlModal.tsx b/src/short-urls/helpers/EditShortUrlModal.tsx deleted file mode 100644 index 8c9c31d0..00000000 --- a/src/short-urls/helpers/EditShortUrlModal.tsx +++ /dev/null @@ -1,56 +0,0 @@ -import { useState } from 'react'; -import { Modal, ModalBody, ModalFooter, ModalHeader, FormGroup, Input, Button } from 'reactstrap'; -import { ExternalLink } from 'react-external-link'; -import { ShortUrlEdition } from '../reducers/shortUrlEdition'; -import { handleEventPreventingDefault, hasValue, OptionalString } from '../../utils/utils'; -import { EditShortUrlData, ShortUrlModalProps } from '../data'; -import { Result } from '../../utils/Result'; -import { ShlinkApiError } from '../../api/ShlinkApiError'; - -interface EditShortUrlModalProps extends ShortUrlModalProps { - shortUrlEdition: ShortUrlEdition; - editShortUrl: (shortUrl: string, domain: OptionalString, data: EditShortUrlData) => Promise; -} - -const EditShortUrlModal = ({ isOpen, toggle, shortUrl, shortUrlEdition, editShortUrl }: EditShortUrlModalProps) => { - const { saving, error, errorData } = shortUrlEdition; - const url = shortUrl?.shortUrl ?? ''; - const [ longUrl, setLongUrl ] = useState(shortUrl.longUrl); - - const doEdit = async () => editShortUrl(shortUrl.shortCode, shortUrl.domain, { longUrl }).then(toggle); - - return ( - - - Edit long URL for - -
- - - setLongUrl(e.target.value)} - /> - - {error && ( - - - - )} - - - - - -
- - ); -}; - -export default EditShortUrlModal; diff --git a/src/short-urls/helpers/EditTagsModal.tsx b/src/short-urls/helpers/EditTagsModal.tsx deleted file mode 100644 index a390499c..00000000 --- a/src/short-urls/helpers/EditTagsModal.tsx +++ /dev/null @@ -1,53 +0,0 @@ -import { FC, useEffect, useState } from 'react'; -import { Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap'; -import { ExternalLink } from 'react-external-link'; -import { ShortUrlTags } from '../reducers/shortUrlTags'; -import { ShortUrlModalProps } from '../data'; -import { OptionalString } from '../../utils/utils'; -import { TagsSelectorProps } from '../../tags/helpers/TagsSelector'; -import { Result } from '../../utils/Result'; -import { ShlinkApiError } from '../../api/ShlinkApiError'; - -interface EditTagsModalProps extends ShortUrlModalProps { - shortUrlTags: ShortUrlTags; - editShortUrlTags: (shortCode: string, domain: OptionalString, tags: string[]) => Promise; - resetShortUrlsTags: () => void; -} - -const EditTagsModal = (TagsSelector: FC) => ( - { isOpen, toggle, shortUrl, shortUrlTags, editShortUrlTags, resetShortUrlsTags }: EditTagsModalProps, -) => { - const [ selectedTags, setSelectedTags ] = useState(shortUrl.tags || []); - - useEffect(() => resetShortUrlsTags, []); - - const { saving, error, errorData } = shortUrlTags; - const url = shortUrl?.shortUrl ?? ''; - const saveTags = async () => editShortUrlTags(shortUrl.shortCode, shortUrl.domain, selectedTags) - .then(toggle) - .catch(() => {}); - - return ( - - - Edit tags for - - - - {error && ( - - - - )} - - - - - - - ); -}; - -export default EditTagsModal; diff --git a/src/short-urls/helpers/ShortUrlsRowMenu.tsx b/src/short-urls/helpers/ShortUrlsRowMenu.tsx index 684d56bb..d97d5d4d 100644 --- a/src/short-urls/helpers/ShortUrlsRowMenu.tsx +++ b/src/short-urls/helpers/ShortUrlsRowMenu.tsx @@ -1,18 +1,15 @@ import { - faTags as tagsIcon, faChartPie as pieChartIcon, faEllipsisV as menuIcon, faQrcode as qrIcon, faMinusCircle as deleteIcon, faEdit as editIcon, - faLink as linkIcon, } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { FC } from 'react'; import { ButtonDropdown, DropdownItem, DropdownMenu, DropdownToggle } from 'reactstrap'; import { useToggle } from '../../utils/helpers/hooks'; import { ShortUrl, ShortUrlModalProps } from '../data'; -import { Versions } from '../../utils/helpers/version'; import { SelectedServer } from '../../servers/data'; import ShortUrlDetailLink from './ShortUrlDetailLink'; import './ShortUrlsRowMenu.scss'; @@ -25,18 +22,11 @@ type ShortUrlModal = FC; const ShortUrlsRowMenu = ( DeleteShortUrlModal: ShortUrlModal, - EditTagsModal: ShortUrlModal, - EditMetaModal: ShortUrlModal, - EditShortUrlModal: ShortUrlModal, QrCodeModal: ShortUrlModal, - ForServerVersion: FC, ) => ({ shortUrl, selectedServer }: ShortUrlsRowMenuProps) => { const [ isOpen, toggle ] = useToggle(); const [ isQrModalOpen, toggleQrCode ] = useToggle(); - const [ isTagsModalOpen, toggleTags ] = useToggle(); - const [ isMetaModalOpen, toggleMeta ] = useToggle(); const [ isDeleteModalOpen, toggleDelete ] = useToggle(); - const [ isEditModalOpen, toggleEdit ] = useToggle(); return ( @@ -52,23 +42,6 @@ const ShortUrlsRowMenu = ( Edit short URL - - Edit tags - - - - - Edit metadata - - - - - - Edit long URL - - - - QR code diff --git a/src/short-urls/services/provideServices.ts b/src/short-urls/services/provideServices.ts index dc2188b7..927ae87b 100644 --- a/src/short-urls/services/provideServices.ts +++ b/src/short-urls/services/provideServices.ts @@ -6,9 +6,6 @@ import ShortUrlsRow from '../helpers/ShortUrlsRow'; import ShortUrlsRowMenu from '../helpers/ShortUrlsRowMenu'; import CreateShortUrl from '../CreateShortUrl'; import DeleteShortUrlModal from '../helpers/DeleteShortUrlModal'; -import EditTagsModal from '../helpers/EditTagsModal'; -import EditMetaModal from '../helpers/EditMetaModal'; -import EditShortUrlModal from '../helpers/EditShortUrlModal'; import CreateShortUrlResult from '../helpers/CreateShortUrlResult'; import { listShortUrls } from '../reducers/shortUrlsList'; import { createShortUrl, resetCreateShortUrl } from '../reducers/shortUrlCreation'; @@ -37,16 +34,7 @@ const provideServices = (bottle: Bottle, connect: ConnectDecorator) => { bottle.serviceFactory('ShortUrlsTable', ShortUrlsTable, 'ShortUrlsRow'); bottle.serviceFactory('ShortUrlsRow', ShortUrlsRow, 'ShortUrlsRowMenu', 'ColorGenerator', 'useStateFlagTimeout'); - bottle.serviceFactory( - 'ShortUrlsRowMenu', - ShortUrlsRowMenu, - 'DeleteShortUrlModal', - 'EditTagsModal', - 'EditMetaModal', - 'EditShortUrlModal', - 'QrCodeModal', - 'ForServerVersion', - ); + bottle.serviceFactory('ShortUrlsRowMenu', ShortUrlsRowMenu, 'DeleteShortUrlModal', 'QrCodeModal'); bottle.serviceFactory('CreateShortUrlResult', CreateShortUrlResult, 'useStateFlagTimeout'); bottle.serviceFactory('ShortUrlForm', ShortUrlForm, 'TagsSelector', 'ForServerVersion', 'DomainSelector'); @@ -65,15 +53,6 @@ const provideServices = (bottle: Bottle, connect: ConnectDecorator) => { bottle.serviceFactory('DeleteShortUrlModal', () => DeleteShortUrlModal); bottle.decorator('DeleteShortUrlModal', connect([ 'shortUrlDeletion' ], [ 'deleteShortUrl', 'resetDeleteShortUrl' ])); - bottle.serviceFactory('EditTagsModal', EditTagsModal, 'TagsSelector'); - bottle.decorator('EditTagsModal', connect([ 'shortUrlTags' ], [ 'editShortUrlTags', 'resetShortUrlsTags' ])); - - bottle.serviceFactory('EditMetaModal', () => EditMetaModal); - bottle.decorator('EditMetaModal', connect([ 'shortUrlMeta' ], [ 'editShortUrlMeta', 'resetShortUrlMeta' ])); - - bottle.serviceFactory('EditShortUrlModal', () => EditShortUrlModal); - bottle.decorator('EditShortUrlModal', connect([ 'shortUrlEdition' ], [ 'editShortUrl' ])); - bottle.serviceFactory('QrCodeModal', () => QrCodeModal); bottle.decorator('QrCodeModal', connect([ 'selectedServer' ])); diff --git a/test/short-urls/helpers/EditMetaModal.test.tsx b/test/short-urls/helpers/EditMetaModal.test.tsx deleted file mode 100644 index b5553125..00000000 --- a/test/short-urls/helpers/EditMetaModal.test.tsx +++ /dev/null @@ -1,84 +0,0 @@ -import { shallow, ShallowWrapper } from 'enzyme'; -import { FormGroup } from 'reactstrap'; -import { Mock } from 'ts-mockery'; -import EditMetaModal from '../../../src/short-urls/helpers/EditMetaModal'; -import { ShortUrl } from '../../../src/short-urls/data'; -import { ShortUrlMetaEdition } from '../../../src/short-urls/reducers/shortUrlMeta'; -import { Result } from '../../../src/utils/Result'; - -describe('', () => { - let wrapper: ShallowWrapper; - const editShortUrlMeta = jest.fn(async () => Promise.resolve()); - const resetShortUrlMeta = jest.fn(); - const toggle = jest.fn(); - const createWrapper = (shortUrlMeta: Partial) => { - wrapper = shallow( - ()} - shortUrlMeta={Mock.of(shortUrlMeta)} - toggle={toggle} - editShortUrlMeta={editShortUrlMeta} - resetShortUrlMeta={resetShortUrlMeta} - />, - ); - - return wrapper; - }; - - afterEach(() => wrapper?.unmount()); - afterEach(jest.clearAllMocks); - - it('properly renders form with components', () => { - const wrapper = createWrapper({ saving: false, error: false }); - const error = wrapper.find(Result).filterWhere((result) => result.prop('type') === 'error'); - const form = wrapper.find('form'); - const formGroup = form.find(FormGroup); - - expect(form).toHaveLength(1); - expect(formGroup).toHaveLength(3); - expect(error).toHaveLength(0); - }); - - it.each([ - [ true, 'Saving...' ], - [ false, 'Save' ], - ])('renders submit button on expected state', (saving, expectedText) => { - const wrapper = createWrapper({ saving, error: false }); - const button = wrapper.find('[type="submit"]'); - - expect(button.prop('disabled')).toEqual(saving); - expect(button.text()).toContain(expectedText); - }); - - it('renders error message on error', () => { - const wrapper = createWrapper({ saving: false, error: true }); - const error = wrapper.find(Result).filterWhere((result) => result.prop('type') === 'error'); - - expect(error).toHaveLength(1); - }); - - it('saves meta when form is submit', () => { - const preventDefault = jest.fn(); - const wrapper = createWrapper({ saving: false, error: false }); - const form = wrapper.find('form'); - - form.simulate('submit', { preventDefault }); - - expect(preventDefault).toHaveBeenCalled(); - expect(editShortUrlMeta).toHaveBeenCalled(); - }); - - it.each([ - [ '.btn-link', 'onClick' ], - [ 'Modal', 'toggle' ], - [ 'ModalHeader', 'toggle' ], - ])('resets meta when modal is toggled in any way', (componentToFind, propToCall) => { - const wrapper = createWrapper({ saving: false, error: false }); - const component = wrapper.find(componentToFind); - - (component.prop(propToCall) as Function)(); // eslint-disable-line @typescript-eslint/no-unnecessary-type-assertion - - expect(resetShortUrlMeta).toHaveBeenCalled(); - }); -}); diff --git a/test/short-urls/helpers/EditShortUrlModal.test.tsx b/test/short-urls/helpers/EditShortUrlModal.test.tsx deleted file mode 100644 index 2ab14c4b..00000000 --- a/test/short-urls/helpers/EditShortUrlModal.test.tsx +++ /dev/null @@ -1,80 +0,0 @@ -import { shallow, ShallowWrapper } from 'enzyme'; -import { FormGroup } from 'reactstrap'; -import { Mock } from 'ts-mockery'; -import EditShortUrlModal from '../../../src/short-urls/helpers/EditShortUrlModal'; -import { ShortUrl } from '../../../src/short-urls/data'; -import { ShortUrlEdition } from '../../../src/short-urls/reducers/shortUrlEdition'; -import { Result } from '../../../src/utils/Result'; - -describe('', () => { - let wrapper: ShallowWrapper; - const editShortUrl = jest.fn(async () => Promise.resolve()); - const toggle = jest.fn(); - const createWrapper = (shortUrl: Partial, shortUrlEdition: Partial) => { - wrapper = shallow( - (shortUrl)} - shortUrlEdition={Mock.of(shortUrlEdition)} - toggle={toggle} - editShortUrl={editShortUrl} - />, - ); - - return wrapper; - }; - - afterEach(() => wrapper?.unmount()); - afterEach(jest.clearAllMocks); - - it.each([ - [ false, 0 ], - [ true, 1 ], - ])('properly renders form with expected components', (error, expectedErrorLength) => { - const wrapper = createWrapper({}, { saving: false, error }); - const errorElement = wrapper.find(Result).filterWhere((result) => result.prop('type') === 'error'); - const form = wrapper.find('form'); - const formGroup = form.find(FormGroup); - - expect(form).toHaveLength(1); - expect(formGroup).toHaveLength(1); - expect(errorElement).toHaveLength(expectedErrorLength); - }); - - it.each([ - [ true, 'Saving...', 'something', true ], - [ true, 'Saving...', undefined, true ], - [ false, 'Save', 'something', false ], - [ false, 'Save', undefined, true ], - ])('renders submit button on expected state', (saving, expectedText, longUrl, expectedDisabled) => { - const wrapper = createWrapper({ longUrl }, { saving, error: false }); - const button = wrapper.find('[color="primary"]'); - - expect(button.prop('disabled')).toEqual(expectedDisabled); - expect(button.html()).toContain(expectedText); - }); - - it('saves data when form is submit', () => { - const preventDefault = jest.fn(); - const wrapper = createWrapper({}, { saving: false, error: false }); - const form = wrapper.find('form'); - - form.simulate('submit', { preventDefault }); - - expect(preventDefault).toHaveBeenCalled(); - expect(editShortUrl).toHaveBeenCalled(); - }); - - it.each([ - [ '[color="link"]', 'onClick' ], - [ 'Modal', 'toggle' ], - [ 'ModalHeader', 'toggle' ], - ])('toggles modal with different mechanisms', (componentToFind, propToCall) => { - const wrapper = createWrapper({}, { saving: false, error: false }); - const component = wrapper.find(componentToFind); - - (component.prop(propToCall) as Function)(); // eslint-disable-line @typescript-eslint/no-unnecessary-type-assertion - - expect(toggle).toHaveBeenCalled(); - }); -}); diff --git a/test/short-urls/helpers/EditTagsModal.test.tsx b/test/short-urls/helpers/EditTagsModal.test.tsx deleted file mode 100644 index d145331c..00000000 --- a/test/short-urls/helpers/EditTagsModal.test.tsx +++ /dev/null @@ -1,119 +0,0 @@ -import { shallow, ShallowWrapper } from 'enzyme'; -import { Mock } from 'ts-mockery'; -import { Modal } from 'reactstrap'; -import createEditTagsModal from '../../../src/short-urls/helpers/EditTagsModal'; -import { ShortUrl } from '../../../src/short-urls/data'; -import { ShortUrlTags } from '../../../src/short-urls/reducers/shortUrlTags'; -import { OptionalString } from '../../../src/utils/utils'; - -describe('', () => { - let wrapper: ShallowWrapper; - const shortCode = 'abc123'; - const TagsSelector = () => null; - const editShortUrlTags = jest.fn(async () => Promise.resolve()); - const resetShortUrlsTags = jest.fn(); - const toggle = jest.fn(); - const createWrapper = (shortUrlTags: ShortUrlTags, domain?: OptionalString) => { - const EditTagsModal = createEditTagsModal(TagsSelector); - - wrapper = shallow( - ({ - tags: [], - shortCode, - domain, - longUrl: 'https://long-domain.com/foo/bar', - })} - shortUrlTags={shortUrlTags} - toggle={toggle} - editShortUrlTags={editShortUrlTags} - resetShortUrlsTags={resetShortUrlsTags} - />, - ); - - return wrapper; - }; - - afterEach(() => wrapper?.unmount()); - afterEach(jest.clearAllMocks); - - it('renders tags selector and save button when loaded', () => { - const wrapper = createWrapper({ - shortCode, - tags: [], - saving: false, - error: false, - }); - const saveBtn = wrapper.find('.btn-primary'); - - expect(wrapper.find(TagsSelector)).toHaveLength(1); - expect(saveBtn.prop('disabled')).toBe(false); - expect(saveBtn.text()).toEqual('Save tags'); - }); - - it('disables save button when saving is in progress', () => { - const wrapper = createWrapper({ - shortCode, - tags: [], - saving: true, - error: false, - }); - const saveBtn = wrapper.find('.btn-primary'); - - expect(saveBtn.prop('disabled')).toBe(true); - expect(saveBtn.text()).toEqual('Saving tags...'); - }); - - it.each([ - [ undefined ], - [ null ], - [ 'example.com' ], - // @ts-expect-error Type declaration is not correct, which makes "done" function not being properly detected - ])('saves tags when save button is clicked', (domain: OptionalString, done: jest.DoneCallback) => { - const wrapper = createWrapper({ - shortCode, - tags: [], - saving: true, - error: false, - }, domain); - const saveBtn = wrapper.find('.btn-primary'); - - saveBtn.simulate('click'); - - expect(editShortUrlTags).toHaveBeenCalledTimes(1); - expect(editShortUrlTags).toHaveBeenCalledWith(shortCode, domain, []); - - // Wrap this expect in a setImmediate since it is called as a result of an inner promise - setImmediate(() => { - expect(toggle).toHaveBeenCalledTimes(1); - done(); - }); - }); - - it('does not notify tags have been edited when window is closed without saving', () => { - const wrapper = createWrapper({ - shortCode, - tags: [], - saving: false, - error: false, - }); - const modal = wrapper.find(Modal); - - modal.simulate('closed'); - expect(editShortUrlTags).not.toHaveBeenCalled(); - }); - - it('toggles modal when cancel button is clicked', () => { - const wrapper = createWrapper({ - shortCode, - tags: [], - saving: true, - error: false, - }); - const cancelBtn = wrapper.find('.btn-link'); - - cancelBtn.simulate('click'); - expect(toggle).toHaveBeenCalledTimes(1); - }); -}); diff --git a/test/short-urls/helpers/ShortUrlsRowMenu.test.tsx b/test/short-urls/helpers/ShortUrlsRowMenu.test.tsx index c25c7382..08270a26 100644 --- a/test/short-urls/helpers/ShortUrlsRowMenu.test.tsx +++ b/test/short-urls/helpers/ShortUrlsRowMenu.test.tsx @@ -8,9 +8,6 @@ import { ShortUrl } from '../../../src/short-urls/data'; describe('', () => { let wrapper: ShallowWrapper; const DeleteShortUrlModal = () => null; - const EditTagsModal = () => null; - const EditMetaModal = () => null; - const EditShortUrlModal = () => null; const QrCodeModal = () => null; const selectedServer = Mock.of({ id: 'abc123' }); const shortUrl = Mock.of({ @@ -18,14 +15,7 @@ describe('', () => { shortUrl: 'https://doma.in/abc123', }); const createWrapper = () => { - const ShortUrlsRowMenu = createShortUrlsRowMenu( - DeleteShortUrlModal, - EditTagsModal, - EditMetaModal, - EditShortUrlModal, - QrCodeModal, - () => null, - ); + const ShortUrlsRowMenu = createShortUrlsRowMenu(DeleteShortUrlModal, QrCodeModal); wrapper = shallow(); @@ -37,21 +27,17 @@ describe('', () => { it('renders modal windows', () => { const wrapper = createWrapper(); const deleteShortUrlModal = wrapper.find(DeleteShortUrlModal); - const editTagsModal = wrapper.find(EditTagsModal); const qrCodeModal = wrapper.find(QrCodeModal); - const editModal = wrapper.find(EditShortUrlModal); expect(deleteShortUrlModal).toHaveLength(1); - expect(editTagsModal).toHaveLength(1); expect(qrCodeModal).toHaveLength(1); - expect(editModal).toHaveLength(1); }); it('renders correct amount of menu items', () => { const wrapper = createWrapper(); const items = wrapper.find(DropdownItem); - expect(items).toHaveLength(8); + expect(items).toHaveLength(5); expect(items.find('[divider]')).toHaveLength(1); }); @@ -65,9 +51,7 @@ describe('', () => { }; it('DeleteShortUrlModal', () => assert(DeleteShortUrlModal)); - it('EditTagsModal', () => assert(EditTagsModal)); it('QrCodeModal', () => assert(QrCodeModal)); - it('EditShortUrlModal', () => assert(EditShortUrlModal)); - it('EditShortUrlModal', () => assert(ButtonDropdown)); + it('ShortUrlRowMenu', () => assert(ButtonDropdown)); }); });