Merge branch 'disable-clicking-disabled-clipboard-button' into 'master'

Fix clicking disabled clipboard button toolip

Closes #32518

See merge request !11493

2 files changed, 29 insertions, 6 deletions

diff --git a/app/assets/javascripts/blob/viewer/index.js b/app/assets/javascripts/blob/viewer/index.js
index 54b85e47358..d7c62889dde 100644
--- a/app/assets/javascripts/blob/viewer/index.js
+++ b/app/assets/javascripts/blob/viewer/index.js
@@ -50,9 +50,9 @@ export default class BlobViewer {
 
     if (this.copySourceBtn) {
       this.copySourceBtn.addEventListener('click', () => {
-        if (this.copySourceBtn.classList.contains('disabled')) return;
+        if (this.copySourceBtn.classList.contains('disabled')) return this.copySourceBtn.blur();
 
-        this.switchToViewer('simple');
+        return this.switchToViewer('simple');
       });
     }
   }
diff --git a/spec/javascripts/blob/viewer/index_spec.js b/spec/javascripts/blob/viewer/index_spec.js
index 13f122b68b2..af04e7c1e72 100644
--- a/spec/javascripts/blob/viewer/index_spec.js
+++ b/spec/javascripts/blob/viewer/index_spec.js
@@ -83,25 +83,48 @@ describe('Blob viewer', () => {
   });
 
   describe('copy blob button', () => {
+    let copyButton;
+
+    beforeEach(() => {
+      copyButton = document.querySelector('.js-copy-blob-source-btn');
+    });
+
     it('disabled on load', () => {
       expect(
-        document.querySelector('.js-copy-blob-source-btn').classList.contains('disabled'),
+        copyButton.classList.contains('disabled'),
       ).toBeTruthy();
     });
 
     it('has tooltip when disabled', () => {
       expect(
-        document.querySelector('.js-copy-blob-source-btn').getAttribute('data-original-title'),
+        copyButton.getAttribute('data-original-title'),
       ).toBe('Switch to the source to copy it to the clipboard');
     });
 
+    it('is blurred when clicked and disabled', () => {
+      spyOn(copyButton, 'blur');
+
+      copyButton.click();
+
+      expect(copyButton.blur).toHaveBeenCalled();
+    });
+
+    it('is not blurred when clicked and not disabled', () => {
+      spyOn(copyButton, 'blur');
+
+      copyButton.classList.remove('disabled');
+      copyButton.click();
+
+      expect(copyButton.blur).not.toHaveBeenCalled();
+    });
+
     it('enables after switching to simple view', (done) => {
       document.querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]').click();
 
       setTimeout(() => {
         expect($.ajax).toHaveBeenCalled();
         expect(
-          document.querySelector('.js-copy-blob-source-btn').classList.contains('disabled'),
+          copyButton.classList.contains('disabled'),
         ).toBeFalsy();
 
         done();
@@ -115,7 +138,7 @@ describe('Blob viewer', () => {
         expect($.ajax).toHaveBeenCalled();
 
         expect(
-          document.querySelector('.js-copy-blob-source-btn').getAttribute('data-original-title'),
+          copyButton.getAttribute('data-original-title'),
         ).toBe('Copy source to clipboard');
 
         done();