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
d2a9d95a
Commit
d2a9d95a
authored
Oct 12, 2017
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Skip some nested group specs when using MySQL
parent
2c25a7ae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
6 deletions
+16
-6
spec/features/dashboard/groups_list_spec.rb
spec/features/dashboard/groups_list_spec.rb
+14
-5
spec/features/groups/show_spec.rb
spec/features/groups/show_spec.rb
+2
-1
No files found.
spec/features/dashboard/groups_list_spec.rb
View file @
d2a9d95a
...
@@ -22,15 +22,24 @@ feature 'Dashboard Groups page', :js do
...
@@ -22,15 +22,24 @@ feature 'Dashboard Groups page', :js do
wait_for_requests
wait_for_requests
expect
(
page
).
to
have_content
(
group
.
name
)
expect
(
page
).
to
have_content
(
group
.
name
)
expect
(
page
).
to
have_content
(
nested_group
.
parent
.
name
)
expect
(
page
).
not_to
have_content
(
another_group
.
name
)
end
it
'shows subgroups the user is member of'
,
:nested_groups
do
group
.
add_owner
(
user
)
nested_group
.
add_owner
(
user
)
sign_in
(
user
)
visit
dashboard_groups_path
wait_for_requests
expect
(
page
).
to
have_content
(
nested_group
.
parent
.
name
)
click_group_caret
(
nested_group
.
parent
)
click_group_caret
(
nested_group
.
parent
)
expect
(
page
).
to
have_content
(
nested_group
.
name
)
expect
(
page
).
to
have_content
(
nested_group
.
name
)
expect
(
page
).
not_to
have_content
(
another_group
.
name
)
end
end
describe
'when filtering groups'
do
describe
'when filtering groups'
,
:nested_groups
do
before
do
before
do
group
.
add_owner
(
user
)
group
.
add_owner
(
user
)
nested_group
.
add_owner
(
user
)
nested_group
.
add_owner
(
user
)
...
@@ -64,7 +73,7 @@ feature 'Dashboard Groups page', :js do
...
@@ -64,7 +73,7 @@ feature 'Dashboard Groups page', :js do
end
end
end
end
describe
'group with subgroups'
do
describe
'group with subgroups'
,
:nested_groups
do
let!
(
:subgroup
)
{
create
(
:group
,
:public
,
parent:
group
)
}
let!
(
:subgroup
)
{
create
(
:group
,
:public
,
parent:
group
)
}
before
do
before
do
...
...
spec/features/groups/show_spec.rb
View file @
d2a9d95a
...
@@ -32,7 +32,8 @@ feature 'Group show page' do
...
@@ -32,7 +32,8 @@ feature 'Group show page' do
group
.
add_owner
(
user
)
group
.
add_owner
(
user
)
sign_in
(
user
)
sign_in
(
user
)
end
end
context
'when subgroups are supported'
,
:js
do
context
'when subgroups are supported'
,
:js
,
:nested_groups
do
before
do
before
do
allow
(
Group
).
to
receive
(
:supports_nested_groups?
)
{
true
}
allow
(
Group
).
to
receive
(
:supports_nested_groups?
)
{
true
}
visit
path
visit
path
...
...
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