summaryrefslogtreecommitdiff
path: root/spec/javascripts
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-04-20 09:44:14 +0100
committerPhil Hughes <me@iamphill.com>2018-04-23 08:55:59 +0100
commitfc11520e51ba6a7fb3cb07b4300bf303b725881c (patch)
tree49da6c9bee6d8bab636269cc994d2d9d79415208 /spec/javascripts
parent4924e4edb22ece1b5e246fca9f4ae686e6e0e8d3 (diff)
downloadgitlab-ce-fc11520e51ba6a7fb3cb07b4300bf303b725881c.tar.gz
fixed repo_tabs_spec
fixed editor_spec
Diffstat (limited to 'spec/javascripts')
-rw-r--r--spec/javascripts/ide/components/repo_tabs_spec.js50
-rw-r--r--spec/javascripts/ide/lib/editor_spec.js4
2 files changed, 1 insertions, 53 deletions
diff --git a/spec/javascripts/ide/components/repo_tabs_spec.js b/spec/javascripts/ide/components/repo_tabs_spec.js
index 5c4bcc372bc..583f71e6121 100644
--- a/spec/javascripts/ide/components/repo_tabs_spec.js
+++ b/spec/javascripts/ide/components/repo_tabs_spec.js
@@ -32,54 +32,4 @@ describe('RepoTabs', () => {
done();
});
});
-
- describe('updated', () => {
- it('sets showShadow as true when scroll width is larger than width', done => {
- const el = document.createElement('div');
- el.innerHTML = '<div id="test-app"></div>';
- document.body.appendChild(el);
-
- const style = document.createElement('style');
- style.innerText = `
- .multi-file-tabs {
- width: 100px;
- }
-
- .multi-file-tabs .list-unstyled {
- display: flex;
- overflow-x: auto;
- }
- `;
- document.head.appendChild(style);
-
- vm = createComponent(
- RepoTabs,
- {
- files: [],
- viewer: 'editor',
- hasChanges: false,
- activeFile: file('activeFile'),
- hasMergeRequest: false,
- },
- '#test-app',
- );
-
- vm
- .$nextTick()
- .then(() => {
- expect(vm.showShadow).toEqual(false);
-
- vm.files = openedFiles;
- })
- .then(vm.$nextTick)
- .then(() => {
- expect(vm.showShadow).toEqual(true);
-
- style.remove();
- el.remove();
- })
- .then(done)
- .catch(done.fail);
- });
- });
});
diff --git a/spec/javascripts/ide/lib/editor_spec.js b/spec/javascripts/ide/lib/editor_spec.js
index 530bdfa2759..c4fda0fb1c2 100644
--- a/spec/javascripts/ide/lib/editor_spec.js
+++ b/spec/javascripts/ide/lib/editor_spec.js
@@ -70,12 +70,10 @@ describe('Multi-file editor library', () => {
minimap: {
enabled: false,
},
- readOnly: true,
+ readOnly: false,
scrollBeyondLastLine: false,
quickSuggestions: false,
occurrencesHighlight: false,
- renderLineHighlight: 'none',
- hideCursorInOverviewRuler: true,
wordWrap: 'on',
renderSideBySide: true,
});