diff options
Diffstat (limited to 'spec/controllers/groups/runners_controller_spec.rb')
-rw-r--r-- | spec/controllers/groups/runners_controller_spec.rb | 106 |
1 files changed, 28 insertions, 78 deletions
diff --git a/spec/controllers/groups/runners_controller_spec.rb b/spec/controllers/groups/runners_controller_spec.rb index 9ae5cb6f87c..37242bce6bf 100644 --- a/spec/controllers/groups/runners_controller_spec.rb +++ b/spec/controllers/groups/runners_controller_spec.rb @@ -65,52 +65,28 @@ RSpec.describe Groups::RunnersController, feature_category: :runner_fleet do end describe '#new' do - context 'when create_runner_workflow_for_namespace is enabled' do + context 'when user is owner' do before do - stub_feature_flags(create_runner_workflow_for_namespace: [group]) - end - - context 'when user is owner' do - before do - group.add_owner(user) - end - - it 'renders new with 200 status code' do - get :new, params: { group_id: group } - - expect(response).to have_gitlab_http_status(:ok) - expect(response).to render_template(:new) - end + group.add_owner(user) end - context 'when user is not owner' do - before do - group.add_maintainer(user) - end - - it 'renders a 404' do - get :new, params: { group_id: group } + it 'renders new with 200 status code' do + get :new, params: { group_id: group } - expect(response).to have_gitlab_http_status(:not_found) - end + expect(response).to have_gitlab_http_status(:ok) + expect(response).to render_template(:new) end end - context 'when create_runner_workflow_for_namespace is disabled' do + context 'when user is not owner' do before do - stub_feature_flags(create_runner_workflow_for_namespace: false) + group.add_maintainer(user) end - context 'when user is owner' do - before do - group.add_owner(user) - end - - it 'renders a 404' do - get :new, params: { group_id: group } + it 'renders a 404' do + get :new, params: { group_id: group } - expect(response).to have_gitlab_http_status(:not_found) - end + expect(response).to have_gitlab_http_status(:not_found) end end end @@ -118,66 +94,40 @@ RSpec.describe Groups::RunnersController, feature_category: :runner_fleet do describe '#register' do subject(:register) { get :register, params: { group_id: group, id: new_runner } } - context 'when create_runner_workflow_for_namespace is enabled' do + context 'when user is owner' do before do - stub_feature_flags(create_runner_workflow_for_namespace: [group]) + group.add_owner(user) end - context 'when user is owner' do - before do - group.add_owner(user) - end - - context 'when runner can be registered after creation' do - let_it_be(:new_runner) { create(:ci_runner, :group, groups: [group], registration_type: :authenticated_user) } + context 'when runner can be registered after creation' do + let_it_be(:new_runner) { create(:ci_runner, :group, groups: [group], registration_type: :authenticated_user) } - it 'renders a :register template' do - register - - expect(response).to have_gitlab_http_status(:ok) - expect(response).to render_template(:register) - end - end - - context 'when runner cannot be registered after creation' do - let_it_be(:new_runner) { runner } - - it 'returns :not_found' do - register + it 'renders a :register template' do + register - expect(response).to have_gitlab_http_status(:not_found) - end + expect(response).to have_gitlab_http_status(:ok) + expect(response).to render_template(:register) end end - context 'when user is not owner' do - before do - group.add_maintainer(user) - end - - context 'when runner can be registered after creation' do - let_it_be(:new_runner) { create(:ci_runner, :group, groups: [group], registration_type: :authenticated_user) } + context 'when runner cannot be registered after creation' do + let_it_be(:new_runner) { runner } - it 'returns :not_found' do - register + it 'returns :not_found' do + register - expect(response).to have_gitlab_http_status(:not_found) - end + expect(response).to have_gitlab_http_status(:not_found) end end end - context 'when create_runner_workflow_for_namespace is disabled' do - let_it_be(:new_runner) { create(:ci_runner, :group, groups: [group], registration_type: :authenticated_user) } - + context 'when user is not owner' do before do - stub_feature_flags(create_runner_workflow_for_namespace: false) + group.add_maintainer(user) end - context 'when user is owner' do - before do - group.add_owner(user) - end + context 'when runner can be registered after creation' do + let_it_be(:new_runner) { create(:ci_runner, :group, groups: [group], registration_type: :authenticated_user) } it 'returns :not_found' do register |