summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2019-07-08 12:25:17 +0200
committerTim Zallmann <tzallmann@gitlab.com>2019-07-08 12:25:17 +0200
commit918fb82e998555695fbe1ced8a1dddc08a54b7c2 (patch)
treed6b57d06385817f490ca6d63f4b7ee246f93d826
parent87285d031b57c4149ade4d1bac2c4287f375ab53 (diff)
downloadgitlab-ce-tz-update-mr-count-over-tabs.tar.gz
Caching of Dom Lookup, setFixtures on Spec for User MR'stz-update-mr-count-over-tabs
-rw-r--r--app/assets/javascripts/commons/nav/user_merge_requests.js9
-rw-r--r--spec/frontend/commons/nav/user_merge_requests_spec.js6
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;