diff options
author | Stan Hu <stanhu@gmail.com> | 2017-08-23 00:19:41 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-08-23 00:19:41 +0300 |
commit | df51a8009920f7efae87d2118e7199aaf6cc0d88 (patch) | |
tree | 4ccd57ee49121f1d985a5fbe148e5b2d0d095ae1 | |
parent | f7dd04685a0c3638f9f8d8b45f05ffd3558d4c1c (diff) | |
parent | 800c9bf37d1ed57c5f072c4864a2a22250c5959b (diff) |
Merge branch 'rs-fix-master' into 'master'
Add `:nested_groups` metadata to two subgroup-related specs
Closes #36811 and #36812
See merge request !13746
-rw-r--r-- | spec/features/explore/new_menu_spec.rb | 2 | ||||
-rw-r--r-- | spec/services/groups/create_service_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/explore/new_menu_spec.rb b/spec/features/explore/new_menu_spec.rb index 2cd06258e22..e1c74a24890 100644 --- a/spec/features/explore/new_menu_spec.rb +++ b/spec/features/explore/new_menu_spec.rb @@ -74,7 +74,7 @@ feature 'Top Plus Menu', :js do expect(page).to have_content('Title') end - scenario 'Click on New subgroup shows new group page' do + scenario 'Click on New subgroup shows new group page', :nested_groups do visit group_path(group) click_topmenuitem("New subgroup") diff --git a/spec/services/groups/create_service_spec.rb b/spec/services/groups/create_service_spec.rb index 6973e7ff990..10dda45d2a1 100644 --- a/spec/services/groups/create_service_spec.rb +++ b/spec/services/groups/create_service_spec.rb @@ -22,7 +22,7 @@ describe Groups::CreateService, '#execute' do end end - describe 'creating subgroup' do + describe 'creating subgroup', :nested_groups do let!(:group) { create(:group) } let!(:service) { described_class.new(user, group_params.merge(parent_id: group.id)) } |