From b21a7ee8e8f1b837840f8935f3e73b8c8fee2fd1 Mon Sep 17 00:00:00 2001 From: Hauke Klement Date: Tue, 17 Feb 2015 08:21:00 +0100 Subject: [PATCH] use shorter notation for creating procs, as suggested by RuboCop --- app/controllers/code_ocean/files_controller.rb | 2 +- app/controllers/hints_controller.rb | 2 +- spec/concerns/submission_scoring_spec.rb | 2 +- spec/controllers/code_ocean/files_controller_spec.rb | 4 ++-- spec/controllers/consumers_controller_spec.rb | 2 +- spec/controllers/errors_controller_spec.rb | 2 +- .../controllers/execution_environments_controller_spec.rb | 2 +- spec/controllers/exercises_controller_spec.rb | 8 ++++---- spec/controllers/file_types_controller_spec.rb | 2 +- spec/controllers/hints_controller_spec.rb | 2 +- spec/controllers/internal_users_controller_spec.rb | 2 +- spec/controllers/sessions_controller_spec.rb | 2 +- spec/controllers/submissions_controller_spec.rb | 4 ++-- spec/controllers/teams_controller_spec.rb | 2 +- spec/lib/docker_client_spec.rb | 2 +- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/controllers/code_ocean/files_controller.rb b/app/controllers/code_ocean/files_controller.rb index ff236468..3c255ffa 100644 --- a/app/controllers/code_ocean/files_controller.rb +++ b/app/controllers/code_ocean/files_controller.rb @@ -11,7 +11,7 @@ module CodeOcean def create @file = CodeOcean::File.new(file_params) authorize! - create_and_respond(object: @file, path: Proc.new { implement_exercise_path(@file.context.exercise, tab: 2) }) + create_and_respond(object: @file, path: proc { implement_exercise_path(@file.context.exercise, tab: 2) }) end def destroy diff --git a/app/controllers/hints_controller.rb b/app/controllers/hints_controller.rb index 90182b0d..14145e6f 100644 --- a/app/controllers/hints_controller.rb +++ b/app/controllers/hints_controller.rb @@ -12,7 +12,7 @@ class HintsController < ApplicationController def create @hint = Hint.new(hint_params) authorize! - create_and_respond(object: @hint, path: Proc.new { execution_environment_hint_path(@execution_environment, @hint) }) + create_and_respond(object: @hint, path: proc { execution_environment_hint_path(@execution_environment, @hint) }) end def destroy diff --git a/spec/concerns/submission_scoring_spec.rb b/spec/concerns/submission_scoring_spec.rb index c1394b92..e4bf53c0 100644 --- a/spec/concerns/submission_scoring_spec.rb +++ b/spec/concerns/submission_scoring_spec.rb @@ -13,7 +13,7 @@ describe SubmissionScoring do before(:each) { controller.instance_variable_set(:@current_user, FactoryGirl.create(:external_user)) } describe '#score_submission' do - let(:score_submission) { Proc.new { controller.score_submission(@submission) } } + let(:score_submission) { proc { controller.score_submission(@submission) } } before(:each) { score_submission.call } it 'assigns @assessor' do diff --git a/spec/controllers/code_ocean/files_controller_spec.rb b/spec/controllers/code_ocean/files_controller_spec.rb index d51b31db..cedb1d5c 100644 --- a/spec/controllers/code_ocean/files_controller_spec.rb +++ b/spec/controllers/code_ocean/files_controller_spec.rb @@ -8,7 +8,7 @@ describe CodeOcean::FilesController do let(:submission) { FactoryGirl.create(:submission, user: user) } context 'with a valid file' do - let(:request) { Proc.new { post :create, code_ocean_file: FactoryGirl.build(:file, context: submission).attributes, format: :json } } + let(:request) { proc { post :create, code_ocean_file: FactoryGirl.build(:file, context: submission).attributes, format: :json } } before(:each) { request.call } expect_assigns(file: CodeOcean::File) @@ -32,7 +32,7 @@ describe CodeOcean::FilesController do describe 'DELETE #destroy' do let(:exercise) { FactoryGirl.create(:fibonacci) } - let(:request) { Proc.new { delete :destroy, id: exercise.files.first.id } } + let(:request) { proc { delete :destroy, id: exercise.files.first.id } } before(:each) { request.call } expect_assigns(file: CodeOcean::File) diff --git a/spec/controllers/consumers_controller_spec.rb b/spec/controllers/consumers_controller_spec.rb index fcb5d934..921fe404 100644 --- a/spec/controllers/consumers_controller_spec.rb +++ b/spec/controllers/consumers_controller_spec.rb @@ -7,7 +7,7 @@ describe ConsumersController do describe 'POST #create' do context 'with a valid consumer' do - let(:request) { Proc.new { post :create, consumer: FactoryGirl.attributes_for(:consumer) } } + let(:request) { proc { post :create, consumer: FactoryGirl.attributes_for(:consumer) } } before(:each) { request.call } expect_assigns(consumer: Consumer) diff --git a/spec/controllers/errors_controller_spec.rb b/spec/controllers/errors_controller_spec.rb index fe973448..4da324dc 100644 --- a/spec/controllers/errors_controller_spec.rb +++ b/spec/controllers/errors_controller_spec.rb @@ -8,7 +8,7 @@ describe ErrorsController do describe 'POST #create' do context 'with a valid error' do - let(:request) { Proc.new { post :create, execution_environment_id: FactoryGirl.build(:error).execution_environment.id, error: FactoryGirl.attributes_for(:error), format: :json } } + let(:request) { proc { post :create, execution_environment_id: FactoryGirl.build(:error).execution_environment.id, error: FactoryGirl.attributes_for(:error), format: :json } } context 'when a hint can be matched' do let(:hint) { FactoryGirl.build(:ruby_syntax_error).message } diff --git a/spec/controllers/execution_environments_controller_spec.rb b/spec/controllers/execution_environments_controller_spec.rb index ba105d39..31869490 100644 --- a/spec/controllers/execution_environments_controller_spec.rb +++ b/spec/controllers/execution_environments_controller_spec.rb @@ -9,7 +9,7 @@ describe ExecutionEnvironmentsController do before(:each) { expect(DockerClient).to receive(:image_tags).at_least(:once).and_return([]) } context 'with a valid execution environment' do - let(:request) { Proc.new { post :create, execution_environment: FactoryGirl.attributes_for(:ruby) } } + let(:request) { proc { post :create, execution_environment: FactoryGirl.attributes_for(:ruby) } } before(:each) { request.call } expect_assigns(docker_images: Array) diff --git a/spec/controllers/exercises_controller_spec.rb b/spec/controllers/exercises_controller_spec.rb index 4513b319..a2358508 100644 --- a/spec/controllers/exercises_controller_spec.rb +++ b/spec/controllers/exercises_controller_spec.rb @@ -9,7 +9,7 @@ describe ExercisesController do let(:exercise_attributes) { FactoryGirl.build(:dummy).attributes } context 'with a valid exercise' do - let(:request) { Proc.new { post :create, exercise: exercise_attributes } } + let(:request) { proc { post :create, exercise: exercise_attributes } } before(:each) { request.call } expect_assigns(exercise: Exercise) @@ -23,7 +23,7 @@ describe ExercisesController do context 'when including a file' do let(:files_attributes) { {'0' => FactoryGirl.build(:file).attributes} } - let(:request) { Proc.new { post :create, exercise: exercise_attributes.merge(files_attributes: files_attributes) } } + let(:request) { proc { post :create, exercise: exercise_attributes.merge(files_attributes: files_attributes) } } it 'creates the file' do expect { request.call }.to change(CodeOcean::File, :count) @@ -32,7 +32,7 @@ describe ExercisesController do context "with a file upload" do let(:files_attributes) { {'0' => FactoryGirl.build(:file, content: fixture_file_upload('upload.rb', 'text/x-ruby')).attributes} } - let(:request) { Proc.new { post :create, exercise: exercise_attributes.merge(files_attributes: files_attributes) } } + let(:request) { proc { post :create, exercise: exercise_attributes.merge(files_attributes: files_attributes) } } it 'creates the file' do expect { request.call }.to change(CodeOcean::File, :count) @@ -77,7 +77,7 @@ describe ExercisesController do end describe 'GET #implement' do - let(:request) { Proc.new { get :implement, id: exercise.id } } + let(:request) { proc { get :implement, id: exercise.id } } before(:each) { request.call } expect_assigns(exercise: :exercise) diff --git a/spec/controllers/file_types_controller_spec.rb b/spec/controllers/file_types_controller_spec.rb index ed8ca675..fab736bf 100644 --- a/spec/controllers/file_types_controller_spec.rb +++ b/spec/controllers/file_types_controller_spec.rb @@ -7,7 +7,7 @@ describe FileTypesController do describe 'POST #create' do context 'with a valid file type' do - let(:request) { Proc.new { post :create, file_type: FactoryGirl.attributes_for(:dot_rb) } } + let(:request) { proc { post :create, file_type: FactoryGirl.attributes_for(:dot_rb) } } before(:each) { request.call } expect_assigns(editor_modes: Array) diff --git a/spec/controllers/hints_controller_spec.rb b/spec/controllers/hints_controller_spec.rb index 7c47fc8a..51f3da2b 100644 --- a/spec/controllers/hints_controller_spec.rb +++ b/spec/controllers/hints_controller_spec.rb @@ -8,7 +8,7 @@ describe HintsController do describe 'POST #create' do context 'with a valid hint' do - let(:request) { Proc.new { post :create, execution_environment_id: execution_environment.id, hint: FactoryGirl.attributes_for(:ruby_syntax_error) } } + let(:request) { proc { post :create, execution_environment_id: execution_environment.id, hint: FactoryGirl.attributes_for(:ruby_syntax_error) } } before(:each) { request.call } expect_assigns(execution_environment: :execution_environment) diff --git a/spec/controllers/internal_users_controller_spec.rb b/spec/controllers/internal_users_controller_spec.rb index ed0cc0c3..d922eb94 100644 --- a/spec/controllers/internal_users_controller_spec.rb +++ b/spec/controllers/internal_users_controller_spec.rb @@ -103,7 +103,7 @@ describe InternalUsersController do before(:each) { allow(controller).to receive(:current_user).and_return(user) } context 'with a valid internal user' do - let(:request) { Proc.new { post :create, internal_user: FactoryGirl.attributes_for(:teacher) } } + let(:request) { proc { post :create, internal_user: FactoryGirl.attributes_for(:teacher) } } before(:each) { request.call } expect_assigns(user: InternalUser) diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb index 9f1a8aed..017fbec8 100644 --- a/spec/controllers/sessions_controller_spec.rb +++ b/spec/controllers/sessions_controller_spec.rb @@ -162,7 +162,7 @@ describe SessionsController do end describe 'GET #destroy_through_lti' do - let(:request) { Proc.new { get :destroy_through_lti, consumer_id: consumer.id, submission_id: submission.id } } + let(:request) { proc { get :destroy_through_lti, consumer_id: consumer.id, submission_id: submission.id } } let(:submission) { FactoryGirl.create(:submission, exercise: FactoryGirl.create(:dummy)) } before(:each) do diff --git a/spec/controllers/submissions_controller_spec.rb b/spec/controllers/submissions_controller_spec.rb index 285070ef..ae3c09ec 100644 --- a/spec/controllers/submissions_controller_spec.rb +++ b/spec/controllers/submissions_controller_spec.rb @@ -12,7 +12,7 @@ describe SubmissionsController do context 'with a valid submission' do let(:exercise) { FactoryGirl.create(:hello_world) } - let(:request) { Proc.new { post :create, format: :json, submission: FactoryGirl.attributes_for(:submission, exercise_id: exercise.id) } } + let(:request) { proc { post :create, format: :json, submission: FactoryGirl.attributes_for(:submission, exercise_id: exercise.id) } } before(:each) { request.call } expect_assigns(submission: Submission) @@ -75,7 +75,7 @@ describe SubmissionsController do context 'with a valid filename' do let(:file) { submission.files.first } let(:file_type) { FactoryGirl.create(:dot_xml) } - let(:request) { Proc.new { get :render_file, filename: file.name_with_extension, id: submission.id } } + let(:request) { proc { get :render_file, filename: file.name_with_extension, id: submission.id } } before(:each) do file.update(file_type: file_type) diff --git a/spec/controllers/teams_controller_spec.rb b/spec/controllers/teams_controller_spec.rb index dc823afe..af31434a 100644 --- a/spec/controllers/teams_controller_spec.rb +++ b/spec/controllers/teams_controller_spec.rb @@ -7,7 +7,7 @@ describe TeamsController do describe 'POST #create' do context 'with a valid team' do - let(:request) { Proc.new { post :create, team: FactoryGirl.attributes_for(:team) } } + let(:request) { proc { post :create, team: FactoryGirl.attributes_for(:team) } } before(:each) { request.call } expect_assigns(team: Team) diff --git a/spec/lib/docker_client_spec.rb b/spec/lib/docker_client_spec.rb index d688fcd5..ee4b5275 100644 --- a/spec/lib/docker_client_spec.rb +++ b/spec/lib/docker_client_spec.rb @@ -243,7 +243,7 @@ describe DockerClient, docker: true do end describe '#send_command' do - let(:block) { Proc.new {} } + let(:block) { proc {} } let(:container) { described_class.create_container(execution_environment) } let(:send_command) { docker_client.send(:send_command, command, container, &block) } after(:each) { send_command }