Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
816b4202
Commit
816b4202
authored
Mar 19, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed tree not rendering
parent
813ea768
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
9 deletions
+14
-9
ee/app/assets/javascripts/ide/components/ide_project_branches_tree.vue
.../javascripts/ide/components/ide_project_branches_tree.vue
+3
-5
spec/javascripts/ide/components/new_dropdown/index_spec.js
spec/javascripts/ide/components/new_dropdown/index_spec.js
+1
-1
spec/javascripts/ide/components/repo_file_spec.js
spec/javascripts/ide/components/repo_file_spec.js
+10
-3
No files found.
ee/app/assets/javascripts/ide/components/ide_project_branches_tree.vue
View file @
816b4202
...
...
@@ -40,10 +40,8 @@
/>
</div>
</div>
<template
v-if=
"branch.tree.length"
>
<repo-tree
:tree=
"branch.tree"
/>
</
template
>
<repo-tree
:tree=
"branch.tree"
/>
</div>
</
template
>
spec/javascripts/ide/components/new_dropdown/index_spec.js
View file @
816b4202
...
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
import
store
from
'
ee/ide/stores
'
;
import
newDropdown
from
'
ee/ide/components/new_dropdown/index.vue
'
;
import
{
createComponentWithStore
}
from
'
spec/helpers/vue_mount_component_helper
'
;
import
{
file
,
resetStore
}
from
'
../../helpers
'
;
import
{
resetStore
}
from
'
../../helpers
'
;
describe
(
'
new dropdown component
'
,
()
=>
{
let
vm
;
...
...
spec/javascripts/ide/components/repo_file_spec.js
View file @
816b4202
...
...
@@ -32,7 +32,7 @@ describe('RepoFile', () => {
expect
(
name
.
textContent
.
trim
()).
toEqual
(
vm
.
file
.
name
);
});
it
(
'
fires clickFile when the link is clicked
'
,
()
=>
{
it
(
'
fires clickFile when the link is clicked
'
,
done
=>
{
spyOn
(
router
,
'
push
'
);
createComponent
({
file
:
file
(
'
t3
'
),
...
...
@@ -41,7 +41,11 @@ describe('RepoFile', () => {
vm
.
$el
.
querySelector
(
'
.file-name
'
).
click
();
expect
(
router
.
push
).
toHaveBeenCalledWith
(
`/project
${
vm
.
file
.
url
}
`
);
setTimeout
(()
=>
{
expect
(
router
.
push
).
toHaveBeenCalledWith
(
`/project
${
vm
.
file
.
url
}
`
);
done
();
});
});
describe
(
'
locked file
'
,
()
=>
{
...
...
@@ -67,7 +71,10 @@ describe('RepoFile', () => {
});
it
(
'
renders a tooltip
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.ide-file-name span:nth-child(2)
'
).
dataset
.
originalTitle
).
toContain
(
'
Locked by testuser
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.ide-file-name span:nth-child(2)
'
).
dataset
.
originalTitle
,
).
toContain
(
'
Locked by testuser
'
);
});
});
});
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