diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-09-15 10:19:43 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-09-15 10:19:43 +0100 |
| commit | 6d59795ebbe51c99317ead0be62591a5f0926c92 (patch) | |
| tree | e05db8dc216ef3ee8ab18a7f83dd781c54e3177e /spec | |
| parent | e0e153d2d73199a16e7e7dbc1b34cfeabbc26410 (diff) | |
| download | gitlab-ce-6d59795ebbe51c99317ead0be62591a5f0926c92.tar.gz | |
Review changes
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/javascripts/sidebar/lock/lock_issue_sidebar_spec.js | 4 | ||||
| -rw-r--r-- | spec/javascripts/vue_shared/components/issue/issue_warning_spec.js | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/spec/javascripts/sidebar/lock/lock_issue_sidebar_spec.js b/spec/javascripts/sidebar/lock/lock_issue_sidebar_spec.js index 2848be62819..696fca516bc 100644 --- a/spec/javascripts/sidebar/lock/lock_issue_sidebar_spec.js +++ b/spec/javascripts/sidebar/lock/lock_issue_sidebar_spec.js @@ -10,9 +10,7 @@ describe('LockIssueSidebar', () => { const mediator = { service: { - update: () => new Promise((resolve) => { - resolve(true); - }), + update: Promise.resolve(true), }, store: { diff --git a/spec/javascripts/vue_shared/components/issue/issue_warning_spec.js b/spec/javascripts/vue_shared/components/issue/issue_warning_spec.js index c366589ec50..a5f408d3165 100644 --- a/spec/javascripts/vue_shared/components/issue/issue_warning_spec.js +++ b/spec/javascripts/vue_shared/components/issue/issue_warning_spec.js @@ -5,6 +5,7 @@ import mountComponent from '../../../helpers/vue_mount_component_helper'; const IssueWarning = Vue.extend(issueWarning); function formatWarning(string) { + // Replace newlines with a space then replace multiple spaces with one space return string.trim().replace(/\n/g, ' ').replace(/\s\s+/g, ' '); } |