diff options
Diffstat (limited to 'spec/features/groups')
-rw-r--r-- | spec/features/groups/activity_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/groups/board_sidebar_spec.rb | 3 | ||||
-rw-r--r-- | spec/features/groups/empty_states_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/groups/group_runners_spec.rb | 46 | ||||
-rw-r--r-- | spec/features/groups/group_settings_spec.rb | 27 | ||||
-rw-r--r-- | spec/features/groups/issues_spec.rb | 12 | ||||
-rw-r--r-- | spec/features/groups/milestone_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/groups/milestones_sorting_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/groups/settings/repository_spec.rb | 23 |
9 files changed, 67 insertions, 52 deletions
diff --git a/spec/features/groups/activity_spec.rb b/spec/features/groups/activity_spec.rb index 6ca69e76d33..5bac80959b1 100644 --- a/spec/features/groups/activity_spec.rb +++ b/spec/features/groups/activity_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe 'Group activity page' do - let(:user) { create(:group_member, :developer, user: create(:user), group: group ).user } + 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/board_sidebar_spec.rb b/spec/features/groups/board_sidebar_spec.rb index 69a6788e438..10ef28f3fbc 100644 --- a/spec/features/groups/board_sidebar_spec.rb +++ b/spec/features/groups/board_sidebar_spec.rb @@ -6,7 +6,7 @@ RSpec.describe 'Group Issue Boards', :js do include BoardHelpers let(:group) { create(:group) } - let(:user) { create(:group_member, user: create(:user), group: group ).user } + let(:user) { create(:group_member, user: create(:user), group: group).user } let!(:project_1) { create(:project, :public, group: group) } let!(:project_2) { create(:project, :public, group: group) } let!(:project_1_label) { create(:label, project: project_1, name: 'Development 1') } @@ -19,6 +19,7 @@ RSpec.describe 'Group Issue Boards', :js do let(:card) { find('.board:nth-child(1)').first('.board-card') } before do + stub_feature_flags(apollo_boards: false) sign_in(user) visit group_board_path(group, board) diff --git a/spec/features/groups/empty_states_spec.rb b/spec/features/groups/empty_states_spec.rb index 84882fc674e..f1a8f97461a 100644 --- a/spec/features/groups/empty_states_spec.rb +++ b/spec/features/groups/empty_states_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' RSpec.describe 'Group empty states' do let(:group) { create(:group) } - let(:user) { create(:group_member, :developer, user: create(:user), group: group ).user } + let(:user) { create(:group_member, :developer, user: create(:user), group: group).user } before do sign_in(user) diff --git a/spec/features/groups/group_runners_spec.rb b/spec/features/groups/group_runners_spec.rb index e9807c487d5..c9d1c69e9e1 100644 --- a/spec/features/groups/group_runners_spec.rb +++ b/spec/features/groups/group_runners_spec.rb @@ -4,6 +4,7 @@ require 'spec_helper' RSpec.describe "Group Runners" do include Spec::Support::Helpers::Features::RunnersHelpers + include Spec::Support::Helpers::ModalHelpers let_it_be(:group_owner) { create(:user) } let_it_be(:group) { create(:group) } @@ -157,6 +158,19 @@ RSpec.describe "Group Runners" do end end + context "with multiple runners" do + before do + create(:ci_runner, :group, groups: [group], description: 'runner-foo') + create(:ci_runner, :group, groups: [group], description: 'runner-bar') + + visit group_runners_path(group) + end + + it_behaves_like 'deletes runners in bulk' do + let(:runner_count) { '2' } + end + end + describe 'filtered search' do before do visit group_runners_path(group) @@ -201,18 +215,32 @@ RSpec.describe "Group Runners" do end describe "Group runner edit page", :js do - let!(:group_runner) do - create(:ci_runner, :group, groups: [group]) - end + context 'when updating a group runner' do + let_it_be(:group_runner) { create(:ci_runner, :group, groups: [group]) } - before do - visit edit_group_runner_path(group, group_runner) - wait_for_requests + before do + visit edit_group_runner_path(group, group_runner) + wait_for_requests + end + + it_behaves_like 'submits edit runner form' do + let(:runner) { group_runner } + let(:runner_page_path) { group_runner_path(group, group_runner) } + end end - it_behaves_like 'submits edit runner form' do - let(:runner) { group_runner } - let(:runner_page_path) { group_runner_path(group, group_runner) } + context 'when updating a project runner' do + let_it_be(:project_runner) { create(:ci_runner, :project, projects: [project]) } + + before do + visit edit_group_runner_path(group, project_runner) + wait_for_requests + end + + it_behaves_like 'submits edit runner form' do + let(:runner) { project_runner } + let(:runner_page_path) { group_runner_path(group, project_runner) } + end end end end diff --git a/spec/features/groups/group_settings_spec.rb b/spec/features/groups/group_settings_spec.rb index 2f599d24b01..81ff0088e1e 100644 --- a/spec/features/groups/group_settings_spec.rb +++ b/spec/features/groups/group_settings_spec.rb @@ -150,13 +150,15 @@ RSpec.describe 'Edit group settings' do it 'can successfully transfer the group' do visit edit_group_path(selected_group) - page.within('.js-group-transfer-form') do - namespace_select.find('button').click - namespace_select.find('.dropdown-menu p', text: target_group_name, match: :first).click - - click_button 'Transfer group' + page.within('[data-testid="transfer-locations-dropdown"]') do + click_button _('Select parent group') + fill_in _('Search'), with: target_group_name + wait_for_requests + click_button target_group_name end + click_button s_('GroupSettings|Transfer group') + page.within(confirm_modal) do expect(page).to have_text "You are going to transfer #{selected_group.name} to another namespace. Are you ABSOLUTELY sure?" @@ -169,16 +171,16 @@ RSpec.describe 'Edit group settings' do end end - context 'from a subgroup' do + context 'when transfering from a subgroup' do let(:selected_group) { create(:group, path: 'foo-subgroup', parent: group) } - context 'to no parent group' do + context 'when transfering to no parent group' do let(:target_group_name) { 'No parent group' } it_behaves_like 'can transfer the group' end - context 'to a different parent group' do + context 'when transfering to a parent group' do let(:target_group) { create(:group, path: 'foo-parentgroup') } let(:target_group_name) { target_group.name } @@ -190,14 +192,11 @@ RSpec.describe 'Edit group settings' do end end - context 'from a root group' do + context 'when transfering from a root group to a parent group' do let(:selected_group) { create(:group, path: 'foo-rootgroup') } + let(:target_group_name) { group.name } - context 'to a parent group' do - let(:target_group_name) { group.name } - - it_behaves_like 'can transfer the group' - end + it_behaves_like 'can transfer the group' end end diff --git a/spec/features/groups/issues_spec.rb b/spec/features/groups/issues_spec.rb index eec07c84cde..d4e88505118 100644 --- a/spec/features/groups/issues_spec.rb +++ b/spec/features/groups/issues_spec.rb @@ -69,7 +69,7 @@ RSpec.describe 'Group issues page' do context 'issues list', :js do let(:subgroup) { create(:group, parent: group) } let(:subgroup_project) { create(:project, :public, group: subgroup) } - let(:user_in_group) { create(:group_member, :maintainer, user: create(:user), group: group ).user } + let(:user_in_group) { create(:group_member, :maintainer, user: create(:user), group: group).user } let!(:issue) { create(:issue, project: project, title: 'root group issue') } let!(:subgroup_issue) { create(:issue, project: subgroup_project, title: 'subgroup issue') } @@ -111,7 +111,7 @@ RSpec.describe 'Group issues page' do context 'projects with issues disabled' do describe 'issue dropdown' do - let(:user_in_group) { create(:group_member, :maintainer, user: create(:user), group: group ).user } + let(:user_in_group) { create(:group_member, :maintainer, user: create(:user), group: group).user } before do [project, project_with_issues_disabled].each { |project| project.add_maintainer(user_in_group) } @@ -129,7 +129,7 @@ RSpec.describe 'Group issues page' do end context 'manual ordering', :js do - let(:user_in_group) { create(:group_member, :maintainer, user: create(:user), group: group ).user } + let(:user_in_group) { create(:group_member, :maintainer, user: create(:user), group: group).user } let!(:issue1) { create(:issue, project: project, title: 'Issue #1', relative_position: 1) } let!(:issue2) { create(:issue, project: project, title: 'Issue #2', relative_position: 2) } @@ -161,6 +161,8 @@ RSpec.describe 'Group issues page' do visit issues_group_path(group) select_manual_sort + wait_for_requests + drag_to(selector: '.manual-ordering', from_index: 0, to_index: 2) expect_issue_order @@ -176,6 +178,8 @@ RSpec.describe 'Group issues page' do visit issues_group_path(group) select_manual_sort + wait_for_requests + drag_to(selector: '.manual-ordering', from_index: 0, to_index: 2) expect(page).to have_text 'An error occurred while reordering issues.' @@ -195,7 +199,7 @@ RSpec.describe 'Group issues page' do end context 'issues pagination', :js do - let(:user_in_group) { create(:group_member, :maintainer, user: create(:user), group: group ).user } + let(:user_in_group) { create(:group_member, :maintainer, user: create(:user), group: group).user } let!(:issues) do (1..25).to_a.map { |index| create(:issue, project: project, title: "Issue #{index}") } diff --git a/spec/features/groups/milestone_spec.rb b/spec/features/groups/milestone_spec.rb index 42eaa8358a1..92a40459737 100644 --- a/spec/features/groups/milestone_spec.rb +++ b/spec/features/groups/milestone_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' RSpec.describe 'Group milestones' do let_it_be(:group) { create(:group) } let_it_be(:project) { create(:project_empty_repo, group: group) } - let_it_be(:user) { create(:group_member, :maintainer, user: create(:user), group: group ).user } + let_it_be(:user) { create(:group_member, :maintainer, user: create(:user), group: group).user } around do |example| freeze_time { example.run } diff --git a/spec/features/groups/milestones_sorting_spec.rb b/spec/features/groups/milestones_sorting_spec.rb index 125bf9ce3a7..6f3fc72775f 100644 --- a/spec/features/groups/milestones_sorting_spec.rb +++ b/spec/features/groups/milestones_sorting_spec.rb @@ -11,7 +11,7 @@ RSpec.describe 'Milestones sorting', :js do let!(:project_milestone2) { create(:milestone, project: project, title: 'v2.0', due_date: 5.days.from_now) } let!(:other_project_milestone2) { create(:milestone, project: other_project, title: 'v2.0', due_date: 5.days.from_now) } let!(:group_milestone) { create(:milestone, group: group, title: 'v3.0', due_date: 7.days.from_now) } - let(:user) { create(:group_member, :maintainer, user: create(:user), group: group ).user } + let(:user) { create(:group_member, :maintainer, user: create(:user), group: group).user } before do sign_in(user) diff --git a/spec/features/groups/settings/repository_spec.rb b/spec/features/groups/settings/repository_spec.rb index f6b8bbdd35f..cd7dcbdb28d 100644 --- a/spec/features/groups/settings/repository_spec.rb +++ b/spec/features/groups/settings/repository_spec.rb @@ -23,26 +23,9 @@ RSpec.describe 'Group Repository settings', :js do stub_container_registry_config(enabled: true) end - context 'when ajax deploy tokens is enabled' do - before do - stub_feature_flags(ajax_new_deploy_token: true) - end - - it_behaves_like 'a deploy token in settings' do - let(:entity_type) { 'group' } - let(:page_path) { group_settings_repository_path(group) } - end - end - - context 'when ajax deploy tokens is disabled' do - before do - stub_feature_flags(ajax_new_deploy_token: false) - end - - it_behaves_like 'a deploy token in settings' do - let(:entity_type) { 'group' } - let(:page_path) { group_settings_repository_path(group) } - end + it_behaves_like 'a deploy token in settings' do + let(:entity_type) { 'group' } + let(:page_path) { group_settings_repository_path(group) } end end |