BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
fc11520e
Unverified
Commit
fc11520e
authored
Apr 20, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed repo_tabs_spec
fixed editor_spec
parent
4924e4ed
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
53 deletions
+1
-53
repo_tabs_spec.js
spec/javascripts/ide/components/repo_tabs_spec.js
+0
-50
editor_spec.js
spec/javascripts/ide/lib/editor_spec.js
+1
-3
No files found.
spec/javascripts/ide/components/repo_tabs_spec.js
View file @
fc11520e
...
@@ -32,54 +32,4 @@ describe('RepoTabs', () => {
...
@@ -32,54 +32,4 @@ describe('RepoTabs', () => {
done
();
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
);
});
});
});
});
spec/javascripts/ide/lib/editor_spec.js
View file @
fc11520e
...
@@ -70,12 +70,10 @@ describe('Multi-file editor library', () => {
...
@@ -70,12 +70,10 @@ describe('Multi-file editor library', () => {
minimap
:
{
minimap
:
{
enabled
:
false
,
enabled
:
false
,
},
},
readOnly
:
tru
e
,
readOnly
:
fals
e
,
scrollBeyondLastLine
:
false
,
scrollBeyondLastLine
:
false
,
quickSuggestions
:
false
,
quickSuggestions
:
false
,
occurrencesHighlight
:
false
,
occurrencesHighlight
:
false
,
renderLineHighlight
:
'none'
,
hideCursorInOverviewRuler
:
true
,
wordWrap
:
'on'
,
wordWrap
:
'on'
,
renderSideBySide
:
true
,
renderSideBySide
:
true
,
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment