From 854c7a773c8df0ff350a08027b4337fcd235ae7f Mon Sep 17 00:00:00 2001 From: Anna Buianova Date: Mon, 4 Mar 2019 17:18:09 +0300 Subject: [PATCH] Rubocop fixes (#1966) --- .rubocop.yml | 1 + .rubocop_todo.yml | 4 ++++ app/views/articles/feed.rss.builder | 2 +- config/environments/development.rb | 2 +- config/environments/production.rb | 2 +- config/routes.rb | 2 +- spec/requests/organizations_update_spec.rb | 1 - spec/requests/stripe_cancellations_spec.rb | 2 ++ 8 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index f7e3c114b..bd7a57b31 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -32,6 +32,7 @@ AllCops: - db/schema.rb - db/migrate/*.rb - node_modules/**/* + - tmp/**/* DisplayStyleGuide: true ExtraDetails: true TargetRubyVersion: 2.6 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 1c45fc594..557e88c54 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -49,6 +49,10 @@ Style/ClassAndModuleChildren: - 'app/controllers/notifications/counts_controller.rb' - 'app/controllers/notifications/reads_controller.rb' +RSpec/AnyInstance: + Exclude: + - 'spec/requests/stripe_cancellations_spec.rb' + # Offense count: 1283 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. # URISchemes: http, https diff --git a/app/views/articles/feed.rss.builder b/app/views/articles/feed.rss.builder index cc1c9523c..93266f7d9 100644 --- a/app/views/articles/feed.rss.builder +++ b/app/views/articles/feed.rss.builder @@ -12,7 +12,7 @@ xml.rss version: "2.0" do @articles.each do |article| xml.item do xml.title article.title - xml.author (@user && @user.class.name == "User") ? @user.name : article.user.name + xml.author @user && @user.class.name == "User" ? @user.name : article.user.name xml.pubDate article.published_at.to_s(:rfc822) if article.published_at xml.link "https://dev.to#{article.path}" xml.guid "https://dev.to#{article.path}" diff --git a/config/environments/development.rb b/config/environments/development.rb index d4b62a08e..ad3b97cbd 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -90,7 +90,7 @@ Rails.application.configure do # Install the Timber.io logger send_logs_to_timber = ENV["SEND_LOGS_TO_TIMBER"] || "false" # <---- set to false to stop sending dev logs to Timber.io - log_device = (send_logs_to_timber == "true") ? Timber::LogDevices::HTTP.new(ENV["TIMBER"]) : STDOUT + log_device = send_logs_to_timber == "true" ? Timber::LogDevices::HTTP.new(ENV["TIMBER"]) : STDOUT logger = Timber::Logger.new(log_device) logger.level = config.log_level config.logger = ActiveSupport::TaggedLogging.new(logger) diff --git a/config/environments/production.rb b/config/environments/production.rb index a2ae21cdd..9926e830a 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -93,7 +93,7 @@ Rails.application.configure do # Timber.io logger send_logs_to_timber = ENV["SEND_LOGS_TO_TIMBER"] || "true" # <---- production should send timber logs by default - log_device = (send_logs_to_timber == "true") ? Timber::LogDevices::HTTP.new(ENV["TIMBER"]) : STDOUT + log_device = send_logs_to_timber == "true" ? Timber::LogDevices::HTTP.new(ENV["TIMBER"]) : STDOUT logger = Timber::Logger.new(log_device) logger.level = config.log_level config.logger = ActiveSupport::TaggedLogging.new(logger) diff --git a/config/routes.rb b/config/routes.rb index 48f925442..44c64c9e9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,7 +8,7 @@ Rails.application.routes.draw do } if Rails.env.development? - match "/delayed_job" => DelayedJobWeb, :anchor => false, :via => [:get, :post] + match "/delayed_job" => DelayedJobWeb, :anchor => false, :via => %i[get post] end devise_scope :user do diff --git a/spec/requests/organizations_update_spec.rb b/spec/requests/organizations_update_spec.rb index 11fa54c0d..8ad26ba4d 100644 --- a/spec/requests/organizations_update_spec.rb +++ b/spec/requests/organizations_update_spec.rb @@ -29,5 +29,4 @@ RSpec.describe "OrganizationsUpdate", type: :request do put "/organizations/#{organization.id}", params: { organization: { text_color_hex: "#111111" } } expect(organization.reload.profile_updated_at).to be > 2.minutes.ago end - end diff --git a/spec/requests/stripe_cancellations_spec.rb b/spec/requests/stripe_cancellations_spec.rb index 4e5ae61a1..54e14cc38 100644 --- a/spec/requests/stripe_cancellations_spec.rb +++ b/spec/requests/stripe_cancellations_spec.rb @@ -11,6 +11,7 @@ RSpec.describe "StripeCancellations", type: :request do after { StripeMock.stop } + # rubocop:disable RSpec/ExampleLength it "mocks a stripe cancellation webhook" do customer = Stripe::Customer.create( email: user.email, @@ -29,4 +30,5 @@ RSpec.describe "StripeCancellations", type: :request do expect(user.monthly_dues).to eq(0) expect(response).to have_http_status(200) end + # rubocop:enable RSpec/ExampleLength end