From 359d72ba3ec931205a58b4a992cc9b6e93fd0ca2 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Tue, 6 Jun 2017 02:29:34 +0900 Subject: [PATCH] Fix static analysys --- .../pipeline_schedules_controller_spec.rb | 6 +++--- .../access_matchers_for_controller.rb | 20 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/spec/controllers/projects/pipeline_schedules_controller_spec.rb b/spec/controllers/projects/pipeline_schedules_controller_spec.rb index abbf74235ef..575e2050354 100644 --- a/spec/controllers/projects/pipeline_schedules_controller_spec.rb +++ b/spec/controllers/projects/pipeline_schedules_controller_spec.rb @@ -90,7 +90,7 @@ describe Projects::PipelineSchedulesController do describe 'GET edit' do let(:action) do - Proc.new do |user| + proc do |user| get :edit, namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id end end @@ -108,7 +108,7 @@ describe Projects::PipelineSchedulesController do describe 'GET take_ownership' do let(:action) do - Proc.new do |user| + proc do |user| post :take_ownership, namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id end end @@ -126,7 +126,7 @@ describe Projects::PipelineSchedulesController do describe 'PUT update' do let(:action) do - Proc.new do |user| + proc do |user| put :update, namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id end end diff --git a/spec/support/matchers/access_matchers_for_controller.rb b/spec/support/matchers/access_matchers_for_controller.rb index 14500201a59..12f4b57e43d 100644 --- a/spec/support/matchers/access_matchers_for_controller.rb +++ b/spec/support/matchers/access_matchers_for_controller.rb @@ -5,14 +5,22 @@ module AccessMatchersForController extend RSpec::Matchers::DSL include Warden::Test::Helpers - EXPECTED_STATUS_CODE_ALLOWED = [200, 302] - EXPECTED_STATUS_CODE_DENIED = [404] + EXPECTED_STATUS_CODE_ALLOWED = [200, 302].freeze + EXPECTED_STATUS_CODE_DENIED = [404].freeze def emulate_user(role, membership = nil) case role when :admin user = create(:admin) sign_in(user) + when :user + user = create(:user) + sign_in(user) + when :external + user = create(:user, external: true) + sign_in(user) + when :visitor # rubocop:disable Lint/EmptyWhen + # no-op when *Gitlab::Access.sym_options_with_owner.keys # owner, master, developer, reporter, guest raise ArgumentError, "cannot emulate #{role} without membership parent" unless membership @@ -24,14 +32,6 @@ module AccessMatchersForController end sign_in(user) - when :user - user = create(:user) - sign_in(user) - when :external - user = create(:user, external: true) - sign_in(user) - when :visitor - # no-op else raise ArgumentError, "cannot emulate user #{role}" end