From b3a495d40e4abf4e3b249a17fecb345a60911864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20Barri=C3=A9?= Date: Tue, 12 Oct 2021 17:52:27 +0200 Subject: [PATCH] Fix rubocop --- Rakefile | 1 + app/helpers/maintenance_tasks/application_helper.rb | 1 + .../concerns/maintenance_tasks/task_job_concern.rb | 1 + app/models/maintenance_tasks/application_record.rb | 1 + app/models/maintenance_tasks/run.rb | 1 + app/models/maintenance_tasks/runs_page.rb | 1 + app/models/maintenance_tasks/task.rb | 1 + app/models/maintenance_tasks/task_data.rb | 1 + .../maintenance_tasks/run_status_validator.rb | 1 + bin/rails | 1 + config/routes.rb | 1 + .../20201211151756_create_maintenance_tasks_runs.rb | 1 + .../20210225152418_remove_index_on_task_name.rb | 1 + ...7131953_add_arguments_to_maintenance_tasks_runs.rb | 1 + lib/generators/maintenance_tasks/install_generator.rb | 1 + lib/maintenance_tasks.rb | 3 ++- lib/maintenance_tasks/cli.rb | 11 ++++++----- lib/maintenance_tasks/engine.rb | 1 + test/documentation_test.rb | 1 + test/dummy/app/channels/application_cable/channel.rb | 1 + .../app/channels/application_cable/connection.rb | 1 + test/dummy/app/controllers/application_controller.rb | 1 + test/dummy/app/controllers/posts_controller.rb | 1 + test/dummy/app/helpers/application_helper.rb | 1 + test/dummy/app/mailers/application_mailer.rb | 1 + test/dummy/app/models/application_record.rb | 1 + test/dummy/app/models/post.rb | 1 + .../dummy/app/tasks/maintenance/callback_test_task.rb | 1 + .../app/tasks/maintenance/cancelled_enqueue_task.rb | 1 + .../dummy/app/tasks/maintenance/enqueue_error_task.rb | 1 + test/dummy/app/tasks/maintenance/error_task.rb | 1 + test/dummy/app/tasks/maintenance/import_posts_task.rb | 1 + test/dummy/app/tasks/maintenance/params_task.rb | 1 + test/dummy/app/tasks/maintenance/test_task.rb | 1 + .../tasks/maintenance/update_posts_in_batches_task.rb | 1 + test/dummy/app/tasks/maintenance/update_posts_task.rb | 1 + .../tasks/maintenance/update_posts_throttled_task.rb | 1 + test/dummy/bin/rails | 1 + test/dummy/bin/rake | 1 + test/dummy/bin/setup | 1 + test/dummy/config.ru | 1 + test/dummy/config/application.rb | 1 + test/dummy/config/boot.rb | 1 + test/dummy/config/environment.rb | 1 + test/dummy/config/environments/development.rb | 1 + test/dummy/config/environments/production.rb | 1 + test/dummy/config/environments/test.rb | 1 + test/dummy/config/initializers/assets.rb | 1 + test/dummy/config/initializers/backtrace_silencers.rb | 1 + .../config/initializers/content_security_policy.rb | 1 + test/dummy/config/initializers/cookies_serializer.rb | 1 + .../config/initializers/filter_parameter_logging.rb | 1 + test/dummy/config/initializers/wrap_parameters.rb | 1 + test/dummy/config/puma.rb | 1 + test/dummy/config/routes.rb | 1 + test/dummy/config/spring.rb | 1 + test/dummy/db/migrate/20200923173403_create_posts.rb | 1 + ...723_create_active_storage_tables.active_storage.rb | 1 + test/dummy/db/seeds.rb | 1 + .../maintenance_tasks/application_helper_test.rb | 1 + test/jobs/maintenance_tasks/task_job_test.rb | 3 ++- .../maintenance_tasks/install_generator_test.rb | 1 + .../maintenance_tasks/task_generator_test.rb | 1 + test/lib/maintenance_tasks_test.rb | 3 ++- test/models/maintenance_tasks/csv_task_test.rb | 1 + test/models/maintenance_tasks/run_test.rb | 1 + test/models/maintenance_tasks/runner_test.rb | 8 ++++---- test/models/maintenance_tasks/task_data_test.rb | 1 + test/models/maintenance_tasks/task_test.rb | 1 + test/system/maintenance_tasks/runs_test.rb | 2 +- test/test_helper.rb | 1 + .../maintenance_tasks/run_status_validator_test.rb | 1 + 72 files changed, 83 insertions(+), 13 deletions(-) diff --git a/Rakefile b/Rakefile index dd15c495..0714cadc 100644 --- a/Rakefile +++ b/Rakefile @@ -1,4 +1,5 @@ # frozen_string_literal: true + begin require "bundler/setup" rescue LoadError diff --git a/app/helpers/maintenance_tasks/application_helper.rb b/app/helpers/maintenance_tasks/application_helper.rb index f3813932..77d779cc 100644 --- a/app/helpers/maintenance_tasks/application_helper.rb +++ b/app/helpers/maintenance_tasks/application_helper.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module MaintenanceTasks # Module for common view helpers. # diff --git a/app/jobs/concerns/maintenance_tasks/task_job_concern.rb b/app/jobs/concerns/maintenance_tasks/task_job_concern.rb index 37b76aca..f69317e9 100644 --- a/app/jobs/concerns/maintenance_tasks/task_job_concern.rb +++ b/app/jobs/concerns/maintenance_tasks/task_job_concern.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module MaintenanceTasks # Concern that holds the behaviour of the job that runs the tasks. It is # included in {TaskJob} and if MaintenanceTasks.job is overridden, it must be diff --git a/app/models/maintenance_tasks/application_record.rb b/app/models/maintenance_tasks/application_record.rb index 9e8e63b5..be722b02 100644 --- a/app/models/maintenance_tasks/application_record.rb +++ b/app/models/maintenance_tasks/application_record.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module MaintenanceTasks # Base class for all records used by this engine. # diff --git a/app/models/maintenance_tasks/run.rb b/app/models/maintenance_tasks/run.rb index 3ee712b9..58b84fac 100644 --- a/app/models/maintenance_tasks/run.rb +++ b/app/models/maintenance_tasks/run.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module MaintenanceTasks # Model that persists information related to a task being run from the UI. # diff --git a/app/models/maintenance_tasks/runs_page.rb b/app/models/maintenance_tasks/runs_page.rb index b8ce4d37..d4a930c8 100644 --- a/app/models/maintenance_tasks/runs_page.rb +++ b/app/models/maintenance_tasks/runs_page.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module MaintenanceTasks # This class is responsible for handling cursor-based pagination for Run # records. diff --git a/app/models/maintenance_tasks/task.rb b/app/models/maintenance_tasks/task.rb index 7518bdd7..26f1d965 100644 --- a/app/models/maintenance_tasks/task.rb +++ b/app/models/maintenance_tasks/task.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module MaintenanceTasks # Base class that is inherited by the host application's task classes. class Task diff --git a/app/models/maintenance_tasks/task_data.rb b/app/models/maintenance_tasks/task_data.rb index 7078d522..c899ac29 100644 --- a/app/models/maintenance_tasks/task_data.rb +++ b/app/models/maintenance_tasks/task_data.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module MaintenanceTasks # Class that represents the data related to a Task. Such information can be # sourced from a Task or from existing Run records for a Task that was since diff --git a/app/validators/maintenance_tasks/run_status_validator.rb b/app/validators/maintenance_tasks/run_status_validator.rb index e8c4db08..ec0ef062 100644 --- a/app/validators/maintenance_tasks/run_status_validator.rb +++ b/app/validators/maintenance_tasks/run_status_validator.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module MaintenanceTasks # Custom validator class responsible for ensuring that transitions between # Run statuses are valid. diff --git a/bin/rails b/bin/rails index 590669d9..855cf948 100755 --- a/bin/rails +++ b/bin/rails @@ -1,5 +1,6 @@ #!/usr/bin/env ruby # frozen_string_literal: true + # This command will automatically be run when you run "rails" with Rails gems # installed from the root of your application. diff --git a/config/routes.rb b/config/routes.rb index 789f9b0a..d23a5b3e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + MaintenanceTasks::Engine.routes.draw do resources :tasks, only: [:index, :show], format: false do member do diff --git a/db/migrate/20201211151756_create_maintenance_tasks_runs.rb b/db/migrate/20201211151756_create_maintenance_tasks_runs.rb index 40e3ef6c..97aef7c4 100644 --- a/db/migrate/20201211151756_create_maintenance_tasks_runs.rb +++ b/db/migrate/20201211151756_create_maintenance_tasks_runs.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + class CreateMaintenanceTasksRuns < ActiveRecord::Migration[6.0] def change create_table(:maintenance_tasks_runs) do |t| diff --git a/db/migrate/20210225152418_remove_index_on_task_name.rb b/db/migrate/20210225152418_remove_index_on_task_name.rb index 05321dd5..46fbb1a3 100644 --- a/db/migrate/20210225152418_remove_index_on_task_name.rb +++ b/db/migrate/20210225152418_remove_index_on_task_name.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + class RemoveIndexOnTaskName < ActiveRecord::Migration[6.0] def up change_table(:maintenance_tasks_runs) do |t| diff --git a/db/migrate/20210517131953_add_arguments_to_maintenance_tasks_runs.rb b/db/migrate/20210517131953_add_arguments_to_maintenance_tasks_runs.rb index fa5e8951..82d6e9fb 100644 --- a/db/migrate/20210517131953_add_arguments_to_maintenance_tasks_runs.rb +++ b/db/migrate/20210517131953_add_arguments_to_maintenance_tasks_runs.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + class AddArgumentsToMaintenanceTasksRuns < ActiveRecord::Migration[6.0] def change add_column(:maintenance_tasks_runs, :arguments, :text) diff --git a/lib/generators/maintenance_tasks/install_generator.rb b/lib/generators/maintenance_tasks/install_generator.rb index 07e0ff21..51b9fc92 100644 --- a/lib/generators/maintenance_tasks/install_generator.rb +++ b/lib/generators/maintenance_tasks/install_generator.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module MaintenanceTasks # Generator used to set up the engine in the host application. It handles # mounting the engine and installing migrations. diff --git a/lib/maintenance_tasks.rb b/lib/maintenance_tasks.rb index c0700cc8..bc62e58c 100644 --- a/lib/maintenance_tasks.rb +++ b/lib/maintenance_tasks.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "action_controller" require "action_view" require "active_job" @@ -73,7 +74,7 @@ def self.error_handler=(error_handler) unless error_handler.arity == 3 ActiveSupport::Deprecation.warn( "MaintenanceTasks.error_handler should be a lambda that takes three "\ - "arguments: error, task_context, and errored_element." + "arguments: error, task_context, and errored_element." ) @error_handler = ->(error, _task_context, _errored_element) do error_handler.call(error) diff --git a/lib/maintenance_tasks/cli.rb b/lib/maintenance_tasks/cli.rb index ee85084b..b8920e4a 100644 --- a/lib/maintenance_tasks/cli.rb +++ b/lib/maintenance_tasks/cli.rb @@ -25,12 +25,13 @@ def exit_on_failure? LONGDESC # Specify the CSV file to process for CSV Tasks - option :csv, desc: "Supply a CSV file to be processed by a CSV Task, "\ - '--csv "path/to/csv/file.csv"' - + desc = "Supply a CSV file to be processed by a CSV Task, "\ + "--csv path/to/csv/file.csv" + option :csv, desc: desc # Specify arguments to supply to a Task supporting parameters - option :arguments, type: :hash, desc: "Supply arguments for a Task that "\ - "accepts parameters as a set of : pairs." + desc = "Supply arguments for a Task that accepts parameters as a set of "\ + ": pairs." + option :arguments, type: :hash, desc: desc # Command to run a Task. # diff --git a/lib/maintenance_tasks/engine.rb b/lib/maintenance_tasks/engine.rb index 7deaf1c1..6100119f 100644 --- a/lib/maintenance_tasks/engine.rb +++ b/lib/maintenance_tasks/engine.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "active_record/railtie" module MaintenanceTasks diff --git a/test/documentation_test.rb b/test/documentation_test.rb index 93da8a2a..b91aee9e 100644 --- a/test/documentation_test.rb +++ b/test/documentation_test.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "active_support" require "active_support/test_case" require "yard" diff --git a/test/dummy/app/channels/application_cable/channel.rb b/test/dummy/app/channels/application_cable/channel.rb index 51e3e936..9aec2305 100644 --- a/test/dummy/app/channels/application_cable/channel.rb +++ b/test/dummy/app/channels/application_cable/channel.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module ApplicationCable class Channel < ActionCable::Channel::Base end diff --git a/test/dummy/app/channels/application_cable/connection.rb b/test/dummy/app/channels/application_cable/connection.rb index fa70319d..8d6c2a1b 100644 --- a/test/dummy/app/channels/application_cable/connection.rb +++ b/test/dummy/app/channels/application_cable/connection.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module ApplicationCable class Connection < ActionCable::Connection::Base end diff --git a/test/dummy/app/controllers/application_controller.rb b/test/dummy/app/controllers/application_controller.rb index e0491348..7944f9f9 100644 --- a/test/dummy/app/controllers/application_controller.rb +++ b/test/dummy/app/controllers/application_controller.rb @@ -1,3 +1,4 @@ # frozen_string_literal: true + class ApplicationController < ActionController::Base end diff --git a/test/dummy/app/controllers/posts_controller.rb b/test/dummy/app/controllers/posts_controller.rb index d0926ae0..b06952fc 100644 --- a/test/dummy/app/controllers/posts_controller.rb +++ b/test/dummy/app/controllers/posts_controller.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + class PostsController < ApplicationController before_action :set_post, only: [:show, :edit, :update, :destroy] diff --git a/test/dummy/app/helpers/application_helper.rb b/test/dummy/app/helpers/application_helper.rb index 71249b93..15b06f0f 100644 --- a/test/dummy/app/helpers/application_helper.rb +++ b/test/dummy/app/helpers/application_helper.rb @@ -1,3 +1,4 @@ # frozen_string_literal: true + module ApplicationHelper end diff --git a/test/dummy/app/mailers/application_mailer.rb b/test/dummy/app/mailers/application_mailer.rb index 45b2abda..5cc63a0c 100644 --- a/test/dummy/app/mailers/application_mailer.rb +++ b/test/dummy/app/mailers/application_mailer.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + class ApplicationMailer < ActionMailer::Base default from: "from@example.com" layout "mailer" diff --git a/test/dummy/app/models/application_record.rb b/test/dummy/app/models/application_record.rb index 767a072b..71fbba5b 100644 --- a/test/dummy/app/models/application_record.rb +++ b/test/dummy/app/models/application_record.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + class ApplicationRecord < ActiveRecord::Base self.abstract_class = true end diff --git a/test/dummy/app/models/post.rb b/test/dummy/app/models/post.rb index 86254688..e862272e 100644 --- a/test/dummy/app/models/post.rb +++ b/test/dummy/app/models/post.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + class Post < ApplicationRecord validates :title, presence: true validates :content, presence: true diff --git a/test/dummy/app/tasks/maintenance/callback_test_task.rb b/test/dummy/app/tasks/maintenance/callback_test_task.rb index 00eddf2b..1e17c8e2 100644 --- a/test/dummy/app/tasks/maintenance/callback_test_task.rb +++ b/test/dummy/app/tasks/maintenance/callback_test_task.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Maintenance class CallbackTestTask < MaintenanceTasks::Task after_start :after_start_callback diff --git a/test/dummy/app/tasks/maintenance/cancelled_enqueue_task.rb b/test/dummy/app/tasks/maintenance/cancelled_enqueue_task.rb index 9b34273e..a96e6bed 100644 --- a/test/dummy/app/tasks/maintenance/cancelled_enqueue_task.rb +++ b/test/dummy/app/tasks/maintenance/cancelled_enqueue_task.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Maintenance # Any job enqueued for this task gets cancelled, see CustomTaskJob. class CancelledEnqueueTask < MaintenanceTasks::Task diff --git a/test/dummy/app/tasks/maintenance/enqueue_error_task.rb b/test/dummy/app/tasks/maintenance/enqueue_error_task.rb index 0ea93be6..d681b095 100644 --- a/test/dummy/app/tasks/maintenance/enqueue_error_task.rb +++ b/test/dummy/app/tasks/maintenance/enqueue_error_task.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Maintenance # Any job enqueued for this task errors, see CustomTaskJob. class EnqueueErrorTask < MaintenanceTasks::Task diff --git a/test/dummy/app/tasks/maintenance/error_task.rb b/test/dummy/app/tasks/maintenance/error_task.rb index 730cea7f..c5120325 100644 --- a/test/dummy/app/tasks/maintenance/error_task.rb +++ b/test/dummy/app/tasks/maintenance/error_task.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Maintenance class ErrorTask < MaintenanceTasks::Task def collection diff --git a/test/dummy/app/tasks/maintenance/import_posts_task.rb b/test/dummy/app/tasks/maintenance/import_posts_task.rb index 9d7b6eac..164532a0 100644 --- a/test/dummy/app/tasks/maintenance/import_posts_task.rb +++ b/test/dummy/app/tasks/maintenance/import_posts_task.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Maintenance class ImportPostsTask < MaintenanceTasks::Task csv_collection diff --git a/test/dummy/app/tasks/maintenance/params_task.rb b/test/dummy/app/tasks/maintenance/params_task.rb index 828a52df..f6590cd9 100644 --- a/test/dummy/app/tasks/maintenance/params_task.rb +++ b/test/dummy/app/tasks/maintenance/params_task.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Maintenance class ParamsTask < MaintenanceTasks::Task attribute :post_ids, :string diff --git a/test/dummy/app/tasks/maintenance/test_task.rb b/test/dummy/app/tasks/maintenance/test_task.rb index a96e4175..3c420954 100644 --- a/test/dummy/app/tasks/maintenance/test_task.rb +++ b/test/dummy/app/tasks/maintenance/test_task.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Maintenance class TestTask < MaintenanceTasks::Task def collection diff --git a/test/dummy/app/tasks/maintenance/update_posts_in_batches_task.rb b/test/dummy/app/tasks/maintenance/update_posts_in_batches_task.rb index 91f614bf..3aa24ac0 100644 --- a/test/dummy/app/tasks/maintenance/update_posts_in_batches_task.rb +++ b/test/dummy/app/tasks/maintenance/update_posts_in_batches_task.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Maintenance class UpdatePostsInBatchesTask < MaintenanceTasks::Task def collection diff --git a/test/dummy/app/tasks/maintenance/update_posts_task.rb b/test/dummy/app/tasks/maintenance/update_posts_task.rb index 13ca3bc6..2a45ed40 100644 --- a/test/dummy/app/tasks/maintenance/update_posts_task.rb +++ b/test/dummy/app/tasks/maintenance/update_posts_task.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Maintenance class UpdatePostsTask < MaintenanceTasks::Task class << self diff --git a/test/dummy/app/tasks/maintenance/update_posts_throttled_task.rb b/test/dummy/app/tasks/maintenance/update_posts_throttled_task.rb index c7b92c15..015980bd 100644 --- a/test/dummy/app/tasks/maintenance/update_posts_throttled_task.rb +++ b/test/dummy/app/tasks/maintenance/update_posts_throttled_task.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Maintenance class UpdatePostsThrottledTask < MaintenanceTasks::Task class << self diff --git a/test/dummy/bin/rails b/test/dummy/bin/rails index cbfe38b1..22f2d8de 100755 --- a/test/dummy/bin/rails +++ b/test/dummy/bin/rails @@ -1,5 +1,6 @@ #!/usr/bin/env ruby # frozen_string_literal: true + APP_PATH = File.expand_path("../config/application", __dir__) require_relative "../config/boot" require "rails/commands" diff --git a/test/dummy/bin/rake b/test/dummy/bin/rake index d648cf02..e436ea54 100755 --- a/test/dummy/bin/rake +++ b/test/dummy/bin/rake @@ -1,5 +1,6 @@ #!/usr/bin/env ruby # frozen_string_literal: true + require_relative "../config/boot" require "rake" Rake.application.run diff --git a/test/dummy/bin/setup b/test/dummy/bin/setup index f9ae3cb4..8aa0424b 100755 --- a/test/dummy/bin/setup +++ b/test/dummy/bin/setup @@ -1,5 +1,6 @@ #!/usr/bin/env ruby # frozen_string_literal: true + require "fileutils" # path to your application root. diff --git a/test/dummy/config.ru b/test/dummy/config.ru index 81cd2904..e7c0be2e 100644 --- a/test/dummy/config.ru +++ b/test/dummy/config.ru @@ -1,4 +1,5 @@ # frozen_string_literal: true + # This file is used by Rack-based servers to start the application. require_relative "config/environment" diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb index c10d5bc9..6fbd0946 100644 --- a/test/dummy/config/application.rb +++ b/test/dummy/config/application.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require_relative "boot" verbose = $VERBOSE diff --git a/test/dummy/config/boot.rb b/test/dummy/config/boot.rb index 4b7e9f81..91063c1a 100644 --- a/test/dummy/config/boot.rb +++ b/test/dummy/config/boot.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # Set up gems listed in the Gemfile. ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile", __dir__) diff --git a/test/dummy/config/environment.rb b/test/dummy/config/environment.rb index a21c0c58..7df99e89 100644 --- a/test/dummy/config/environment.rb +++ b/test/dummy/config/environment.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # Load the Rails application. require_relative "application" diff --git a/test/dummy/config/environments/development.rb b/test/dummy/config/environments/development.rb index ae34435a..218c4844 100644 --- a/test/dummy/config/environments/development.rb +++ b/test/dummy/config/environments/development.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "active_support/core_ext/integer/time" Rails.application.configure do diff --git a/test/dummy/config/environments/production.rb b/test/dummy/config/environments/production.rb index 20c79000..0da32e47 100644 --- a/test/dummy/config/environments/production.rb +++ b/test/dummy/config/environments/production.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "active_support/core_ext/integer/time" Rails.application.configure do diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb index f948d1ba..17d77991 100644 --- a/test/dummy/config/environments/test.rb +++ b/test/dummy/config/environments/test.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "active_support/core_ext/integer/time" # The test environment is used exclusively to run your application's diff --git a/test/dummy/config/initializers/assets.rb b/test/dummy/config/initializers/assets.rb index 3bb606b2..101a2902 100644 --- a/test/dummy/config/initializers/assets.rb +++ b/test/dummy/config/initializers/assets.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # Be sure to restart your server when you modify this file. # Version of your assets, change this if you want to expire all your assets. diff --git a/test/dummy/config/initializers/backtrace_silencers.rb b/test/dummy/config/initializers/backtrace_silencers.rb index 7bcc81bb..d97c3fcf 100644 --- a/test/dummy/config/initializers/backtrace_silencers.rb +++ b/test/dummy/config/initializers/backtrace_silencers.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # Be sure to restart your server when you modify this file. # You can add backtrace silencers for libraries that you're using but don't diff --git a/test/dummy/config/initializers/content_security_policy.rb b/test/dummy/config/initializers/content_security_policy.rb index 7f96573d..1f7248c7 100644 --- a/test/dummy/config/initializers/content_security_policy.rb +++ b/test/dummy/config/initializers/content_security_policy.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # Be sure to restart your server when you modify this file. # Define an application-wide content security policy diff --git a/test/dummy/config/initializers/cookies_serializer.rb b/test/dummy/config/initializers/cookies_serializer.rb index 2a729595..ee8dff9c 100644 --- a/test/dummy/config/initializers/cookies_serializer.rb +++ b/test/dummy/config/initializers/cookies_serializer.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # Be sure to restart your server when you modify this file. # Specify a serializer for the signed and encrypted cookie jars. diff --git a/test/dummy/config/initializers/filter_parameter_logging.rb b/test/dummy/config/initializers/filter_parameter_logging.rb index 7b73d650..2420a106 100644 --- a/test/dummy/config/initializers/filter_parameter_logging.rb +++ b/test/dummy/config/initializers/filter_parameter_logging.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # Be sure to restart your server when you modify this file. # Configure sensitive parameters which will be filtered from the log file. diff --git a/test/dummy/config/initializers/wrap_parameters.rb b/test/dummy/config/initializers/wrap_parameters.rb index 72a77748..c2179da6 100644 --- a/test/dummy/config/initializers/wrap_parameters.rb +++ b/test/dummy/config/initializers/wrap_parameters.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # Be sure to restart your server when you modify this file. # This file contains settings for ActionController::ParamsWrapper which diff --git a/test/dummy/config/puma.rb b/test/dummy/config/puma.rb index 19acbd80..007d6137 100644 --- a/test/dummy/config/puma.rb +++ b/test/dummy/config/puma.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # Puma can serve each request in a thread from an internal thread pool. # The `threads` method setting takes two numbers: a minimum and maximum. # Any libraries that use thread pools should be configured to match diff --git a/test/dummy/config/routes.rb b/test/dummy/config/routes.rb index d39117e8..c0b7beb9 100644 --- a/test/dummy/config/routes.rb +++ b/test/dummy/config/routes.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + Rails.application.routes.draw do mount MaintenanceTasks::Engine => "/maintenance_tasks" resources :posts diff --git a/test/dummy/config/spring.rb b/test/dummy/config/spring.rb index 3b898aff..37a35434 100644 --- a/test/dummy/config/spring.rb +++ b/test/dummy/config/spring.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + Spring.watch( ".ruby-version", ".rbenv-vars", diff --git a/test/dummy/db/migrate/20200923173403_create_posts.rb b/test/dummy/db/migrate/20200923173403_create_posts.rb index 3a64ccb8..d4353a79 100644 --- a/test/dummy/db/migrate/20200923173403_create_posts.rb +++ b/test/dummy/db/migrate/20200923173403_create_posts.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + class CreatePosts < ActiveRecord::Migration[6.0] def change create_table(:posts) do |t| diff --git a/test/dummy/db/migrate/20210112141723_create_active_storage_tables.active_storage.rb b/test/dummy/db/migrate/20210112141723_create_active_storage_tables.active_storage.rb index b50249d1..c790cd51 100644 --- a/test/dummy/db/migrate/20210112141723_create_active_storage_tables.active_storage.rb +++ b/test/dummy/db/migrate/20210112141723_create_active_storage_tables.active_storage.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # This migration comes from active_storage (originally 20170806125915) class CreateActiveStorageTables < ActiveRecord::Migration[5.2] def change diff --git a/test/dummy/db/seeds.rb b/test/dummy/db/seeds.rb index a963d5b9..ca850eb6 100644 --- a/test/dummy/db/seeds.rb +++ b/test/dummy/db/seeds.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + 10.times do |i| Post.create!(title: "Post ##{i}", content: "Content ##{i}") end diff --git a/test/helpers/maintenance_tasks/application_helper_test.rb b/test/helpers/maintenance_tasks/application_helper_test.rb index ef8c8963..258e1167 100644 --- a/test/helpers/maintenance_tasks/application_helper_test.rb +++ b/test/helpers/maintenance_tasks/application_helper_test.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "test_helper" module MaintenanceTasks diff --git a/test/jobs/maintenance_tasks/task_job_test.rb b/test/jobs/maintenance_tasks/task_job_test.rb index 5cf2c4fc..393a61e4 100644 --- a/test/jobs/maintenance_tasks/task_job_test.rb +++ b/test/jobs/maintenance_tasks/task_job_test.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "test_helper" require "job-iteration" @@ -132,7 +133,7 @@ class TaskJobTest < ActiveJob::TestCase run.expects(:persist_error).with do |exception| assert_kind_of ArgumentError, exception assert_equal "Something went wrong", exception.message - expected = "app/tasks/maintenance/error_task.rb:9:in `process'" + expected = "app/tasks/maintenance/error_task.rb:10:in `process'" assert_match expected, exception.backtrace.first end diff --git a/test/lib/generators/maintenance_tasks/install_generator_test.rb b/test/lib/generators/maintenance_tasks/install_generator_test.rb index c1c33525..2e099abb 100644 --- a/test/lib/generators/maintenance_tasks/install_generator_test.rb +++ b/test/lib/generators/maintenance_tasks/install_generator_test.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "test_helper" require "generators/maintenance_tasks/install_generator" diff --git a/test/lib/generators/maintenance_tasks/task_generator_test.rb b/test/lib/generators/maintenance_tasks/task_generator_test.rb index 7e015d14..09c8fa03 100644 --- a/test/lib/generators/maintenance_tasks/task_generator_test.rb +++ b/test/lib/generators/maintenance_tasks/task_generator_test.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "test_helper" require "generators/maintenance_tasks/task_generator" diff --git a/test/lib/maintenance_tasks_test.rb b/test/lib/maintenance_tasks_test.rb index ea7f189e..da869e01 100644 --- a/test/lib/maintenance_tasks_test.rb +++ b/test/lib/maintenance_tasks_test.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "test_helper" class MaintenanceTasksTest < ActiveSupport::TestCase @@ -6,7 +7,7 @@ class MaintenanceTasksTest < ActiveSupport::TestCase error_handler_before = MaintenanceTasks.error_handler dep_msg = "MaintenanceTasks.error_handler should be a lambda that takes "\ - "three arguments: error, task_context, and errored_element." + "three arguments: error, task_context, and errored_element." assert_deprecated(dep_msg) { MaintenanceTasks.error_handler = ->(error) {} } ensure MaintenanceTasks.error_handler = error_handler_before diff --git a/test/models/maintenance_tasks/csv_task_test.rb b/test/models/maintenance_tasks/csv_task_test.rb index 983cd402..c070d01c 100644 --- a/test/models/maintenance_tasks/csv_task_test.rb +++ b/test/models/maintenance_tasks/csv_task_test.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "test_helper" module MaintenanceTasks diff --git a/test/models/maintenance_tasks/run_test.rb b/test/models/maintenance_tasks/run_test.rb index 868cfd22..7164d9ef 100644 --- a/test/models/maintenance_tasks/run_test.rb +++ b/test/models/maintenance_tasks/run_test.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "test_helper" module MaintenanceTasks diff --git a/test/models/maintenance_tasks/runner_test.rb b/test/models/maintenance_tasks/runner_test.rb index 1837f568..ac60ce61 100644 --- a/test/models/maintenance_tasks/runner_test.rb +++ b/test/models/maintenance_tasks/runner_test.rb @@ -77,7 +77,7 @@ class RunnerTest < ActiveSupport::TestCase assert_equal( "The job to perform Maintenance::EnqueueErrorTask "\ - "could not be enqueued", + "could not be enqueued", error.message ) assert_kind_of RuntimeError, error.cause @@ -93,14 +93,14 @@ class RunnerTest < ActiveSupport::TestCase assert_equal( "The job to perform Maintenance::CancelledEnqueueTask "\ - "could not be enqueued", + "could not be enqueued", error.message ) assert_kind_of RuntimeError, error.cause assert_equal( "The job to perform Maintenance::CancelledEnqueueTask "\ - "could not be enqueued. "\ - "Enqueuing has been prevented by a callback.", + "could not be enqueued. "\ + "Enqueuing has been prevented by a callback.", error.cause.message ) end diff --git a/test/models/maintenance_tasks/task_data_test.rb b/test/models/maintenance_tasks/task_data_test.rb index 8dd8fc26..5d4c78da 100644 --- a/test/models/maintenance_tasks/task_data_test.rb +++ b/test/models/maintenance_tasks/task_data_test.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "test_helper" module MaintenanceTasks diff --git a/test/models/maintenance_tasks/task_test.rb b/test/models/maintenance_tasks/task_test.rb index dc9731fb..56df1840 100644 --- a/test/models/maintenance_tasks/task_test.rb +++ b/test/models/maintenance_tasks/task_test.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "test_helper" module MaintenanceTasks diff --git a/test/system/maintenance_tasks/runs_test.rb b/test/system/maintenance_tasks/runs_test.rb index 7e424175..4cc226be 100644 --- a/test/system/maintenance_tasks/runs_test.rb +++ b/test/system/maintenance_tasks/runs_test.rb @@ -169,7 +169,7 @@ class RunsTest < ApplicationSystemTestCase "less than a minute ago." assert_text "ArgumentError" assert_text "Something went wrong" - assert_text "app/tasks/maintenance/error_task.rb:9:in `process'" + assert_text "app/tasks/maintenance/error_task.rb:10:in `process'" end test "errors for double enqueue are shown" do diff --git a/test/test_helper.rb b/test/test_helper.rb index 619ced6c..148819d7 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # Configure Rails Environment ENV["RAILS_ENV"] = "test" diff --git a/test/validators/maintenance_tasks/run_status_validator_test.rb b/test/validators/maintenance_tasks/run_status_validator_test.rb index 73aaef72..65eb64c6 100644 --- a/test/validators/maintenance_tasks/run_status_validator_test.rb +++ b/test/validators/maintenance_tasks/run_status_validator_test.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "test_helper" module MaintenanceTasks