diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-27 12:07:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-27 12:07:24 +0300 |
commit | 563240e444eab70551083c6114fc0726df412e52 (patch) | |
tree | d470cd1c7e7d5eda4160e1c1b7988abe6a108ba6 /spec/frontend_integration | |
parent | 2af65f9153baf358bfc6acdd8de9652b39264497 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend_integration')
-rw-r--r-- | spec/frontend_integration/snippets/snippets_notes_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend_integration/test_helpers/mock_server/routes/emojis.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/frontend_integration/snippets/snippets_notes_spec.js b/spec/frontend_integration/snippets/snippets_notes_spec.js index 27be7793ce6..b7d2c8924f6 100644 --- a/spec/frontend_integration/snippets/snippets_notes_spec.js +++ b/spec/frontend_integration/snippets/snippets_notes_spec.js @@ -51,7 +51,7 @@ describe('Integration Snippets notes', () => { 'circled latin capital letter m', ], ], - [':', ['100', '1234', '8ball', 'a', 'ab']], + [':', ['grinning', 'smiley', 'smile', 'grin', 'laughing']], // We do not want the search to start with space https://gitlab.com/gitlab-org/gitlab/-/issues/322548 [': ', []], // We want to preserve that we can have space INSIDE the search diff --git a/spec/frontend_integration/test_helpers/mock_server/routes/emojis.js b/spec/frontend_integration/test_helpers/mock_server/routes/emojis.js index 83991ad5af9..72953b94552 100644 --- a/spec/frontend_integration/test_helpers/mock_server/routes/emojis.js +++ b/spec/frontend_integration/test_helpers/mock_server/routes/emojis.js @@ -1,5 +1,5 @@ import { Response } from 'miragejs'; -import emojis from 'public/-/emojis/2/emojis.json'; +import emojis from 'public/-/emojis/3/emojis.json'; import { EMOJI_VERSION } from '~/emoji'; import { HTTP_STATUS_OK } from '~/lib/utils/http_status'; |