summaryrefslogtreecommitdiff
path: root/spec/javascripts/ide/components/repo_editor_spec.js
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-04-07 10:08:34 +0100
committerPhil Hughes <me@iamphill.com>2018-04-07 10:27:56 +0100
commit7c20403f28017da6a3e99b88629149478a620993 (patch)
tree8909e8dca9e57c549b051cb6f7382bba0e32ffbd /spec/javascripts/ide/components/repo_editor_spec.js
parent4581a78d66a93c6d82b39d1214b75e15681a9960 (diff)
downloadgitlab-ce-7c20403f28017da6a3e99b88629149478a620993.tar.gz
fixed failing tests because of passed `null`
added spec to check for `head` file
Diffstat (limited to 'spec/javascripts/ide/components/repo_editor_spec.js')
-rw-r--r--spec/javascripts/ide/components/repo_editor_spec.js16
1 files changed, 15 insertions, 1 deletions
diff --git a/spec/javascripts/ide/components/repo_editor_spec.js b/spec/javascripts/ide/components/repo_editor_spec.js
index 63a3d2c6cd5..e28d5fbe22c 100644
--- a/spec/javascripts/ide/components/repo_editor_spec.js
+++ b/spec/javascripts/ide/components/repo_editor_spec.js
@@ -163,7 +163,7 @@ describe('RepoEditor', () => {
vm.setupEditor();
- expect(vm.editor.createModel).toHaveBeenCalledWith(vm.file);
+ expect(vm.editor.createModel).toHaveBeenCalledWith(vm.file, null);
expect(vm.model).not.toBeNull();
});
@@ -197,6 +197,20 @@ describe('RepoEditor', () => {
done();
});
});
+
+ it('sets head model as staged file', () => {
+ spyOn(vm.editor, 'createModel').and.callThrough();
+
+ Editor.editorInstance.modelManager.dispose();
+
+ vm.$store.state.stagedFiles.push({ ...vm.file, key: 'staged' });
+ vm.file.staged = true;
+ vm.file.key = `unstaged-${vm.file.key}`;
+
+ vm.setupEditor();
+
+ expect(vm.editor.createModel).toHaveBeenCalledWith(vm.file, vm.$store.state.stagedFiles[0]);
+ });
});
describe('editor updateDimensions', () => {