diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-13 21:08:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-13 21:08:58 +0300 |
commit | b4b6bff01d33ddf1ebd78001f16027b3ccd6443e (patch) | |
tree | 772dfdf23d6e72980bc99f53fa064ec5fb3a2468 /spec/frontend/snippets | |
parent | 16515bdfcb89ccb28e6eb81020d1646dfa7c6fa4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/snippets')
-rw-r--r-- | spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap | 3 | ||||
-rw-r--r-- | spec/frontend/snippets/components/snippet_blob_edit_spec.js | 16 |
2 files changed, 11 insertions, 8 deletions
diff --git a/spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap b/spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap index dd6dc51dfa1..b0c253bca65 100644 --- a/spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap +++ b/spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap @@ -13,7 +13,8 @@ exports[`Snippet Blob Edit component with loaded blob matches snapshot 1`] = ` value="foo/bar/test.md" /> - <blob-content-edit-stub + <editor-lite-stub + editoroptions="[object Object]" fileglobalid="blob_local_7" filename="foo/bar/test.md" value="Lorem ipsum dolar sit amet, diff --git a/spec/frontend/snippets/components/snippet_blob_edit_spec.js b/spec/frontend/snippets/components/snippet_blob_edit_spec.js index fe9e038f622..9d0311fd682 100644 --- a/spec/frontend/snippets/components/snippet_blob_edit_spec.js +++ b/spec/frontend/snippets/components/snippet_blob_edit_spec.js @@ -5,7 +5,7 @@ import waitForPromises from 'helpers/wait_for_promises'; import { TEST_HOST } from 'helpers/test_constants'; import SnippetBlobEdit from '~/snippets/components/snippet_blob_edit.vue'; import BlobHeaderEdit from '~/blob/components/blob_edit_header.vue'; -import BlobContentEdit from '~/blob/components/blob_edit_content.vue'; +import EditorLite from '~/vue_shared/components/editor_lite.vue'; import axios from '~/lib/utils/axios_utils'; import { joinPaths } from '~/lib/utils/url_utility'; import { deprecatedCreateFlash as createFlash } from '~/flash'; @@ -48,7 +48,7 @@ describe('Snippet Blob Edit component', () => { const findLoadingIcon = () => wrapper.find(GlLoadingIcon); const findHeader = () => wrapper.find(BlobHeaderEdit); - const findContent = () => wrapper.find(BlobContentEdit); + const findContent = () => wrapper.find(EditorLite); const getLastUpdatedArgs = () => { const event = wrapper.emitted()['blob-updated']; @@ -172,11 +172,13 @@ describe('Snippet Blob Edit component', () => { expect(findContent().exists()).toBe(showContent); if (showContent) { - expect(findContent().props()).toEqual({ - value: TEST_BLOB_LOADED.content, - fileGlobalId: TEST_BLOB_LOADED.id, - fileName: TEST_BLOB_LOADED.path, - }); + expect(findContent().props()).toEqual( + expect.objectContaining({ + value: TEST_BLOB_LOADED.content, + fileGlobalId: TEST_BLOB_LOADED.id, + fileName: TEST_BLOB_LOADED.path, + }), + ); } }); }); |