diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-07 21:09:26 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-07 21:09:26 +0000 |
| commit | 17c8111494f51e79744c782db023804f5e4a7410 (patch) | |
| tree | 8aebe53b8aea72f9d4abac1bf9131203302a5b6e /spec/frontend/blob/components/blob_content_spec.js | |
| parent | 4b7575da97d88ef4c7b2ec599b0c3fc457b4f561 (diff) | |
| download | gitlab-ce-17c8111494f51e79744c782db023804f5e4a7410.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/blob/components/blob_content_spec.js')
| -rw-r--r-- | spec/frontend/blob/components/blob_content_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/frontend/blob/components/blob_content_spec.js b/spec/frontend/blob/components/blob_content_spec.js index 6a130c9c43d..ff153007be9 100644 --- a/spec/frontend/blob/components/blob_content_spec.js +++ b/spec/frontend/blob/components/blob_content_spec.js @@ -38,7 +38,7 @@ describe('Blob Content component', () => { it('renders error if there is any in the viewer', () => { const renderError = 'Oops'; - const viewer = Object.assign({}, SimpleViewerMock, { renderError }); + const viewer = { ...SimpleViewerMock, renderError }; createComponent({}, viewer); expect(wrapper.contains(GlLoadingIcon)).toBe(false); expect(wrapper.contains(BlobContentError)).toBe(true); |