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
path: root/spec
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-06-08 07:53:45 +0300
committerMike Greiling <mike@pixelcog.com>2018-06-08 07:53:45 +0300
commit15993df1d6849bd487855cf4926e2e01e44e54df (patch)
tree4fdeb8bb4d213bfce9c9abc6cb100996c9621c46 /spec
parent2729205b391c22eb3a15408580261456cc030530 (diff)
remove need to pass monaco around through DI
Diffstat (limited to 'spec')
-rw-r--r--spec/javascripts/ide/lib/common/model_manager_spec.js3
-rw-r--r--spec/javascripts/ide/lib/common/model_spec.js5
-rw-r--r--spec/javascripts/ide/lib/decorations/controller_spec.js3
-rw-r--r--spec/javascripts/ide/lib/diff/controller_spec.js6
4 files changed, 7 insertions, 10 deletions
diff --git a/spec/javascripts/ide/lib/common/model_manager_spec.js b/spec/javascripts/ide/lib/common/model_manager_spec.js
index e3886f06f5a..38ffa317e8e 100644
--- a/spec/javascripts/ide/lib/common/model_manager_spec.js
+++ b/spec/javascripts/ide/lib/common/model_manager_spec.js
@@ -1,4 +1,3 @@
-import * as monaco from 'monaco-editor';
import eventHub from '~/ide/eventhub';
import ModelManager from '~/ide/lib/common/model_manager';
import { file } from '../../helpers';
@@ -7,7 +6,7 @@ describe('Multi-file editor library model manager', () => {
let instance;
beforeEach(() => {
- instance = new ModelManager(monaco);
+ instance = new ModelManager();
});
afterEach(() => {
diff --git a/spec/javascripts/ide/lib/common/model_spec.js b/spec/javascripts/ide/lib/common/model_spec.js
index ab753a7e5e2..f096e06f43c 100644
--- a/spec/javascripts/ide/lib/common/model_spec.js
+++ b/spec/javascripts/ide/lib/common/model_spec.js
@@ -1,4 +1,3 @@
-import * as monaco from 'monaco-editor';
import eventHub from '~/ide/eventhub';
import Model from '~/ide/lib/common/model';
import { file } from '../../helpers';
@@ -12,7 +11,7 @@ describe('Multi-file editor library model', () => {
const f = file('path');
f.mrChange = { diff: 'ABC' };
f.baseRaw = 'test';
- model = new Model(monaco, f);
+ model = new Model(f);
});
afterEach(() => {
@@ -33,7 +32,7 @@ describe('Multi-file editor library model', () => {
const f = file('path');
model.dispose();
- model = new Model(monaco, f, {
+ model = new Model(f, {
...f,
content: '123 testing',
});
diff --git a/spec/javascripts/ide/lib/decorations/controller_spec.js b/spec/javascripts/ide/lib/decorations/controller_spec.js
index 6f50056be73..a112361e0d1 100644
--- a/spec/javascripts/ide/lib/decorations/controller_spec.js
+++ b/spec/javascripts/ide/lib/decorations/controller_spec.js
@@ -1,4 +1,3 @@
-import * as monaco from 'monaco-editor';
import Editor from '~/ide/lib/editor';
import DecorationsController from '~/ide/lib/decorations/controller';
import Model from '~/ide/lib/common/model';
@@ -14,7 +13,7 @@ describe('Multi-file editor library decorations controller', () => {
editorInstance.createInstance(document.createElement('div'));
controller = new DecorationsController(editorInstance);
- model = new Model(monaco, file('path'));
+ model = new Model(file('path'));
});
afterEach(() => {
diff --git a/spec/javascripts/ide/lib/diff/controller_spec.js b/spec/javascripts/ide/lib/diff/controller_spec.js
index 2438fb22036..96abd1dcd9e 100644
--- a/spec/javascripts/ide/lib/diff/controller_spec.js
+++ b/spec/javascripts/ide/lib/diff/controller_spec.js
@@ -1,4 +1,4 @@
-import * as monaco from 'monaco-editor';
+import { Range } from 'monaco-editor';
import Editor from '~/ide/lib/editor';
import ModelManager from '~/ide/lib/common/model_manager';
import DecorationsController from '~/ide/lib/decorations/controller';
@@ -17,7 +17,7 @@ describe('Multi-file editor library dirty diff controller', () => {
editorInstance = Editor.create();
editorInstance.createInstance(document.createElement('div'));
- modelManager = new ModelManager(monaco);
+ modelManager = new ModelManager();
decorationsController = new DecorationsController(editorInstance);
model = modelManager.addModel(file('path'));
@@ -165,7 +165,7 @@ describe('Multi-file editor library dirty diff controller', () => {
[],
[
{
- range: new monaco.Range(1, 1, 1, 1),
+ range: new Range(1, 1, 1, 1),
options: {
isWholeLine: true,
linesDecorationsClassName: 'dirty-diff dirty-diff-modified',