fixed todos spec

2 files changed, 15 insertions, 28 deletions

diff --git a/app/assets/javascripts/todos.js b/app/assets/javascripts/todos.js
index 3dc0c3f8d43..2fffe09c74e 100644
--- a/app/assets/javascripts/todos.js
+++ b/app/assets/javascripts/todos.js
@@ -138,22 +138,17 @@ export default class Todos {
   goToTodoUrl(e) {
     const todoLink = this.dataset.url;
 
-    if (!todoLink) {
+    if (!todoLink || e.target.tagName === 'A' || e.target.tagName === 'IMG') {
       return;
     }
 
+    e.stopPropagation();
+    e.preventDefault();
+
     if (isMetaClick(e)) {
       const windowTarget = '_blank';
-      const selected = e.target;
-      e.stopPropagation();
-      e.preventDefault();
-
-      if (selected.tagName === 'IMG') {
-        const avatarUrl = selected.parentElement.getAttribute('href');
-        window.open(avatarUrl, windowTarget);
-      } else {
-        window.open(todoLink, windowTarget);
-      }
+
+      window.open(todoLink, windowTarget);
     } else {
       gl.utils.visitUrl(todoLink);
     }
diff --git a/spec/javascripts/todos_spec.js b/spec/javascripts/todos_spec.js
index 207ad2d6f97..7d3c9319a11 100644
--- a/spec/javascripts/todos_spec.js
+++ b/spec/javascripts/todos_spec.js
@@ -26,38 +26,30 @@ describe('Todos', () => {
 
     describe('meta click', () => {
       let visitUrlSpy;
+      let windowOpenSpy;
       let metakeyEvent;
 
       beforeEach(() => {
         metakeyEvent = $.Event('click', { keyCode: 91, ctrlKey: true });
         visitUrlSpy = spyOn(gl.utils, 'visitUrl').and.callFake(() => {});
+        windowOpenSpy = spyOn(window, 'open').and.callFake(() => {});
       });
 
-      it('opens the todo url in another tab', (done) => {
+      it('opens the todo url in another tab', () => {
         const todoLink = todoItem.dataset.url;
 
-        spyOn(window, 'open').and.callFake((url, target) => {
-          expect(todoLink).toEqual(url);
-          expect(target).toEqual('_blank');
-          done();
-        });
-
         $('.todos-list .todo').trigger(metakeyEvent);
+
         expect(visitUrlSpy).not.toHaveBeenCalled();
+        expect(windowOpenSpy).toHaveBeenCalledWith(todoLink, '_blank');
       });
 
-      it('opens the avatar\'s url in another tab when the avatar is clicked', (done) => {
-        const avatarImage = todoItem.querySelector('img');
-        const avatarUrl = avatarImage.parentElement.getAttribute('href');
-
-        spyOn(window, 'open').and.callFake((url, target) => {
-          expect(avatarUrl).toEqual(url);
-          expect(target).toEqual('_blank');
-          done();
-        });
+      it('run native funcionality when avatar is clicked', () => {
+        $('.todos-list a').on('click', e => e.preventDefault());
+        $('.todos-list img').trigger(metakeyEvent);
 
-        avatarImage.click();
         expect(visitUrlSpy).not.toHaveBeenCalled();
+        expect(windowOpenSpy).not.toHaveBeenCalled();
       });
     });
   });