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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
db355041
Commit
db355041
authored
Jul 26, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added repo_sidebar_spec
parent
bf09df3d
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
55 additions
and
59 deletions
+55
-59
app/assets/javascripts/repo/repo_file.vue
app/assets/javascripts/repo/repo_file.vue
+1
-1
app/assets/javascripts/repo/repo_loading_file.vue
app/assets/javascripts/repo/repo_loading_file.vue
+1
-1
app/assets/javascripts/repo/repo_prev_directory.vue
app/assets/javascripts/repo/repo_prev_directory.vue
+1
-1
app/assets/javascripts/repo/repo_sidebar.vue
app/assets/javascripts/repo/repo_sidebar.vue
+3
-12
spec/javascripts/repo/repo_binary_viewer_spec.js
spec/javascripts/repo/repo_binary_viewer_spec.js
+1
-4
spec/javascripts/repo/repo_file_buttons_spec.js
spec/javascripts/repo/repo_file_buttons_spec.js
+4
-16
spec/javascripts/repo/repo_file_options_spec.js
spec/javascripts/repo/repo_file_options_spec.js
+1
-3
spec/javascripts/repo/repo_file_spec.js
spec/javascripts/repo/repo_file_spec.js
+5
-15
spec/javascripts/repo/repo_prev_directory_spec.js
spec/javascripts/repo/repo_prev_directory_spec.js
+0
-1
spec/javascripts/repo/repo_sidebar_spec.js
spec/javascripts/repo/repo_sidebar_spec.js
+37
-1
spec/javascripts/repo/repo_tab_spec.js
spec/javascripts/repo/repo_tab_spec.js
+1
-4
No files found.
app/assets/javascripts/repo/repo_file.vue
View file @
db355041
...
@@ -40,7 +40,7 @@ export default RepoFile;
...
@@ -40,7 +40,7 @@ export default RepoFile;
</
script
>
</
script
>
<
template
>
<
template
>
<tr
v-if=
"!loading.tree || hasFiles"
:class=
"
{'active': activeFile.url === file.url}">
<tr
class=
"file"
v-if=
"!loading.tree || hasFiles"
:class=
"
{'active': activeFile.url === file.url}">
<td
@
click.prevent=
"linkClicked(file)"
>
<td
@
click.prevent=
"linkClicked(file)"
>
<i
class=
"fa"
v-if=
"!file.loading"
:class=
"file.icon"
:style=
"
{'margin-left': file.level * 10 + 'px'}">
</i>
<i
class=
"fa"
v-if=
"!file.loading"
:class=
"file.icon"
:style=
"
{'margin-left': file.level * 10 + 'px'}">
</i>
<i
class=
"fa fa-spinner fa-spin"
v-if=
"file.loading"
:style=
"
{'margin-left': file.level * 10 + 'px'}">
</i>
<i
class=
"fa fa-spinner fa-spin"
v-if=
"file.loading"
:style=
"
{'margin-left': file.level * 10 + 'px'}">
</i>
...
...
app/assets/javascripts/repo/repo_loading_file.vue
View file @
db355041
...
@@ -29,7 +29,7 @@ export default RepoLoadingFile;
...
@@ -29,7 +29,7 @@ export default RepoLoadingFile;
</
script
>
</
script
>
<
template
>
<
template
>
<tr
v-if=
"loading.tree && !hasFiles"
>
<tr
v-if=
"loading.tree && !hasFiles"
class=
"loading-file"
>
<td>
<td>
<div
class=
"animation-container animation-container-small"
>
<div
class=
"animation-container animation-container-small"
>
<div
v-for=
"n in 6"
:class=
"lineOfCode(n)"
></div>
<div
v-for=
"n in 6"
:class=
"lineOfCode(n)"
></div>
...
...
app/assets/javascripts/repo/repo_prev_directory.vue
View file @
db355041
...
@@ -18,7 +18,7 @@ export default RepoPreviousDirectory;
...
@@ -18,7 +18,7 @@ export default RepoPreviousDirectory;
</
script
>
</
script
>
<
template
>
<
template
>
<tr>
<tr
class=
"prev-directory"
>
<td
colspan=
"3"
>
<td
colspan=
"3"
>
<a
:href=
"prevUrl"
@
click.prevent=
"linkClicked(prevUrl)"
>
..
</a>
<a
:href=
"prevUrl"
@
click.prevent=
"linkClicked(prevUrl)"
>
..
</a>
</td>
</td>
...
...
app/assets/javascripts/repo/repo_sidebar.vue
View file @
db355041
...
@@ -73,18 +73,9 @@ export default RepoSidebar;
...
@@ -73,18 +73,9 @@ export default RepoSidebar;
<table
class=
"table"
>
<table
class=
"table"
>
<thead
v-if=
"!isMini"
>
<thead
v-if=
"!isMini"
>
<tr>
<tr>
<th
v-if=
"!isMini"
>
<th
class=
"name"
>
Name
</th>
Name
<th
class=
"hidden-sm hidden-xs last-commit"
>
Last Commit
</th>
</th>
<th
class=
"hidden-xs last-update"
>
Last Update
</th>
<th
v-else
>
Project
</th>
<th
class=
"hidden-sm hidden-xs"
v-if=
"!isMini"
>
Last Commit
</th>
<th
class=
"hidden-xs"
v-if=
"!isMini"
>
Last Update
</th>
</tr>
</tr>
</thead>
</thead>
<tbody>
<tbody>
...
...
spec/javascripts/repo/repo_binary_viewer_spec.js
View file @
db355041
...
@@ -24,7 +24,6 @@ describe('RepoBinaryViewer', () => {
...
@@ -24,7 +24,6 @@ describe('RepoBinaryViewer', () => {
const
vm
=
createComponent
();
const
vm
=
createComponent
();
const
img
=
vm
.
$el
.
querySelector
(
'
:scope > img
'
);
const
img
=
vm
.
$el
.
querySelector
(
'
:scope > img
'
);
expect
(
img
).
toBeTruthy
();
expect
(
img
.
src
).
toMatch
(
`/
${
uri
}
`
);
expect
(
img
.
src
).
toMatch
(
`/
${
uri
}
`
);
expect
(
img
.
alt
).
toEqual
(
activeFile
.
name
);
expect
(
img
.
alt
).
toEqual
(
activeFile
.
name
);
});
});
...
@@ -40,10 +39,8 @@ describe('RepoBinaryViewer', () => {
...
@@ -40,10 +39,8 @@ describe('RepoBinaryViewer', () => {
Store
.
binaryTypes
=
binaryTypes
;
Store
.
binaryTypes
=
binaryTypes
;
Store
.
activeFile
=
activeFile
;
Store
.
activeFile
=
activeFile
;
const
vm
=
createComponent
();
const
vm
=
createComponent
();
const
markdown
=
vm
.
$el
.
querySelector
(
'
:scope > div
'
);
expect
(
markdown
).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
:scope > div
'
)).
toEqual
(
activeFile
.
html
);
expect
(
markdown
.
innerHTML
).
toEqual
(
activeFile
.
html
);
});
});
it
(
'
does not render if no binary
'
,
()
=>
{
it
(
'
does not render if no binary
'
,
()
=>
{
...
...
spec/javascripts/repo/repo_file_buttons_spec.js
View file @
db355041
...
@@ -24,35 +24,23 @@ describe('RepoFileButtons', () => {
...
@@ -24,35 +24,23 @@ describe('RepoFileButtons', () => {
const
raw
=
vm
.
$el
.
querySelector
(
'
.raw
'
);
const
raw
=
vm
.
$el
.
querySelector
(
'
.raw
'
);
const
blame
=
vm
.
$el
.
querySelector
(
'
.blame
'
);
const
blame
=
vm
.
$el
.
querySelector
(
'
.blame
'
);
const
history
=
vm
.
$el
.
querySelector
(
'
.history
'
);
const
history
=
vm
.
$el
.
querySelector
(
'
.history
'
);
const
permalink
=
vm
.
$el
.
querySelector
(
'
.permalink
'
);
const
lock
=
vm
.
$el
.
querySelector
(
'
.lock
'
);
const
preview
=
vm
.
$el
.
querySelector
(
'
.preview
'
);
const
replace
=
vm
.
$el
.
querySelector
(
'
.replace
'
);
const
replace
=
vm
.
$el
.
querySelector
(
'
.replace
'
);
const
deleteBtn
=
vm
.
$el
.
querySelector
(
'
.delete
'
);
expect
(
vm
.
$el
.
id
).
toEqual
(
'
repo-file-buttons
'
);
expect
(
vm
.
$el
.
id
).
toEqual
(
'
repo-file-buttons
'
);
expect
(
vm
.
$el
.
style
.
borderBottom
).
toEqual
(
'
1px solid rgb(31, 120, 209)
'
);
expect
(
vm
.
$el
.
style
.
borderBottom
).
toEqual
(
'
1px solid rgb(31, 120, 209)
'
);
expect
(
raw
).
toBeTruthy
();
expect
(
raw
.
href
).
toMatch
(
`/
${
activeFile
.
url
}
`
);
expect
(
raw
.
href
).
toMatch
(
`/
${
activeFile
.
url
}
`
);
expect
(
raw
.
textContent
).
toEqual
(
'
Raw
'
);
expect
(
raw
.
textContent
).
toEqual
(
'
Raw
'
);
expect
(
blame
).
toBeTruthy
();
expect
(
blame
.
href
).
toMatch
(
`/
${
activeFile
.
url
}
`
);
expect
(
blame
.
href
).
toMatch
(
`/
${
activeFile
.
url
}
`
);
expect
(
blame
.
textContent
).
toEqual
(
'
Blame
'
);
expect
(
blame
.
textContent
).
toEqual
(
'
Blame
'
);
expect
(
history
).
toBeTruthy
();
expect
(
history
.
href
).
toMatch
(
`/
${
activeFile
.
url
}
`
);
expect
(
history
.
href
).
toMatch
(
`/
${
activeFile
.
url
}
`
);
expect
(
history
.
textContent
).
toEqual
(
'
History
'
);
expect
(
history
.
textContent
).
toEqual
(
'
History
'
);
expect
(
permalink
).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
.permalink
'
).
textContent
).
toEqual
(
'
Permalink
'
);
expect
(
permalink
.
textContent
).
toEqual
(
'
Permalink
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.lock
'
).
textContent
).
toEqual
(
'
Lock
'
);
expect
(
lock
).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
.preview
'
).
textContent
).
toEqual
(
activeFileLabel
);
expect
(
lock
.
textContent
).
toEqual
(
'
Lock
'
);
expect
(
preview
).
toBeTruthy
();
expect
(
preview
.
textContent
).
toEqual
(
activeFileLabel
);
expect
(
replace
).
toBeTruthy
();
expect
(
replace
.
dataset
.
target
).
toEqual
(
'
#modal-upload-blob
'
);
expect
(
replace
.
dataset
.
target
).
toEqual
(
'
#modal-upload-blob
'
);
expect
(
replace
.
dataset
.
toggle
).
toEqual
(
'
modal
'
);
expect
(
replace
.
dataset
.
toggle
).
toEqual
(
'
modal
'
);
expect
(
replace
.
textContent
).
toEqual
(
'
Replace
'
);
expect
(
replace
.
textContent
).
toEqual
(
'
Replace
'
);
expect
(
deleteBtn
).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
.delete
'
).
textContent
).
toEqual
(
'
Delete
'
);
expect
(
deleteBtn
.
textContent
).
toEqual
(
'
Delete
'
);
});
});
it
(
'
renders a white border if not editMode
'
,
()
=>
{
it
(
'
renders a white border if not editMode
'
,
()
=>
{
...
...
spec/javascripts/repo/repo_file_options_spec.js
View file @
db355041
...
@@ -17,11 +17,9 @@ describe('RepoFileOptions', () => {
...
@@ -17,11 +17,9 @@ describe('RepoFileOptions', () => {
isMini
:
true
,
isMini
:
true
,
projectName
,
projectName
,
});
});
const
title
=
vm
.
$el
.
querySelector
(
'
.title
'
);
expect
(
vm
.
$el
.
classList
.
contains
(
'
repo-file-options
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
classList
.
contains
(
'
repo-file-options
'
)).
toBeTruthy
();
expect
(
title
).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
.title
'
).
textContent
).
toEqual
(
projectName
);
expect
(
title
.
textContent
).
toEqual
(
projectName
);
expect
(
vm
.
$el
.
querySelector
(
'
a[title="New File"]
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
a[title="New File"]
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
a[title="New Folder"]
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
a[title="New Folder"]
'
)).
toBeTruthy
();
});
});
...
...
spec/javascripts/repo/repo_file_spec.js
View file @
db355041
...
@@ -27,23 +27,15 @@ describe('RepoFile', () => {
...
@@ -27,23 +27,15 @@ describe('RepoFile', () => {
file
,
file
,
activeFile
,
activeFile
,
});
});
const
icon
=
vm
.
$el
.
querySelector
(
`.
${
file
.
icon
}
`
);
const
name
=
vm
.
$el
.
querySelector
(
'
.repo-file-name
'
);
const
name
=
vm
.
$el
.
querySelector
(
'
.repo-file-name
'
);
const
commitMessage
=
vm
.
$el
.
querySelector
(
'
.commit-message
'
);
const
commitUpdate
=
vm
.
$el
.
querySelector
(
'
.commit-update
'
);
expect
(
vm
.
$el
.
innerHTML
).
toBeTruthy
();
expect
(
vm
.
$el
.
classList
.
contains
(
'
active
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
classList
.
contains
(
'
active
'
)).
toBeTruthy
();
expect
(
icon
).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
`.
${
file
.
icon
}
`
).
style
.
marginLeft
).
toEqual
(
'
100px
'
);
expect
(
icon
.
style
.
marginLeft
).
toEqual
(
'
100px
'
);
expect
(
name
).
toBeTruthy
();
expect
(
name
.
title
).
toEqual
(
file
.
url
);
expect
(
name
.
title
).
toEqual
(
file
.
url
);
expect
(
name
.
href
).
toMatch
(
`/
${
file
.
url
}
`
);
expect
(
name
.
href
).
toMatch
(
`/
${
file
.
url
}
`
);
expect
(
name
.
textContent
).
toEqual
(
file
.
name
);
expect
(
name
.
textContent
).
toEqual
(
file
.
name
);
expect
(
commitMessage
).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
.commit-message
'
).
textContent
).
toBe
(
file
.
lastCommitMessage
);
expect
(
commitMessage
.
textContent
).
toBe
(
file
.
lastCommitMessage
);
expect
(
vm
.
$el
.
querySelector
(
'
.commit-update
'
).
textContent
).
toBe
(
file
.
lastCommitUpdate
);
expect
(
commitUpdate
).
toBeTruthy
();
expect
(
commitUpdate
.
textContent
).
toBe
(
file
.
lastCommitUpdate
);
});
});
it
(
'
does render if hasFiles is true and is loading tree
'
,
()
=>
{
it
(
'
does render if hasFiles is true and is loading tree
'
,
()
=>
{
...
@@ -77,11 +69,9 @@ describe('RepoFile', () => {
...
@@ -77,11 +69,9 @@ describe('RepoFile', () => {
activeFile
,
activeFile
,
isMini
:
true
,
isMini
:
true
,
});
});
const
commitMessage
=
vm
.
$el
.
querySelector
(
'
.commit-message
'
);
const
commitUpdate
=
vm
.
$el
.
querySelector
(
'
.commit-update
'
);
expect
(
commitMessage
).
toBeFalsy
();
expect
(
vm
.
$el
.
querySelector
(
'
.commit-message
'
)
).
toBeFalsy
();
expect
(
commitUpdate
).
toBeFalsy
();
expect
(
vm
.
$el
.
querySelector
(
'
.commit-update
'
)
).
toBeFalsy
();
});
});
it
(
'
does not set active class if file is active file
'
,
()
=>
{
it
(
'
does not set active class if file is active file
'
,
()
=>
{
...
...
spec/javascripts/repo/repo_prev_directory_spec.js
View file @
db355041
...
@@ -19,7 +19,6 @@ describe('RepoPrevDirectory', () => {
...
@@ -19,7 +19,6 @@ describe('RepoPrevDirectory', () => {
spyOn
(
vm
,
'
linkClicked
'
);
spyOn
(
vm
,
'
linkClicked
'
);
expect
(
link
).
toBeTruthy
();
expect
(
link
.
href
).
toMatch
(
`/
${
prevUrl
}
`
);
expect
(
link
.
href
).
toMatch
(
`/
${
prevUrl
}
`
);
expect
(
link
.
textContent
).
toEqual
(
'
..
'
);
expect
(
link
.
textContent
).
toEqual
(
'
..
'
);
...
...
spec/javascripts/repo/repo_sidebar_spec.js
View file @
db355041
...
@@ -9,7 +9,43 @@ describe('RepoSidebar', () => {
...
@@ -9,7 +9,43 @@ describe('RepoSidebar', () => {
return
new
RepoSidebar
().
$mount
();
return
new
RepoSidebar
().
$mount
();
}
}
it
(
'
renders a list of tabs
'
,
()
=>
{
it
(
'
renders a sidebar
'
,
()
=>
{
RepoStore
.
files
=
[{
id
:
0
,
}];
const
vm
=
createComponent
();
const
vm
=
createComponent
();
const
thead
=
vm
.
$el
.
querySelector
(
'
thead
'
);
const
tbody
=
vm
.
$el
.
querySelector
(
'
tbody
'
);
expect
(
vm
.
$el
.
id
).
toEqual
(
'
sidebar
'
);
expect
(
vm
.
$el
.
classList
.
contains
(
'
sidebar-mini
'
)).
toBeFalsy
();
expect
(
thead
.
querySelector
(
'
.name
'
).
textContent
).
toEqual
(
'
Name
'
);
expect
(
thead
.
querySelector
(
'
.last-commit
'
).
textContent
).
toEqual
(
'
Last Commit
'
);
expect
(
thead
.
querySelector
(
'
.last-update
'
).
textContent
).
toEqual
(
'
Last Update
'
);
expect
(
tbody
.
querySelector
(
'
.repo-file-options
'
)).
toBeFalsy
();
expect
(
tbody
.
querySelector
(
'
.prev-directory
'
)).
toBeTruthy
();
expect
(
tbody
.
querySelector
(
'
.loading-file
'
)).
toBeFalsy
();
expect
(
tbody
.
querySelector
(
'
.file
'
)).
toBeTruthy
();
});
it
(
'
does not render a thead, renders repo-file-options and sets sidebar-mini class if isMini
'
,
()
=>
{
RepoStore
.
openedFiles
=
[{
id
:
0
,
}];
const
vm
=
createComponent
();
expect
(
vm
.
$el
.
classList
.
contains
(
'
sidebar-mini
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
thead
'
)).
toBeFalsy
();
expect
(
vm
.
$el
.
querySelector
(
'
tbody .repo-file-options
'
)).
toBeTruthy
();
});
it
(
'
renders 5 loading files if tree is loading and not hasFiles
'
,
()
=>
{
RepoStore
.
loading
=
{
tree
:
true
,
};
RepoStore
.
files
=
[];
const
vm
=
createComponent
();
expect
(
vm
.
$el
.
querySelectorAll
(
'
tbody .loading-file
'
).
length
).
toEqual
(
5
);
});
});
});
});
spec/javascripts/repo/repo_tab_spec.js
View file @
db355041
...
@@ -25,9 +25,7 @@ describe('RepoTab', () => {
...
@@ -25,9 +25,7 @@ describe('RepoTab', () => {
spyOn
(
vm
,
'
xClicked
'
);
spyOn
(
vm
,
'
xClicked
'
);
spyOn
(
vm
,
'
tabClicked
'
);
spyOn
(
vm
,
'
tabClicked
'
);
expect
(
close
).
toBeTruthy
();
expect
(
close
.
querySelector
(
'
.fa-times
'
)).
toBeTruthy
();
expect
(
close
.
querySelector
(
'
.fa-times
'
)).
toBeTruthy
();
expect
(
name
).
toBeTruthy
();
expect
(
name
.
textContent
).
toEqual
(
tab
.
name
);
expect
(
name
.
textContent
).
toEqual
(
tab
.
name
);
close
.
click
();
close
.
click
();
...
@@ -63,8 +61,7 @@ describe('RepoTab', () => {
...
@@ -63,8 +61,7 @@ describe('RepoTab', () => {
const
vm
=
createComponent
({
const
vm
=
createComponent
({
tab
,
tab
,
});
});
const
close
=
vm
.
$el
.
querySelector
(
'
.close
'
);
expect
(
close
.
querySelector
(
'
.fa-circle
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
.close
.fa-circle
'
)).
toBeTruthy
();
});
});
});
});
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