diff options
Diffstat (limited to 'spec/features/projects/members')
16 files changed, 32 insertions, 30 deletions
diff --git a/spec/features/projects/members/anonymous_user_sees_members_spec.rb b/spec/features/projects/members/anonymous_user_sees_members_spec.rb index 096cf97551a..3b0f00c5494 100644 --- a/spec/features/projects/members/anonymous_user_sees_members_spec.rb +++ b/spec/features/projects/members/anonymous_user_sees_members_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects > Members > Anonymous user sees members' do +RSpec.describe 'Projects > Members > Anonymous user sees members' do let(:user) { create(:user) } let(:group) { create(:group, :public) } let(:project) { create(:project, :public) } diff --git a/spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb b/spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb index b6f6e2ca85f..c8a9f959188 100644 --- a/spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb +++ b/spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects > Members > Group member cannot leave group project' do +RSpec.describe 'Projects > Members > Group member cannot leave group project' do let(:user) { create(:user) } let(:group) { create(:group) } let(:project) { create(:project, namespace: group) } diff --git a/spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb b/spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb index cf9441bcd55..34c870b8a96 100644 --- a/spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb +++ b/spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects > Members > Group member cannot request access to their group project' do +RSpec.describe 'Projects > Members > Group member cannot request access to their group project' do let(:user) { create(:user) } let(:group) { create(:group) } let(:project) { create(:project, namespace: group) } diff --git a/spec/features/projects/members/group_members_spec.rb b/spec/features/projects/members/group_members_spec.rb index d37f912a2bc..3060d2c6a43 100644 --- a/spec/features/projects/members/group_members_spec.rb +++ b/spec/features/projects/members/group_members_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects members' do +RSpec.describe 'Projects members' do let(:user) { create(:user) } let(:developer) { create(:user) } let(:group) { create(:group, :public) } @@ -21,7 +21,7 @@ describe 'Projects members' do context 'with a group invitee' do before do group_invitee - visit project_settings_members_path(project) + visit project_project_members_path(project) end it 'does not appear in the project members page' do @@ -70,7 +70,7 @@ describe 'Projects members' do before do group_invitee project_invitee - visit project_settings_members_path(project) + visit project_project_members_path(project) end it 'shows the project invitee, the project developer, and the group owner' do @@ -91,7 +91,7 @@ describe 'Projects members' do context 'with a group requester' do before do group.request_access(group_requester) - visit project_settings_members_path(project) + visit project_project_members_path(project) end it 'does not appear in the project members page' do @@ -105,7 +105,7 @@ describe 'Projects members' do before do group.request_access(group_requester) project.request_access(project_requester) - visit project_settings_members_path(project) + visit project_project_members_path(project) end it 'shows the project requester, the project developer, and the group owner' do @@ -129,7 +129,7 @@ describe 'Projects members' do it_behaves_like 'showing user status' do let(:user_with_status) { developer } - subject { visit project_settings_members_path(project) } + subject { visit project_project_members_path(project) } end end end diff --git a/spec/features/projects/members/group_requester_cannot_request_access_to_project_spec.rb b/spec/features/projects/members/group_requester_cannot_request_access_to_project_spec.rb index ecd55f71c84..ec86b7db4fa 100644 --- a/spec/features/projects/members/group_requester_cannot_request_access_to_project_spec.rb +++ b/spec/features/projects/members/group_requester_cannot_request_access_to_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects > Members > Group requester cannot request access to project', :js do +RSpec.describe 'Projects > Members > Group requester cannot request access to project', :js do let(:user) { create(:user) } let(:owner) { create(:user) } let(:group) { create(:group, :public) } diff --git a/spec/features/projects/members/groups_with_access_list_spec.rb b/spec/features/projects/members/groups_with_access_list_spec.rb index 6e8d1a945e1..2ee6bc103e9 100644 --- a/spec/features/projects/members/groups_with_access_list_spec.rb +++ b/spec/features/projects/members/groups_with_access_list_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects > Members > Groups with access list', :js do +RSpec.describe 'Projects > Members > Groups with access list', :js do let(:user) { create(:user) } let(:group) { create(:group, :public) } let(:project) { create(:project, :public) } @@ -12,7 +12,7 @@ describe 'Projects > Members > Groups with access list', :js do @group_link = create(:project_group_link, project: project, group: group) sign_in(user) - visit project_settings_members_path(project) + visit project_project_members_path(project) end it 'updates group access level' do @@ -24,7 +24,7 @@ describe 'Projects > Members > Groups with access list', :js do wait_for_requests - visit project_settings_members_path(project) + visit project_project_members_path(project) expect(first('.group_member')).to have_content('Guest') end diff --git a/spec/features/projects/members/invite_group_spec.rb b/spec/features/projects/members/invite_group_spec.rb index e76637039c6..058cbfff662 100644 --- a/spec/features/projects/members/invite_group_spec.rb +++ b/spec/features/projects/members/invite_group_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Project > Members > Invite group', :js do +RSpec.describe 'Project > Members > Invite group', :js do include Select2Helper include ActionView::Helpers::DateHelper @@ -11,14 +11,14 @@ describe 'Project > Members > Invite group', :js do describe 'Share with group lock' do shared_examples 'the project can be shared with groups' do it 'the "Invite group" tab exists' do - visit project_settings_members_path(project) + visit project_project_members_path(project) expect(page).to have_selector('#invite-group-tab') end end shared_examples 'the project cannot be shared with groups' do it 'the "Invite group" tab does not exist' do - visit project_settings_members_path(project) + visit project_project_members_path(project) expect(page).not_to have_selector('#invite-group-tab') end end @@ -37,7 +37,9 @@ describe 'Project > Members > Invite group', :js do it_behaves_like 'the project can be shared with groups' it 'the project can be shared with another group' do - visit project_settings_members_path(project) + visit project_project_members_path(project) + + expect(page).not_to have_css('.project-members-groups') click_on 'invite-group-tab' @@ -118,7 +120,7 @@ describe 'Project > Members > Invite group', :js do group.add_guest(maintainer) sign_in(maintainer) - visit project_settings_members_path(project) + visit project_project_members_path(project) click_on 'invite-group-tab' @@ -151,7 +153,7 @@ describe 'Project > Members > Invite group', :js do create(:group).add_owner(maintainer) create(:group).add_owner(maintainer) - visit project_settings_members_path(project) + visit project_project_members_path(project) click_link 'Invite group' @@ -184,7 +186,7 @@ describe 'Project > Members > Invite group', :js do end it 'the groups dropdown does not show ancestors' do - visit project_settings_members_path(project) + visit project_project_members_path(project) click_on 'invite-group-tab' click_link 'Search for a group' diff --git a/spec/features/projects/members/list_spec.rb b/spec/features/projects/members/list_spec.rb index f404699b2f6..f51ebde8f80 100644 --- a/spec/features/projects/members/list_spec.rb +++ b/spec/features/projects/members/list_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Project members list' do +RSpec.describe 'Project members list' do include Select2Helper include Spec::Support::Helpers::Features::ListRowsHelpers @@ -113,6 +113,6 @@ describe 'Project members list' do end def visit_members_page - visit project_settings_members_path(project) + visit project_project_members_path(project) end end diff --git a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb index cbcd03b33ce..979bbd57aa3 100644 --- a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb +++ b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects > Members > Maintainer adds member with expiration date', :js do +RSpec.describe 'Projects > Members > Maintainer adds member with expiration date', :js do include Select2Helper include ActiveSupport::Testing::TimeHelpers diff --git a/spec/features/projects/members/master_manages_access_requests_spec.rb b/spec/features/projects/members/master_manages_access_requests_spec.rb index f113fb643f8..4c3eaa93352 100644 --- a/spec/features/projects/members/master_manages_access_requests_spec.rb +++ b/spec/features/projects/members/master_manages_access_requests_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects > Members > Maintainer manages access requests' do +RSpec.describe 'Projects > Members > Maintainer manages access requests' do it_behaves_like 'Maintainer manages access requests' do let(:entity) { create(:project, :public) } let(:members_page_path) { project_project_members_path(entity) } diff --git a/spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb b/spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb index e2b57472b2e..fa02e815867 100644 --- a/spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb +++ b/spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects > Members > Member cannot request access to their project' do +RSpec.describe 'Projects > Members > Member cannot request access to their project' do let(:member) { create(:user) } let(:project) { create(:project) } diff --git a/spec/features/projects/members/member_leaves_project_spec.rb b/spec/features/projects/members/member_leaves_project_spec.rb index cb7a405e821..aa7633c3b28 100644 --- a/spec/features/projects/members/member_leaves_project_spec.rb +++ b/spec/features/projects/members/member_leaves_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects > Members > Member leaves project' do +RSpec.describe 'Projects > Members > Member leaves project' do let(:user) { create(:user) } let(:project) { create(:project, :repository) } diff --git a/spec/features/projects/members/owner_cannot_leave_project_spec.rb b/spec/features/projects/members/owner_cannot_leave_project_spec.rb index 781c584796d..fbe8583b236 100644 --- a/spec/features/projects/members/owner_cannot_leave_project_spec.rb +++ b/spec/features/projects/members/owner_cannot_leave_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects > Members > Owner cannot leave project' do +RSpec.describe 'Projects > Members > Owner cannot leave project' do let(:project) { create(:project) } before do diff --git a/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb b/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb index 5643a29b4e4..5e6e3d4d7f2 100644 --- a/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb +++ b/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects > Members > Owner cannot request access to their own project' do +RSpec.describe 'Projects > Members > Owner cannot request access to their own project' do let(:project) { create(:project) } before do diff --git a/spec/features/projects/members/sorting_spec.rb b/spec/features/projects/members/sorting_spec.rb index 12f485317d8..be27cbc0d66 100644 --- a/spec/features/projects/members/sorting_spec.rb +++ b/spec/features/projects/members/sorting_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects > Members > Sorting' do +RSpec.describe 'Projects > Members > Sorting' do let(:maintainer) { create(:user, name: 'John Doe') } let(:developer) { create(:user, name: 'Mary Jane', last_sign_in_at: 5.days.ago) } let(:project) { create(:project, namespace: maintainer.namespace, creator: maintainer) } diff --git a/spec/features/projects/members/user_requests_access_spec.rb b/spec/features/projects/members/user_requests_access_spec.rb index 7e7faca9741..a339130ee3c 100644 --- a/spec/features/projects/members/user_requests_access_spec.rb +++ b/spec/features/projects/members/user_requests_access_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects > Members > User requests access', :js do +RSpec.describe 'Projects > Members > User requests access', :js do let(:user) { create(:user) } let(:project) { create(:project, :public, :repository) } let(:maintainer) { project.owner } |