Simplified EditTagsModal component and shortUrlTags reducer

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

@@ -8,7 +8,6 @@ describe('<EditTagsModal />', () => {
   const shortCode = 'abc123';
   const TagsSelector = () => '';
   const editShortUrlTags = jest.fn(() => Promise.resolve());
-  const shortUrlTagsEdited = jest.fn();
   const resetShortUrlsTags = jest.fn();
   const toggle = jest.fn();
   const createWrapper = (shortUrlTags) => {
@@ -25,7 +24,6 @@ describe('<EditTagsModal />', () => {
         shortUrlTags={shortUrlTags}
         toggle={toggle}
         editShortUrlTags={editShortUrlTags}
-        shortUrlTagsEdited={shortUrlTagsEdited}
         resetShortUrlsTags={resetShortUrlsTags}
       />
     );
@@ -107,28 +105,7 @@ describe('<EditTagsModal />', () => {
     const modal = wrapper.find(Modal);
 
     modal.simulate('closed');
-    expect(shortUrlTagsEdited).not.toHaveBeenCalled();
-  });
-
-  it('notifies tags have been edited when window is closed after saving', (done) => {
-    const wrapper = createWrapper({
-      shortCode,
-      tags: [],
-      saving: true,
-      error: false,
-    });
-    const saveBtn = wrapper.find('.btn-primary');
-    const modal = wrapper.find(Modal);
-
-    saveBtn.simulate('click');
-
-    // Wrap this expect in a setImmediate since it is called as a result of an inner promise
-    setImmediate(() => {
-      modal.simulate('closed');
-      expect(shortUrlTagsEdited).toHaveBeenCalledTimes(1);
-      expect(shortUrlTagsEdited).toHaveBeenCalledWith(shortCode, []);
-      done();
-    });
+    expect(editShortUrlTags).not.toHaveBeenCalled();
   });
 
   it('toggles modal when cancel button is clicked', () => {

test/short-urls/reducers/shortUrlTags.test.js

@@ -1,12 +1,10 @@
 import reducer, {
-  EDIT_SHORT_URL_TAGS,
   EDIT_SHORT_URL_TAGS_ERROR,
   EDIT_SHORT_URL_TAGS_START,
   RESET_EDIT_SHORT_URL_TAGS,
   resetShortUrlsTags,
   SHORT_URL_TAGS_EDITED,
   editShortUrlTags,
-  shortUrlTagsEdited,
 } from '../../../src/short-urls/reducers/shortUrlTags';
 
 describe('shortUrlTagsReducer', () => {
@@ -28,8 +26,8 @@ describe('shortUrlTagsReducer', () => {
       });
     });
 
-    it('returns provided tags and shortCode on EDIT_SHORT_URL_TAGS', () => {
-      expect(reducer({}, { type: EDIT_SHORT_URL_TAGS, tags, shortCode })).toEqual({
+    it('returns provided tags and shortCode on SHORT_URL_TAGS_EDITED', () => {
+      expect(reducer({}, { type: SHORT_URL_TAGS_EDITED, tags, shortCode })).toEqual({
         tags,
         shortCode,
         saving: false,
@@ -51,14 +49,6 @@ describe('shortUrlTagsReducer', () => {
     it('creates expected action', () => expect(resetShortUrlsTags()).toEqual({ type: RESET_EDIT_SHORT_URL_TAGS }));
   });
 
-  describe('shortUrlTagsEdited', () => {
-    it('creates expected action', () => expect(shortUrlTagsEdited(shortCode, tags)).toEqual({
-      tags,
-      shortCode,
-      type: SHORT_URL_TAGS_EDITED,
-    }));
-  });
-
   describe('editShortUrlTags', () => {
     const updateShortUrlTags = jest.fn();
     const buildShlinkApiClient = jest.fn().mockResolvedValue({ updateShortUrlTags });
@@ -82,7 +72,7 @@ describe('shortUrlTagsReducer', () => {
       expect(updateShortUrlTags).toHaveBeenCalledWith(shortCode, tags);
       expect(dispatch).toHaveBeenCalledTimes(2);
       expect(dispatch).toHaveBeenNthCalledWith(1, { type: EDIT_SHORT_URL_TAGS_START });
-      expect(dispatch).toHaveBeenNthCalledWith(2, { type: EDIT_SHORT_URL_TAGS, tags: normalizedTags, shortCode });
+      expect(dispatch).toHaveBeenNthCalledWith(2, { type: SHORT_URL_TAGS_EDITED, tags: normalizedTags, shortCode });
     });
 
     it('dispatches error on failure', async () => {