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
Boxiang Sun
gitlab-ce
Commits
a65f07a2
Commit
a65f07a2
authored
Jun 07, 2017
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address feedback
parent
a7936b2f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
3 deletions
+18
-3
app/assets/javascripts/groups/index.js
app/assets/javascripts/groups/index.js
+1
-2
app/assets/stylesheets/framework/lists.scss
app/assets/stylesheets/framework/lists.scss
+0
-1
config/webpack.config.js
config/webpack.config.js
+1
-0
spec/javascripts/groups/group_item_spec.js
spec/javascripts/groups/group_item_spec.js
+4
-0
spec/javascripts/groups/groups_spec.js
spec/javascripts/groups/groups_spec.js
+4
-0
spec/javascripts/lib/utils/common_utils_spec.js
spec/javascripts/lib/utils/common_utils_spec.js
+8
-0
No files found.
app/assets/javascripts/groups/index.js
View file @
a65f07a2
/* global Flash */
/* global Flash */
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
GroupsList
from
'
~/groups_list
'
;
import
GroupFilterableList
from
'
./groups_filterable_list
'
;
import
GroupFilterableList
from
'
./groups_filterable_list
'
;
import
GroupsComponent
from
'
./components/groups.vue
'
;
import
GroupsComponent
from
'
./components/groups.vue
'
;
import
GroupFolder
from
'
./components/group_folder.vue
'
;
import
GroupFolder
from
'
./components/group_folder.vue
'
;
...
@@ -181,6 +180,6 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -181,6 +180,6 @@ document.addEventListener('DOMContentLoaded', () => {
eventHub
.
$off
(
'
leaveGroup
'
,
this
.
leaveGroup
);
eventHub
.
$off
(
'
leaveGroup
'
,
this
.
leaveGroup
);
eventHub
.
$off
(
'
updateGroups
'
,
this
.
updateGroups
);
eventHub
.
$off
(
'
updateGroups
'
,
this
.
updateGroups
);
eventHub
.
$off
(
'
updatePagination
'
,
this
.
updatePagination
);
eventHub
.
$off
(
'
updatePagination
'
,
this
.
updatePagination
);
}
}
,
});
});
});
});
app/assets/stylesheets/framework/lists.scss
View file @
a65f07a2
...
@@ -304,7 +304,6 @@ ul.indent-list {
...
@@ -304,7 +304,6 @@ ul.indent-list {
.group-list-tree
{
.group-list-tree
{
margin-bottom
:
0
;
margin-bottom
:
0
;
margin-left
:
20px
;
margin-left
:
20px
;
// border-top: solid 1px $border-white-light;
position
:
relative
;
position
:
relative
;
&
:
:
before
{
&
:
:
before
{
...
...
config/webpack.config.js
View file @
a65f07a2
...
@@ -156,6 +156,7 @@ var config = {
...
@@ -156,6 +156,7 @@ var config = {
'
environments
'
,
'
environments
'
,
'
environments_folder
'
,
'
environments_folder
'
,
'
filtered_search
'
,
'
filtered_search
'
,
'
groups
'
,
'
issue_show
'
,
'
issue_show
'
,
'
merge_conflicts
'
,
'
merge_conflicts
'
,
'
notebook_viewer
'
,
'
notebook_viewer
'
,
...
...
spec/javascripts/groups/group_item_spec.js
View file @
a65f07a2
...
@@ -26,6 +26,10 @@ describe('Groups Component', () => {
...
@@ -26,6 +26,10 @@ describe('Groups Component', () => {
});
});
});
});
afterEach
(()
=>
{
component
.
$destroy
();
});
it
(
'
should render the group item correctly
'
,
()
=>
{
it
(
'
should render the group item correctly
'
,
()
=>
{
expect
(
component
.
$el
.
classList
.
contains
(
'
group-row
'
)).
toBe
(
true
);
expect
(
component
.
$el
.
classList
.
contains
(
'
group-row
'
)).
toBe
(
true
);
expect
(
component
.
$el
.
classList
.
contains
(
'
.no-description
'
)).
toBe
(
false
);
expect
(
component
.
$el
.
classList
.
contains
(
'
.no-description
'
)).
toBe
(
false
);
...
...
spec/javascripts/groups/groups_spec.js
View file @
a65f07a2
...
@@ -34,6 +34,10 @@ describe('Groups Component', () => {
...
@@ -34,6 +34,10 @@ describe('Groups Component', () => {
});
});
});
});
afterEach
(()
=>
{
component
.
$destroy
();
});
describe
(
'
with data
'
,
()
=>
{
describe
(
'
with data
'
,
()
=>
{
it
(
'
should render a list of groups
'
,
()
=>
{
it
(
'
should render a list of groups
'
,
()
=>
{
expect
(
component
.
$el
.
classList
.
contains
(
'
groups-list-tree-container
'
)).
toBe
(
true
);
expect
(
component
.
$el
.
classList
.
contains
(
'
groups-list-tree-container
'
)).
toBe
(
true
);
...
...
spec/javascripts/lib/utils/common_utils_spec.js
View file @
a65f07a2
...
@@ -150,6 +150,14 @@ import '~/lib/utils/common_utils';
...
@@ -150,6 +150,14 @@ import '~/lib/utils/common_utils';
const
value
=
gl
.
utils
.
getParameterByName
(
'
fakeParameter
'
);
const
value
=
gl
.
utils
.
getParameterByName
(
'
fakeParameter
'
);
expect
(
value
).
toBe
(
null
);
expect
(
value
).
toBe
(
null
);
});
});
it
(
'
should return valid paramentes if URL is provided
'
,
()
=>
{
let
value
=
gl
.
utils
.
getParameterByName
(
'
foo
'
,
'
http://cocteau.twins/?foo=bar
'
);
expect
(
value
).
toBe
(
'
bar
'
);
value
=
gl
.
utils
.
getParameterByName
(
'
manan
'
,
'
http://cocteau.twins/?foo=bar&manan=canchu
'
);
expect
(
value
).
toBe
(
'
canchu
'
);
});
});
});
describe
(
'
gl.utils.normalizedHeaders
'
,
()
=>
{
describe
(
'
gl.utils.normalizedHeaders
'
,
()
=>
{
...
...
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