diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-02-20 22:20:50 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-02-20 22:20:50 +0000 |
| commit | 11bf575fe64e55cc932c5629e2d8d103109e0b2b (patch) | |
| tree | d7573838c094933a4cb47278ac3c93af2154db69 /spec/javascripts/pages/admin | |
| parent | 86c9c93de709c9013572682b868b5e6db429dd1e (diff) | |
| parent | 35c8fd5586ac4fe9fb192974bcba519bfc1eb964 (diff) | |
| download | gitlab-ce-11bf575fe64e55cc932c5629e2d8d103109e0b2b.tar.gz | |
Merge branch 'jquery3' into 'master'
Update to jQuery 3.
Closes #33888
See merge request gitlab-org/gitlab-ce!16634
Diffstat (limited to 'spec/javascripts/pages/admin')
| -rw-r--r-- | spec/javascripts/pages/admin/abuse_reports/abuse_reports_spec.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/javascripts/pages/admin/abuse_reports/abuse_reports_spec.js b/spec/javascripts/pages/admin/abuse_reports/abuse_reports_spec.js index d2386077aa6..349549b9e1f 100644 --- a/spec/javascripts/pages/admin/abuse_reports/abuse_reports_spec.js +++ b/spec/javascripts/pages/admin/abuse_reports/abuse_reports_spec.js @@ -22,19 +22,19 @@ describe('Abuse Reports', () => { it('should truncate long messages', () => { const $longMessage = findMessage('LONG MESSAGE'); - expect($longMessage.data('original-message')).toEqual(jasmine.anything()); + expect($longMessage.data('originalMessage')).toEqual(jasmine.anything()); assertMaxLength($longMessage); }); it('should not truncate short messages', () => { const $shortMessage = findMessage('SHORT MESSAGE'); - expect($shortMessage.data('original-message')).not.toEqual(jasmine.anything()); + expect($shortMessage.data('originalMessage')).not.toEqual(jasmine.anything()); }); it('should allow clicking a truncated message to expand and collapse the full message', () => { const $longMessage = findMessage('LONG MESSAGE'); $longMessage.click(); - expect($longMessage.data('original-message').length).toEqual($longMessage.text().length); + expect($longMessage.data('originalMessage').length).toEqual($longMessage.text().length); $longMessage.click(); assertMaxLength($longMessage); }); |
