diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2017-01-06 13:56:34 -0600 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-01-06 13:56:34 -0600 |
commit | c60674b26b7a62463061591711628d76447a2e89 (patch) | |
tree | 430a16d02e0f9896a990ae6b9c91d30d3fa91df8 | |
parent | aabc33627dc6caffbf073e73d64ee7d46e2873e0 (diff) | |
download | gitlab-ce-c60674b26b7a62463061591711628d76447a2e89.tar.gz |
Fix specs
3 files changed, 14 insertions, 6 deletions
diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js.es6 b/app/assets/javascripts/filtered_search/filtered_search_manager.js.es6 index d2ea4de18aa..bd3c4240f13 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_manager.js.es6 +++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js.es6 @@ -142,7 +142,14 @@ if (condition) { tokenPath = condition.url; } else { - tokenPath = `${keyParam}=${encodeURIComponent(token.value)}`; + let tokenValue = token.value; + + if ((tokenValue[0] === '\'' && tokenValue[tokenValue.length - 1] === '\'') || + (tokenValue[0] === '"' && tokenValue[tokenValue.length - 1] === '"')) { + tokenValue = tokenValue.slice(1, tokenValue.length - 1); + } + + tokenPath = `${keyParam}=${encodeURIComponent(tokenValue)}`; } paths.push(tokenPath); diff --git a/spec/javascripts/filtered_search/dropdown_utils_spec.js.es6 b/spec/javascripts/filtered_search/dropdown_utils_spec.js.es6 index 369eb90e31c..ce61b73aa8a 100644 --- a/spec/javascripts/filtered_search/dropdown_utils_spec.js.es6 +++ b/spec/javascripts/filtered_search/dropdown_utils_spec.js.es6 @@ -1,3 +1,4 @@ +//= require extensions/array //= require filtered_search/dropdown_utils //= require filtered_search/filtered_search_tokenizer //= require filtered_search/filtered_search_dropdown_manager @@ -80,7 +81,7 @@ getAttribute: () => 'value', }; - gl.DropdownUtils.setDataValueIfSelected(selected); + gl.DropdownUtils.setDataValueIfSelected(null, selected); expect(gl.FilteredSearchDropdownManager.addWordToInput.calls.count()).toEqual(1); }); @@ -89,7 +90,7 @@ getAttribute: () => 'value', }; - const result = gl.DropdownUtils.setDataValueIfSelected(selected); + const result = gl.DropdownUtils.setDataValueIfSelected(null, selected); expect(result).toBe(true); }); @@ -98,7 +99,7 @@ getAttribute: () => null, }; - const result = gl.DropdownUtils.setDataValueIfSelected(selected); + const result = gl.DropdownUtils.setDataValueIfSelected(null, selected); expect(result).toBe(false); }); }); diff --git a/spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js.es6 b/spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js.es6 index 8e5992fa446..ac7f8e9cbcd 100644 --- a/spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js.es6 +++ b/spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js.es6 @@ -24,7 +24,7 @@ expect(results.tokens[0].symbol).toBe('@'); expect(results.tokens[1].key).toBe('label'); - expect(results.tokens[1].value).toBe('Very Important'); + expect(results.tokens[1].value).toBe('"Very Important"'); expect(results.tokens[1].symbol).toBe('~'); expect(results.tokens[2].key).toBe('milestone'); @@ -72,7 +72,7 @@ expect(results.tokens[0].symbol).toBe('@'); expect(results.tokens[1].key).toBe('label'); - expect(results.tokens[1].value).toBe('Won\'t fix'); + expect(results.tokens[1].value).toBe('"Won\'t fix"'); expect(results.tokens[1].symbol).toBe('~'); expect(results.tokens[2].key).toBe('milestone'); |