diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2019-01-25 13:24:29 +0300 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-02-04 19:47:27 +0300 |
commit | b02315befcd888f9983e0ce7a4bf1f3accfffd46 (patch) | |
tree | 4edc5aa0a2b5dc0853d8f97f34b318fed200ba96 /spec | |
parent | 3424476b4c9f17c11b969ab00e9be80f8c635c02 (diff) |
Merge branch 'security-11-7-55320-stored-xss-in-user-status' into 'security-11-7'
[11.7] Use sanitized user status message in user popover
See merge request gitlab/gitlabhq!2839
(cherry picked from commit e5d355eb04e165fa1b9ccce1253b909a785d4bed)
21e70bba Use sanitized user status message for user popover
Diffstat (limited to 'spec')
-rw-r--r-- | spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js b/spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js index de3e0c149de..e8b41e8eeff 100644 --- a/spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js +++ b/spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js @@ -122,7 +122,7 @@ describe('User Popover Component', () => { describe('status data', () => { it('should show only message', () => { const testProps = Object.assign({}, DEFAULT_PROPS); - testProps.user.status = { message: 'Hello World' }; + testProps.user.status = { message_html: 'Hello World' }; vm = mountComponent(UserPopover, { ...DEFAULT_PROPS, @@ -134,12 +134,12 @@ describe('User Popover Component', () => { it('should show message and emoji', () => { const testProps = Object.assign({}, DEFAULT_PROPS); - testProps.user.status = { emoji: 'basketball_player', message: 'Hello World' }; + testProps.user.status = { emoji: 'basketball_player', message_html: 'Hello World' }; vm = mountComponent(UserPopover, { ...DEFAULT_PROPS, target: document.querySelector('.js-user-link'), - status: { emoji: 'basketball_player', message: 'Hello World' }, + status: { emoji: 'basketball_player', message_html: 'Hello World' }, }); expect(vm.$el.textContent).toContain('Hello World'); |