diff options
author | Winnie Hellmann <winnie@gitlab.com> | 2018-07-05 06:32:05 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-07-05 06:32:05 +0000 |
commit | 3db2f327594e134729a0ca2f48a748bb28ab7d6c (patch) | |
tree | 661033b988897aaf506c0deaf457c2002e17d51b /spec/features/groups | |
parent | baab4cddb091c0aa9649fecc340b8b343747ba83 (diff) | |
download | gitlab-ce-3db2f327594e134729a0ca2f48a748bb28ab7d6c.tar.gz |
Enable Capybara/FeatureMethods cop
Diffstat (limited to 'spec/features/groups')
22 files changed, 94 insertions, 94 deletions
diff --git a/spec/features/groups/activity_spec.rb b/spec/features/groups/activity_spec.rb index 0d7d3771071..27520cf0e22 100644 --- a/spec/features/groups/activity_spec.rb +++ b/spec/features/groups/activity_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Group activity page' do +describe 'Group activity page' do let(:user) { create(:group_member, :developer, user: create(:user), group: group ).user } let(:group) { create(:group) } let(:path) { activity_group_path(group) } diff --git a/spec/features/groups/empty_states_spec.rb b/spec/features/groups/empty_states_spec.rb index 5828d833ae9..dd901b034f7 100644 --- a/spec/features/groups/empty_states_spec.rb +++ b/spec/features/groups/empty_states_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Group empty states' do +describe 'Group empty states' do let(:group) { create(:group) } let(:user) { create(:group_member, :developer, user: create(:user), group: group ).user } diff --git a/spec/features/groups/group_settings_spec.rb b/spec/features/groups/group_settings_spec.rb index bf329b0bb94..59254ecc982 100644 --- a/spec/features/groups/group_settings_spec.rb +++ b/spec/features/groups/group_settings_spec.rb @@ -1,10 +1,10 @@ require 'spec_helper' -feature 'Edit group settings' do - given(:user) { create(:user) } - given(:group) { create(:group, path: 'foo') } +describe 'Edit group settings' do + let(:user) { create(:user) } + let(:group) { create(:group, path: 'foo') } - background do + before do group.add_owner(user) sign_in(user) end @@ -14,14 +14,14 @@ feature 'Edit group settings' do let(:old_group_full_path) { "/#{group.path}" } let(:new_group_full_path) { "/#{new_group_path}" } - scenario 'the group is accessible via the new path' do + it 'the group is accessible via the new path' do update_path(new_group_path) visit new_group_full_path expect(current_path).to eq(new_group_full_path) expect(find('h1.group-title')).to have_content(group.name) end - scenario 'the old group path redirects to the new path' do + it 'the old group path redirects to the new path' do update_path(new_group_path) visit old_group_full_path expect(current_path).to eq(new_group_full_path) @@ -29,18 +29,18 @@ feature 'Edit group settings' do end context 'with a subgroup' do - given!(:subgroup) { create(:group, parent: group, path: 'subgroup') } - given(:old_subgroup_full_path) { "/#{group.path}/#{subgroup.path}" } - given(:new_subgroup_full_path) { "/#{new_group_path}/#{subgroup.path}" } + let!(:subgroup) { create(:group, parent: group, path: 'subgroup') } + let(:old_subgroup_full_path) { "/#{group.path}/#{subgroup.path}" } + let(:new_subgroup_full_path) { "/#{new_group_path}/#{subgroup.path}" } - scenario 'the subgroup is accessible via the new path' do + it 'the subgroup is accessible via the new path' do update_path(new_group_path) visit new_subgroup_full_path expect(current_path).to eq(new_subgroup_full_path) expect(find('h1.group-title')).to have_content(subgroup.name) end - scenario 'the old subgroup path redirects to the new path' do + it 'the old subgroup path redirects to the new path' do update_path(new_group_path) visit old_subgroup_full_path expect(current_path).to eq(new_subgroup_full_path) @@ -49,9 +49,9 @@ feature 'Edit group settings' do end context 'with a project' do - given!(:project) { create(:project, group: group) } - given(:old_project_full_path) { "/#{group.path}/#{project.path}" } - given(:new_project_full_path) { "/#{new_group_path}/#{project.path}" } + let!(:project) { create(:project, group: group) } + let(:old_project_full_path) { "/#{group.path}/#{project.path}" } + let(:new_project_full_path) { "/#{new_group_path}/#{project.path}" } before(:context) do TestEnv.clean_test_path @@ -61,14 +61,14 @@ feature 'Edit group settings' do TestEnv.clean_test_path end - scenario 'the project is accessible via the new path' do + it 'the project is accessible via the new path' do update_path(new_group_path) visit new_project_full_path expect(current_path).to eq(new_project_full_path) expect(find('.breadcrumbs')).to have_content(project.path) end - scenario 'the old project path redirects to the new path' do + it 'the old project path redirects to the new path' do update_path(new_group_path) visit old_project_full_path expect(current_path).to eq(new_project_full_path) diff --git a/spec/features/groups/issues_spec.rb b/spec/features/groups/issues_spec.rb index e131ded3688..2bab6aa3d48 100644 --- a/spec/features/groups/issues_spec.rb +++ b/spec/features/groups/issues_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Group issues page' do +describe 'Group issues page' do include FilteredSearchHelpers let(:group) { create(:group) } diff --git a/spec/features/groups/labels/edit_spec.rb b/spec/features/groups/labels/edit_spec.rb index fb338127861..7cfc27a8905 100644 --- a/spec/features/groups/labels/edit_spec.rb +++ b/spec/features/groups/labels/edit_spec.rb @@ -1,17 +1,17 @@ require 'spec_helper' -feature 'Edit group label' do - given(:user) { create(:user) } - given(:group) { create(:group) } - given(:label) { create(:group_label, group: group) } +describe 'Edit group label' do + let(:user) { create(:user) } + let(:group) { create(:group) } + let(:label) { create(:group_label, group: group) } - background do + before do group.add_owner(user) sign_in(user) visit edit_group_label_path(group, label) end - scenario 'update label with new title' do + it 'update label with new title' do fill_in 'label_title', with: 'new label name' click_button 'Save changes' diff --git a/spec/features/groups/labels/index_spec.rb b/spec/features/groups/labels/index_spec.rb index 6c1b43a9013..0ce7dad4040 100644 --- a/spec/features/groups/labels/index_spec.rb +++ b/spec/features/groups/labels/index_spec.rb @@ -1,17 +1,17 @@ require 'spec_helper' -feature 'Group labels' do +describe 'Group labels' do let(:user) { create(:user) } let(:group) { create(:group) } let!(:label) { create(:group_label, group: group) } - background do + before do group.add_owner(user) sign_in(user) visit group_labels_path(group) end - scenario 'label has edit button', :js do + it 'label has edit button', :js do expect(page).to have_selector('.label-action.edit') end end diff --git a/spec/features/groups/labels/subscription_spec.rb b/spec/features/groups/labels/subscription_spec.rb index 2e06caf98f6..d9543bfa97f 100644 --- a/spec/features/groups/labels/subscription_spec.rb +++ b/spec/features/groups/labels/subscription_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Labels subscription' do +describe 'Labels subscription' do let(:user) { create(:user) } let(:group) { create(:group) } let!(:feature) { create(:group_label, group: group, title: 'feature') } @@ -11,7 +11,7 @@ feature 'Labels subscription' do gitlab_sign_in user end - scenario 'users can subscribe/unsubscribe to group labels', :js do + it 'users can subscribe/unsubscribe to group labels', :js do visit group_labels_path(group) expect(page).to have_content('feature') diff --git a/spec/features/groups/labels/user_sees_links_to_issuables.rb b/spec/features/groups/labels/user_sees_links_to_issuables.rb index 5d6290d2109..1fdba78fa6c 100644 --- a/spec/features/groups/labels/user_sees_links_to_issuables.rb +++ b/spec/features/groups/labels/user_sees_links_to_issuables.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Groups > Labels > User sees links to issuables' do +describe 'Groups > Labels > User sees links to issuables' do set(:group) { create(:group, :public) } before do @@ -8,7 +8,7 @@ feature 'Groups > Labels > User sees links to issuables' do visit group_labels_path(group) end - scenario 'shows links to MRs and issues' do + it 'shows links to MRs and issues' do expect(page).to have_link('view merge requests') expect(page).to have_link('view open issues') end diff --git a/spec/features/groups/members/filter_members_spec.rb b/spec/features/groups/members/filter_members_spec.rb index 5ddb5894624..8b4f6dbcc50 100644 --- a/spec/features/groups/members/filter_members_spec.rb +++ b/spec/features/groups/members/filter_members_spec.rb @@ -1,18 +1,18 @@ require 'spec_helper' -feature 'Groups > Members > Filter members' do +describe 'Groups > Members > Filter members' do let(:user) { create(:user) } let(:user_with_2fa) { create(:user, :two_factor_via_otp) } let(:group) { create(:group) } - background do + before do group.add_owner(user) group.add_master(user_with_2fa) sign_in(user) end - scenario 'shows all members' do + it 'shows all members' do visit_members_list expect(first_member).to include(user.name) @@ -20,7 +20,7 @@ feature 'Groups > Members > Filter members' do expect(page).to have_css('.member-filter-2fa-dropdown .dropdown-toggle-text', text: '2FA: Everyone') end - scenario 'shows only 2FA members' do + it 'shows only 2FA members' do visit_members_list(two_factor: 'enabled') expect(first_member).to include(user_with_2fa.name) @@ -28,7 +28,7 @@ feature 'Groups > Members > Filter members' do expect(page).to have_css('.member-filter-2fa-dropdown .dropdown-toggle-text', text: '2FA: Enabled') end - scenario 'shows only non 2FA members' do + it 'shows only non 2FA members' do visit_members_list(two_factor: 'disabled') expect(first_member).to include(user.name) diff --git a/spec/features/groups/members/leave_group_spec.rb b/spec/features/groups/members/leave_group_spec.rb index 067a2dc850f..7a91c64d7db 100644 --- a/spec/features/groups/members/leave_group_spec.rb +++ b/spec/features/groups/members/leave_group_spec.rb @@ -1,15 +1,15 @@ require 'spec_helper' -feature 'Groups > Members > Leave group' do +describe 'Groups > Members > Leave group' do let(:user) { create(:user) } let(:other_user) { create(:user) } let(:group) { create(:group) } - background do + before do gitlab_sign_in(user) end - scenario 'guest leaves the group' do + it 'guest leaves the group' do group.add_guest(user) group.add_owner(other_user) @@ -21,7 +21,7 @@ feature 'Groups > Members > Leave group' do expect(group.users).not_to include(user) end - scenario 'guest leaves the group as last member' do + it 'guest leaves the group as last member' do group.add_guest(user) visit group_path(group) @@ -32,7 +32,7 @@ feature 'Groups > Members > Leave group' do expect(group.users).not_to include(user) end - scenario 'owner leaves the group if they is not the last owner' do + it 'owner leaves the group if they is not the last owner' do group.add_owner(user) group.add_owner(other_user) @@ -44,7 +44,7 @@ feature 'Groups > Members > Leave group' do expect(group.users).not_to include(user) end - scenario 'owner can not leave the group if they is a last owner' do + it 'owner can not leave the group if they is a last owner' do group.add_owner(user) visit group_path(group) diff --git a/spec/features/groups/members/list_members_spec.rb b/spec/features/groups/members/list_members_spec.rb index 5c5d48c3623..33f93fcc470 100644 --- a/spec/features/groups/members/list_members_spec.rb +++ b/spec/features/groups/members/list_members_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Groups > Members > List members' do +describe 'Groups > Members > List members' do include Select2Helper let(:user1) { create(:user, name: 'John Doe') } @@ -8,11 +8,11 @@ feature 'Groups > Members > List members' do let(:group) { create(:group) } let(:nested_group) { create(:group, parent: group) } - background do + before do gitlab_sign_in(user1) end - scenario 'show members from current group and parent', :nested_groups do + it 'show members from current group and parent', :nested_groups do group.add_developer(user1) nested_group.add_developer(user2) @@ -22,7 +22,7 @@ feature 'Groups > Members > List members' do expect(second_row.text).to include(user2.name) end - scenario 'show user once if member of both current group and parent', :nested_groups do + it 'show user once if member of both current group and parent', :nested_groups do group.add_developer(user1) nested_group.add_developer(user1) diff --git a/spec/features/groups/members/manage_members_spec.rb b/spec/features/groups/members/manage_members_spec.rb index 21f7b4999ad..0eda2c7f26d 100644 --- a/spec/features/groups/members/manage_members_spec.rb +++ b/spec/features/groups/members/manage_members_spec.rb @@ -1,17 +1,17 @@ require 'spec_helper' -feature 'Groups > Members > Manage members' do +describe 'Groups > Members > Manage members' do include Select2Helper let(:user1) { create(:user, name: 'John Doe') } let(:user2) { create(:user, name: 'Mary Jane') } let(:group) { create(:group) } - background do + before do sign_in(user1) end - scenario 'update user to owner level', :js do + it 'update user to owner level', :js do group.add_owner(user1) group.add_developer(user2) @@ -25,7 +25,7 @@ feature 'Groups > Members > Manage members' do end end - scenario 'add user to group', :js do + it 'add user to group', :js do group.add_owner(user1) visit group_group_members_path(group) @@ -38,7 +38,7 @@ feature 'Groups > Members > Manage members' do end end - scenario 'do not disclose email addresses', :js do + it 'do not disclose email addresses', :js do group.add_owner(user1) create(:user, email: 'undisclosed_email@gitlab.com', name: "Jane 'invisible' Doe") @@ -59,7 +59,7 @@ feature 'Groups > Members > Manage members' do expect(page).to have_content("Jane 'invisible' Doe") end - scenario 'remove user from group', :js do + it 'remove user from group', :js do group.add_owner(user1) group.add_developer(user2) @@ -75,7 +75,7 @@ feature 'Groups > Members > Manage members' do expect(group.users).not_to include(user2) end - scenario 'add yourself to group when already an owner', :js do + it 'add yourself to group when already an owner', :js do group.add_owner(user1) visit group_group_members_path(group) @@ -88,7 +88,7 @@ feature 'Groups > Members > Manage members' do end end - scenario 'invite user to group', :js do + it 'invite user to group', :js do group.add_owner(user1) visit group_group_members_path(group) @@ -102,7 +102,7 @@ feature 'Groups > Members > Manage members' do end end - scenario 'guest can not manage other users' do + it 'guest can not manage other users' do group.add_guest(user1) group.add_developer(user2) diff --git a/spec/features/groups/members/master_manages_access_requests_spec.rb b/spec/features/groups/members/master_manages_access_requests_spec.rb index 2fd6d1ec599..4fdf1497781 100644 --- a/spec/features/groups/members/master_manages_access_requests_spec.rb +++ b/spec/features/groups/members/master_manages_access_requests_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Groups > Members > Master manages access requests' do +describe 'Groups > Members > Master manages access requests' do it_behaves_like 'Master manages access requests' do let(:entity) { create(:group, :public, :access_requestable) } let(:members_page_path) { group_group_members_path(entity) } diff --git a/spec/features/groups/members/request_access_spec.rb b/spec/features/groups/members/request_access_spec.rb index 10389a74703..1c833c36a61 100644 --- a/spec/features/groups/members/request_access_spec.rb +++ b/spec/features/groups/members/request_access_spec.rb @@ -1,25 +1,25 @@ require 'spec_helper' -feature 'Groups > Members > Request access' do +describe 'Groups > Members > Request access' do let(:user) { create(:user) } let(:owner) { create(:user) } let(:group) { create(:group, :public, :access_requestable) } let!(:project) { create(:project, :private, namespace: group) } - background do + before do group.add_owner(owner) sign_in(user) visit group_path(group) end - scenario 'request access feature is disabled' do + it 'request access feature is disabled' do group.update_attributes(request_access_enabled: false) visit group_path(group) expect(page).not_to have_content 'Request Access' end - scenario 'user can request access to a group' do + it 'user can request access to a group' do perform_enqueued_jobs { click_link 'Request Access' } expect(ActionMailer::Base.deliveries.last.to).to eq [owner.notification_email] @@ -32,13 +32,13 @@ feature 'Groups > Members > Request access' do expect(page).not_to have_content 'Leave group' end - scenario 'user does not see private projects' do + it 'user does not see private projects' do perform_enqueued_jobs { click_link 'Request Access' } expect(page).not_to have_content project.name end - scenario 'user does not see group in the Dashboard > Groups page' do + it 'user does not see group in the Dashboard > Groups page' do perform_enqueued_jobs { click_link 'Request Access' } visit dashboard_groups_path @@ -46,7 +46,7 @@ feature 'Groups > Members > Request access' do expect(page).not_to have_content group.name end - scenario 'user is not listed in the group members page' do + it 'user is not listed in the group members page' do click_link 'Request Access' expect(group.requesters.exists?(user_id: user)).to be_truthy @@ -58,7 +58,7 @@ feature 'Groups > Members > Request access' do end end - scenario 'user can withdraw its request for access' do + it 'user can withdraw its request for access' do click_link 'Request Access' expect(group.requesters.exists?(user_id: user)).to be_truthy @@ -69,7 +69,7 @@ feature 'Groups > Members > Request access' do expect(page).to have_content 'Your access request to the group has been withdrawn.' end - scenario 'member does not see the request access button' do + it 'member does not see the request access button' do group.add_owner(user) visit group_path(group) diff --git a/spec/features/groups/members/sort_members_spec.rb b/spec/features/groups/members/sort_members_spec.rb index e175ad04f86..ee32f6d77fe 100644 --- a/spec/features/groups/members/sort_members_spec.rb +++ b/spec/features/groups/members/sort_members_spec.rb @@ -1,18 +1,18 @@ require 'spec_helper' -feature 'Groups > Members > Sort members' do +describe 'Groups > Members > Sort members' do let(:owner) { create(:user, name: 'John Doe') } let(:developer) { create(:user, name: 'Mary Jane', last_sign_in_at: 5.days.ago) } let(:group) { create(:group) } - background do + before do create(:group_member, :owner, user: owner, group: group, created_at: 5.days.ago) create(:group_member, :developer, user: developer, group: group, created_at: 3.days.ago) sign_in(owner) end - scenario 'sorts alphabetically by default' do + it 'sorts alphabetically by default' do visit_members_list(sort: nil) expect(first_member).to include(owner.name) @@ -20,7 +20,7 @@ feature 'Groups > Members > Sort members' do expect(page).to have_css('.member-sort-dropdown .dropdown-toggle-text', text: 'Name, ascending') end - scenario 'sorts by access level ascending' do + it 'sorts by access level ascending' do visit_members_list(sort: :access_level_asc) expect(first_member).to include(developer.name) @@ -28,7 +28,7 @@ feature 'Groups > Members > Sort members' do expect(page).to have_css('.member-sort-dropdown .dropdown-toggle-text', text: 'Access level, ascending') end - scenario 'sorts by access level descending' do + it 'sorts by access level descending' do visit_members_list(sort: :access_level_desc) expect(first_member).to include(owner.name) @@ -36,7 +36,7 @@ feature 'Groups > Members > Sort members' do expect(page).to have_css('.member-sort-dropdown .dropdown-toggle-text', text: 'Access level, descending') end - scenario 'sorts by last joined' do + it 'sorts by last joined' do visit_members_list(sort: :last_joined) expect(first_member).to include(developer.name) @@ -44,7 +44,7 @@ feature 'Groups > Members > Sort members' do expect(page).to have_css('.member-sort-dropdown .dropdown-toggle-text', text: 'Last joined') end - scenario 'sorts by oldest joined' do + it 'sorts by oldest joined' do visit_members_list(sort: :oldest_joined) expect(first_member).to include(owner.name) @@ -52,7 +52,7 @@ feature 'Groups > Members > Sort members' do expect(page).to have_css('.member-sort-dropdown .dropdown-toggle-text', text: 'Oldest joined') end - scenario 'sorts by name ascending' do + it 'sorts by name ascending' do visit_members_list(sort: :name_asc) expect(first_member).to include(owner.name) @@ -60,7 +60,7 @@ feature 'Groups > Members > Sort members' do expect(page).to have_css('.member-sort-dropdown .dropdown-toggle-text', text: 'Name, ascending') end - scenario 'sorts by name descending' do + it 'sorts by name descending' do visit_members_list(sort: :name_desc) expect(first_member).to include(developer.name) @@ -68,7 +68,7 @@ feature 'Groups > Members > Sort members' do expect(page).to have_css('.member-sort-dropdown .dropdown-toggle-text', text: 'Name, descending') end - scenario 'sorts by recent sign in', :clean_gitlab_redis_shared_state do + it 'sorts by recent sign in', :clean_gitlab_redis_shared_state do visit_members_list(sort: :recent_sign_in) expect(first_member).to include(owner.name) @@ -76,7 +76,7 @@ feature 'Groups > Members > Sort members' do expect(page).to have_css('.member-sort-dropdown .dropdown-toggle-text', text: 'Recent sign in') end - scenario 'sorts by oldest sign in', :clean_gitlab_redis_shared_state do + it 'sorts by oldest sign in', :clean_gitlab_redis_shared_state do visit_members_list(sort: :oldest_sign_in) expect(first_member).to include(developer.name) diff --git a/spec/features/groups/merge_requests_spec.rb b/spec/features/groups/merge_requests_spec.rb index 921a447f6ee..54a8016c157 100644 --- a/spec/features/groups/merge_requests_spec.rb +++ b/spec/features/groups/merge_requests_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Group merge requests page' do +describe 'Group merge requests page' do include FilteredSearchHelpers let(:path) { merge_requests_group_path(group) } diff --git a/spec/features/groups/milestone_spec.rb b/spec/features/groups/milestone_spec.rb index 2108d763028..5ab03cb6ee6 100644 --- a/spec/features/groups/milestone_spec.rb +++ b/spec/features/groups/milestone_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -feature 'Group milestones' do +describe 'Group milestones' do let(:group) { create(:group) } let!(:project) { create(:project_empty_repo, group: group) } let(:user) { create(:group_member, :master, user: create(:user), group: group ).user } diff --git a/spec/features/groups/milestones_sorting_spec.rb b/spec/features/groups/milestones_sorting_spec.rb index a0fe40cf1d3..5deb55bc8bb 100644 --- a/spec/features/groups/milestones_sorting_spec.rb +++ b/spec/features/groups/milestones_sorting_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Milestones sorting', :js do +describe 'Milestones sorting', :js do let(:group) { create(:group) } let!(:project) { create(:project_empty_repo, group: group) } let!(:other_project) { create(:project_empty_repo, group: group) } @@ -15,7 +15,7 @@ feature 'Milestones sorting', :js do sign_in(user) end - scenario 'visit group milestones and sort by due_date_asc' do + it 'visit group milestones and sort by due_date_asc' do visit group_milestones_path(group) expect(page).to have_button('Due soon') diff --git a/spec/features/groups/settings/group_badges_spec.rb b/spec/features/groups/settings/group_badges_spec.rb index a99da4a119b..070a4a31ffa 100644 --- a/spec/features/groups/settings/group_badges_spec.rb +++ b/spec/features/groups/settings/group_badges_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Group Badges' do +describe 'Group Badges' do include WaitForRequests let(:user) { create(:user) } diff --git a/spec/features/groups/share_lock_spec.rb b/spec/features/groups/share_lock_spec.rb index cefbc15e068..5bbe77019ca 100644 --- a/spec/features/groups/share_lock_spec.rb +++ b/spec/features/groups/share_lock_spec.rb @@ -1,19 +1,19 @@ require 'spec_helper' -feature 'Group share with group lock' do - given(:root_owner) { create(:user) } - given(:root_group) { create(:group) } +describe 'Group share with group lock' do + let(:root_owner) { create(:user) } + let(:root_group) { create(:group) } - background do + before do root_group.add_owner(root_owner) sign_in(root_owner) end context 'with a subgroup', :nested_groups do - given!(:subgroup) { create(:group, parent: root_group) } + let!(:subgroup) { create(:group, parent: root_group) } context 'when enabling the parent group share with group lock' do - scenario 'the subgroup share with group lock becomes enabled' do + it 'the subgroup share with group lock becomes enabled' do visit edit_group_path(root_group) enable_group_lock @@ -23,14 +23,14 @@ feature 'Group share with group lock' do end context 'when disabling the parent group share with group lock (which was already enabled)' do - background do + before do visit edit_group_path(root_group) enable_group_lock end context 'and the subgroup share with group lock is enabled' do - scenario 'the subgroup share with group lock does not change' do + it 'the subgroup share with group lock does not change' do visit edit_group_path(root_group) disable_group_lock @@ -40,13 +40,13 @@ feature 'Group share with group lock' do end context 'but the subgroup share with group lock is disabled' do - background do + before do visit edit_group_path(subgroup) disable_group_lock end - scenario 'the subgroup share with group lock does not change' do + it 'the subgroup share with group lock does not change' do visit edit_group_path(root_group) disable_group_lock diff --git a/spec/features/groups/show_spec.rb b/spec/features/groups/show_spec.rb index b7a7aa0e174..ac961e98a61 100644 --- a/spec/features/groups/show_spec.rb +++ b/spec/features/groups/show_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Group show page' do +describe 'Group show page' do let(:group) { create(:group) } let(:path) { group_path(group) } diff --git a/spec/features/groups/user_sees_users_dropdowns_in_issuables_list_spec.rb b/spec/features/groups/user_sees_users_dropdowns_in_issuables_list_spec.rb index 5ed4f3ad2bc..6d6f206d761 100644 --- a/spec/features/groups/user_sees_users_dropdowns_in_issuables_list_spec.rb +++ b/spec/features/groups/user_sees_users_dropdowns_in_issuables_list_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Groups > User sees users dropdowns in issuables list' do +describe 'Groups > User sees users dropdowns in issuables list' do let(:entity) { create(:group) } let(:user_in_dropdown) { create(:user) } let!(:user_not_in_dropdown) { create(:user) } |