diff options
| -rw-r--r-- | app/assets/javascripts/commons/nav/user_merge_requests.js | 9 | ||||
| -rw-r--r-- | spec/frontend/commons/nav/user_merge_requests_spec.js | 6 |
2 files changed, 4 insertions, 11 deletions
diff --git a/app/assets/javascripts/commons/nav/user_merge_requests.js b/app/assets/javascripts/commons/nav/user_merge_requests.js index a41f44b389c..8e694cca6a1 100644 --- a/app/assets/javascripts/commons/nav/user_merge_requests.js +++ b/app/assets/javascripts/commons/nav/user_merge_requests.js @@ -11,12 +11,9 @@ function broadcastCount(newCount) { } function updateUserMergeRequestCounts(newCount) { - document.querySelector('.merge-requests-count').textContent = newCount.toLocaleString(); - if (Number(newCount) > 0) { - document.querySelector('.merge-requests-count').classList.remove('hidden'); - } else { - document.querySelector('.merge-requests-count').classList.add('hidden'); - } + const mergeRequestsCountEl = document.querySelector('.merge-requests-count'); + mergeRequestsCountEl.textContent = newCount.toLocaleString(); + mergeRequestsCountEl.classList.toggle('hidden', Number(newCount) === 0); } /** diff --git a/spec/frontend/commons/nav/user_merge_requests_spec.js b/spec/frontend/commons/nav/user_merge_requests_spec.js index db3df78c101..4da6d53557a 100644 --- a/spec/frontend/commons/nav/user_merge_requests_spec.js +++ b/spec/frontend/commons/nav/user_merge_requests_spec.js @@ -24,11 +24,7 @@ describe('User Merge Requests', () => { newBroadcastChannelMock = jest.fn().mockImplementation(() => channelMock); global.BroadcastChannel = newBroadcastChannelMock; - document.body.innerHTML = `<div class="${MR_COUNT_CLASS}">0</div>`; - }); - - afterEach(() => { - document.body.innerHTML = ''; + setFixtures(`<div class="${MR_COUNT_CLASS}">0</div>`); }); const findMRCountText = () => document.body.querySelector(`.${MR_COUNT_CLASS}`).textContent; |