diff options
author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-10-12 09:44:53 +0200 |
---|---|---|
committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-10-12 11:36:55 +0200 |
commit | d2a9d95a2237aa3d6a93be5df012838180b704b7 (patch) | |
tree | 5e9882816ec15133a88fb47bb743fb9c8d66aae3 /spec/features | |
parent | 2c25a7ae3453e72ad6cab504255e327c17df0a95 (diff) | |
download | gitlab-ce-d2a9d95a2237aa3d6a93be5df012838180b704b7.tar.gz |
Skip some nested group specs when using MySQL
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/dashboard/groups_list_spec.rb | 19 | ||||
-rw-r--r-- | spec/features/groups/show_spec.rb | 3 |
2 files changed, 16 insertions, 6 deletions
diff --git a/spec/features/dashboard/groups_list_spec.rb b/spec/features/dashboard/groups_list_spec.rb index c9d9371f5ab..3f68e63797d 100644 --- a/spec/features/dashboard/groups_list_spec.rb +++ b/spec/features/dashboard/groups_list_spec.rb @@ -22,15 +22,24 @@ feature 'Dashboard Groups page', :js do wait_for_requests 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) expect(page).to have_content(nested_group.name) - - expect(page).not_to have_content(another_group.name) end - describe 'when filtering groups' do + describe 'when filtering groups', :nested_groups do before do group.add_owner(user) nested_group.add_owner(user) @@ -64,7 +73,7 @@ feature 'Dashboard Groups page', :js do end end - describe 'group with subgroups' do + describe 'group with subgroups', :nested_groups do let!(:subgroup) { create(:group, :public, parent: group) } before do diff --git a/spec/features/groups/show_spec.rb b/spec/features/groups/show_spec.rb index 501086fce80..7fc2b383749 100644 --- a/spec/features/groups/show_spec.rb +++ b/spec/features/groups/show_spec.rb @@ -32,7 +32,8 @@ feature 'Group show page' do group.add_owner(user) sign_in(user) end - context 'when subgroups are supported', :js do + + context 'when subgroups are supported', :js, :nested_groups do before do allow(Group).to receive(:supports_nested_groups?) { true } visit path |