Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into update-template-name-via-sentence-case

# Conflicts:
#	.gitlab/issue_templates/Feature proposal.md

1 files changed, 11 insertions, 0 deletions

diff --git a/spec/javascripts/filtered_search/filtered_search_token_keys_spec.js b/spec/javascripts/filtered_search/filtered_search_token_keys_spec.js
index fbc3926d332..68158cf52e4 100644
--- a/spec/javascripts/filtered_search/filtered_search_token_keys_spec.js
+++ b/spec/javascripts/filtered_search/filtered_search_token_keys_spec.js
@@ -17,6 +17,17 @@ describe('Filtered Search Token Keys', () => {
     });
   });
 
+  describe('getKeys', () => {
+    it('should return keys', () => {
+      const getKeys = FilteredSearchTokenKeys.getKeys();
+      const keys = FilteredSearchTokenKeys.get().map(i => i.key);
+
+      keys.forEach((key, i) => {
+        expect(key).toEqual(getKeys[i]);
+      });
+    });
+  });
+
   describe('getConditions', () => {
     let conditions;