From 0a3b4a8129dcc372ebc75218efbcd4b3880cf889 Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Wed, 15 Jun 2022 17:39:20 +0200 Subject: [PATCH] Fix Rubocop offense --- app/controllers/exercises_controller.rb | 2 +- db/seeds.rb | 2 +- spec/uploaders/file_uploader_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb index 29310ac4..f8d82147 100644 --- a/app/controllers/exercises_controller.rb +++ b/app/controllers/exercises_controller.rb @@ -176,7 +176,7 @@ class ExercisesController < ApplicationController ActiveRecord::Base.transaction do exercise = ::ProformaService::Import.call(zip: tempfile, user: user) exercise.save! - return render json: {}, status: :created + render json: {}, status: :created end rescue Proforma::ExerciseNotOwned render json: {}, status: :unauthorized diff --git a/db/seeds.rb b/db/seeds.rb index bd1e5599..3136b9df 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -23,7 +23,7 @@ Rails.application.eager_load! (ApplicationRecord.descendants - [ActiveRecord::SchemaMigration, User]).each(&:delete_all) # delete file uploads -FileUtils.rm_rf(Rails.root.join('public/uploads')) +FileUtils.rm_rf(Rails.public_path.join('uploads')) # load environment-dependent seeds load(Rails.root.join("db/seeds/#{Rails.env}.rb")) diff --git a/spec/uploaders/file_uploader_spec.rb b/spec/uploaders/file_uploader_spec.rb index 3bca7f14..95e0c5fb 100644 --- a/spec/uploaders/file_uploader_spec.rb +++ b/spec/uploaders/file_uploader_spec.rb @@ -11,7 +11,7 @@ describe FileUploader do after { uploader.remove! } it 'uses the specified storage directory' do - expect(uploader.file.path).to start_with(Rails.root.join('public', uploader.store_dir).to_s) + expect(uploader.file.path).to start_with(Rails.public_path.join(uploader.store_dir).to_s) expect(uploader.file.path).to end_with(file_path.basename.to_s) end