Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/frontend/ide/init_gitlab_web_ide_spec.js')
-rw-r--r--spec/frontend/ide/init_gitlab_web_ide_spec.js36
1 files changed, 28 insertions, 8 deletions
diff --git a/spec/frontend/ide/init_gitlab_web_ide_spec.js b/spec/frontend/ide/init_gitlab_web_ide_spec.js
index 73c8ad88aa3..6a5bedb0bbb 100644
--- a/spec/frontend/ide/init_gitlab_web_ide_spec.js
+++ b/spec/frontend/ide/init_gitlab_web_ide_spec.js
@@ -36,9 +36,9 @@ const TEST_START_REMOTE_PARAMS = {
remotePath: '/test/projects/f oo',
connectionToken: '123abc',
};
-const TEST_EDITOR_FONT_SRC_URL = 'http://gitlab.test/assets/jetbrains-mono/JetBrainsMono.woff2';
+const TEST_EDITOR_FONT_SRC_URL = 'http://gitlab.test/assets/gitlab-mono/GitLabMono.woff2';
const TEST_EDITOR_FONT_FORMAT = 'woff2';
-const TEST_EDITOR_FONT_FAMILY = 'JebBrains Mono';
+const TEST_EDITOR_FONT_FAMILY = 'GitLab Mono';
describe('ide/init_gitlab_web_ide', () => {
let resolveConfirm;
@@ -56,9 +56,20 @@ describe('ide/init_gitlab_web_ide', () => {
el.dataset.userPreferencesPath = TEST_USER_PREFERENCES_PATH;
el.dataset.mergeRequest = TEST_MR_ID;
el.dataset.filePath = TEST_FILE_PATH;
- el.dataset.editorFontSrcUrl = TEST_EDITOR_FONT_SRC_URL;
- el.dataset.editorFontFormat = TEST_EDITOR_FONT_FORMAT;
- el.dataset.editorFontFamily = TEST_EDITOR_FONT_FAMILY;
+ el.dataset.editorFont = JSON.stringify({
+ fallback_font_family: 'monospace',
+ font_faces: [
+ {
+ family: TEST_EDITOR_FONT_FAMILY,
+ src: [
+ {
+ url: TEST_EDITOR_FONT_SRC_URL,
+ format: TEST_EDITOR_FONT_FORMAT,
+ },
+ ],
+ },
+ ],
+ });
el.dataset.signInPath = TEST_SIGN_IN_PATH;
document.body.append(el);
@@ -121,9 +132,18 @@ describe('ide/init_gitlab_web_ide', () => {
signIn: TEST_SIGN_IN_PATH,
},
editorFont: {
- srcUrl: TEST_EDITOR_FONT_SRC_URL,
- fontFamily: TEST_EDITOR_FONT_FAMILY,
- format: TEST_EDITOR_FONT_FORMAT,
+ fallbackFontFamily: 'monospace',
+ fontFaces: [
+ {
+ family: TEST_EDITOR_FONT_FAMILY,
+ src: [
+ {
+ url: TEST_EDITOR_FONT_SRC_URL,
+ format: TEST_EDITOR_FONT_FORMAT,
+ },
+ ],
+ },
+ ],
},
handleStartRemote: expect.any(Function),
handleTracking,