diff options
author | Phil Hughes <me@iamphill.com> | 2019-02-15 08:34:24 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-02-15 14:48:58 +0000 |
commit | 09f88f2167bf4821334331baa4cb491eaa57475d (patch) | |
tree | 338b292dc28b5904be18730a8fabeddc827c2b59 | |
parent | 4a3009613359dcd08d550f595437e1c9ef5c7c97 (diff) | |
download | gitlab-ce-09f88f2167bf4821334331baa4cb491eaa57475d.tar.gz |
Merge branch '57692-fix-rendering-of-none-any' into 'master'
Resolve "Search bar rendering `none` and `any` as users"
Closes #57692
See merge request gitlab-org/gitlab-ce!25235
(cherry picked from commit 4b50e4d5edf6f89a4833b402d97edf45cdc9eac1)
65f534da Fix rendering of user token special values
-rw-r--r-- | app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js | 2 | ||||
-rw-r--r-- | spec/javascripts/filtered_search/filtered_search_visual_tokens_spec.js | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js b/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js index fba31f16d65..5090b0bdc3c 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js +++ b/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js @@ -163,7 +163,7 @@ export default class FilteredSearchVisualTokens { const tokenValueElement = tokenValueContainer.querySelector('.value'); tokenValueElement.innerText = tokenValue; - if (tokenValue === 'none' || tokenValue === 'any') { + if (['none', 'any'].includes(tokenValue.toLowerCase())) { return; } diff --git a/spec/javascripts/filtered_search/filtered_search_visual_tokens_spec.js b/spec/javascripts/filtered_search/filtered_search_visual_tokens_spec.js index 9aa3cbaa231..6230da77f49 100644 --- a/spec/javascripts/filtered_search/filtered_search_visual_tokens_spec.js +++ b/spec/javascripts/filtered_search/filtered_search_visual_tokens_spec.js @@ -755,6 +755,17 @@ describe('Filtered Search Visual Tokens', () => { expect(updateUserTokenAppearanceSpy.calls.count()).toBe(0); }); + it('does not update user token appearance for `None` filter', () => { + const { tokenNameElement } = findElements(authorToken); + + const tokenName = tokenNameElement.innerText; + const tokenValue = 'None'; + + subject.renderVisualTokenValue(authorToken, tokenName, tokenValue); + + expect(updateUserTokenAppearanceSpy.calls.count()).toBe(0); + }); + it('does not update user token appearance for `none` filter', () => { const { tokenNameElement } = findElements(authorToken); |