Deleted modals that were used to edit short URLs, since now there's a dedicated section

test/short-urls/helpers/EditMetaModal.test.tsx

@@ -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('<EditMetaModal />', () => {
-  let wrapper: ShallowWrapper;
-  const editShortUrlMeta = jest.fn(async () => Promise.resolve());
-  const resetShortUrlMeta = jest.fn();
-  const toggle = jest.fn();
-  const createWrapper = (shortUrlMeta: Partial<ShortUrlMetaEdition>) => {
-    wrapper = shallow(
-      <EditMetaModal
-        isOpen={true}
-        shortUrl={Mock.all<ShortUrl>()}
-        shortUrlMeta={Mock.of<ShortUrlMetaEdition>(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();
-  });
-});

test/short-urls/helpers/EditShortUrlModal.test.tsx

@@ -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('<EditShortUrlModal />', () => {
-  let wrapper: ShallowWrapper;
-  const editShortUrl = jest.fn(async () => Promise.resolve());
-  const toggle = jest.fn();
-  const createWrapper = (shortUrl: Partial<ShortUrl>, shortUrlEdition: Partial<ShortUrlEdition>) => {
-    wrapper = shallow(
-      <EditShortUrlModal
-        isOpen={true}
-        shortUrl={Mock.of<ShortUrl>(shortUrl)}
-        shortUrlEdition={Mock.of<ShortUrlEdition>(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();
-  });
-});

test/short-urls/helpers/EditTagsModal.test.tsx

@@ -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('<EditTagsModal />', () => {
-  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(
-      <EditTagsModal
-        isOpen={true}
-        shortUrl={Mock.of<ShortUrl>({
-          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);
-  });
-});

test/short-urls/helpers/ShortUrlsRowMenu.test.tsx

@@ -8,9 +8,6 @@ import { ShortUrl } from '../../../src/short-urls/data';
 describe('<ShortUrlsRowMenu />', () => {
   let wrapper: ShallowWrapper;
   const DeleteShortUrlModal = () => null;
-  const EditTagsModal = () => null;
-  const EditMetaModal = () => null;
-  const EditShortUrlModal = () => null;
   const QrCodeModal = () => null;
   const selectedServer = Mock.of<ReachableServer>({ id: 'abc123' });
   const shortUrl = Mock.of<ShortUrl>({
@@ -18,14 +15,7 @@ describe('<ShortUrlsRowMenu />', () => {
     shortUrl: 'https://doma.in/abc123',
   });
   const createWrapper = () => {
-    const ShortUrlsRowMenu = createShortUrlsRowMenu(
-      DeleteShortUrlModal,
-      EditTagsModal,
-      EditMetaModal,
-      EditShortUrlModal,
-      QrCodeModal,
-      () => null,
-    );
+    const ShortUrlsRowMenu = createShortUrlsRowMenu(DeleteShortUrlModal, QrCodeModal);
 
     wrapper = shallow(<ShortUrlsRowMenu selectedServer={selectedServer} shortUrl={shortUrl} />);
 
@@ -37,21 +27,17 @@ describe('<ShortUrlsRowMenu />', () => {
   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('<ShortUrlsRowMenu />', () => {
     };
 
     it('DeleteShortUrlModal', () => assert(DeleteShortUrlModal));
-    it('EditTagsModal', () => assert(EditTagsModal));
     it('QrCodeModal', () => assert(QrCodeModal));
-    it('EditShortUrlModal', () => assert(EditShortUrlModal));
-    it('EditShortUrlModal', () => assert(ButtonDropdown));
+    it('ShortUrlRowMenu', () => assert(ButtonDropdown));
   });
 });