From ac03d6da2a73e5589cfb661fffaee618d852faa7 Mon Sep 17 00:00:00 2001
From: Himanshu Kapoor <info@fleon.org>
Date: Thu, 5 May 2022 22:51:15 +0000
Subject: [PATCH] Fix typos in content_editor.js
Make sure the function names are correct and consistent
---
.../content_editor/components/bubble_menus/link.vue | 2 +-
.../content_editor/components/bubble_menus/media.vue | 4 ++--
.../javascripts/content_editor/services/content_editor.js | 2 +-
.../content_editor/components/bubble_menus/link_spec.js | 4 ++--
.../content_editor/components/bubble_menus/media_spec.js | 6 +++---
5 files changed, 9 insertions(+), 9 deletions(-)
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 abd225c0b1a72..dae0bc63b5adc 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 d1bc5c8394888..a36a860c4403c 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 5078668c620eb..6eac5a634397d 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 5910b9c110d49..ba6d8da9584f4 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 a4bcfa9c39e84..8839caea80e8a 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());
});
--
GitLab