diff --git a/app/assets/javascripts/content_editor/components/bubble_menus/link.vue b/app/assets/javascripts/content_editor/components/bubble_menus/link.vue index abd225c0b1a72d21d42f7b28d9bf5c4b3436bebe..dae0bc63b5adca4ffbc6a75dd389822ee7cfec19 100644 --- a/app/assets/javascripts/content_editor/components/bubble_menus/link.vue +++ b/app/assets/javascripts/content_editor/components/bubble_menus/link.vue @@ -60,7 +60,7 @@ export default { async endEditingLink() { this.isEditing = false; - this.linkHref = await this.contentEditor.resolveLink(this.linkCanonicalSrc); + this.linkHref = await this.contentEditor.resolveUrl(this.linkCanonicalSrc); if (!this.linkCanonicalSrc && !this.linkHref) { this.removeLink(); diff --git a/app/assets/javascripts/content_editor/components/bubble_menus/media.vue b/app/assets/javascripts/content_editor/components/bubble_menus/media.vue index d1bc5c83948884e63bc9d86c4c033e5a0afd0739..a36a860c4403cd0b0c4c8657a6dd29e493c4476f 100644 --- a/app/assets/javascripts/content_editor/components/bubble_menus/media.vue +++ b/app/assets/javascripts/content_editor/components/bubble_menus/media.vue @@ -114,7 +114,7 @@ export default { async saveEditedMedia() { this.isUpdating = true; - this.mediaSrc = await this.contentEditor.resolveLink(this.mediaCanonicalSrc); + this.mediaSrc = await this.contentEditor.resolveUrl(this.mediaCanonicalSrc); const position = this.tiptapEditor.state.selection.from; @@ -151,7 +151,7 @@ export default { this.mediaAlt = alt; this.mediaCanonicalSrc = canonicalSrc || src; this.isUploading = uploading; - this.mediaSrc = await this.contentEditor.resolveLink(this.mediaCanonicalSrc); + this.mediaSrc = await this.contentEditor.resolveUrl(this.mediaCanonicalSrc); this.isUpdating = false; }, diff --git a/app/assets/javascripts/content_editor/services/content_editor.js b/app/assets/javascripts/content_editor/services/content_editor.js index 5078668c620eb906294833573bb7fc73322bdf82..6eac5a634397d4d149bf5d94083680b9c31b68aa 100644 --- a/app/assets/javascripts/content_editor/services/content_editor.js +++ b/app/assets/javascripts/content_editor/services/content_editor.js @@ -43,7 +43,7 @@ export class ContentEditor { }); } - resolveAssetUrl(canonicalSrc) { + resolveUrl(canonicalSrc) { return this._assetResolver.resolveUrl(canonicalSrc); } diff --git a/spec/frontend/content_editor/components/bubble_menus/link_spec.js b/spec/frontend/content_editor/components/bubble_menus/link_spec.js index 5910b9c110d498e689fe2ecb27bfca9d4f21a5e9..ba6d8da9584f4d505376942d82657efe8174a2ec 100644 --- a/spec/frontend/content_editor/components/bubble_menus/link_spec.js +++ b/spec/frontend/content_editor/components/bubble_menus/link_spec.js @@ -17,7 +17,7 @@ describe('content_editor/components/bubble_menus/link', () => { const buildEditor = () => { tiptapEditor = createTestEditor({ extensions: [Link] }); - contentEditor = { resolveLink: jest.fn() }; + contentEditor = { resolveUrl: jest.fn() }; eventHub = eventHubFactory(); }; @@ -175,7 +175,7 @@ describe('content_editor/components/bubble_menus/link', () => { linkHrefInput.setValue('https://google.com'); linkTitleInput.setValue('Search Google'); - contentEditor.resolveLink.mockResolvedValue('https://google.com'); + contentEditor.resolveUrl.mockResolvedValue('https://google.com'); await wrapper.findComponent(GlForm).vm.$emit('submit', createFakeEvent()); }); diff --git a/spec/frontend/content_editor/components/bubble_menus/media_spec.js b/spec/frontend/content_editor/components/bubble_menus/media_spec.js index a4bcfa9c39e848aa4601d29b6d231545d709bab2..8839caea80e8a6ad2a695af961e03e4260ff4e95 100644 --- a/spec/frontend/content_editor/components/bubble_menus/media_spec.js +++ b/spec/frontend/content_editor/components/bubble_menus/media_spec.js @@ -43,7 +43,7 @@ describe.each` const buildEditor = () => { tiptapEditor = createTestEditor({ extensions: [Image, Audio, Video] }); - contentEditor = { resolveLink: jest.fn() }; + contentEditor = { resolveUrl: jest.fn() }; eventHub = eventHubFactory(); }; @@ -82,7 +82,7 @@ describe.each` .setNodeSelection(4) // select the media .run(); - contentEditor.resolveLink.mockResolvedValue(`/group1/project1/-/wikis/${filePath}`); + contentEditor.resolveUrl.mockResolvedValue(`/group1/project1/-/wikis/${filePath}`); await emitEditorEvent({ event: 'transaction', tiptapEditor }); @@ -180,7 +180,7 @@ describe.each` mediaAltInput.setValue('gitlab favicon'); mediaTitleInput.setValue('gitlab favicon'); - contentEditor.resolveLink.mockResolvedValue('https://gitlab.com/favicon.png'); + contentEditor.resolveUrl.mockResolvedValue('https://gitlab.com/favicon.png'); await wrapper.findComponent(GlForm).vm.$emit('submit', createFakeEvent()); });