From b273ae2583411f18d29f47536aeda06b6a6ca20f Mon Sep 17 00:00:00 2001 From: Ted-U Date: Tue, 6 Sep 2022 12:20:17 +0100 Subject: [PATCH] lint --- app/controllers/lettings_logs_controller.rb | 2 +- app/controllers/logs_controller.rb | 2 +- app/controllers/sales_logs_controller.rb | 2 +- app/models/sales_log.rb | 4 ++-- config/initializers/feature_toggle.rb | 2 +- spec/features/log_spec.rb | 5 +++-- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/controllers/lettings_logs_controller.rb b/app/controllers/lettings_logs_controller.rb index 641a71214..18905341f 100644 --- a/app/controllers/lettings_logs_controller.rb +++ b/app/controllers/lettings_logs_controller.rb @@ -86,7 +86,7 @@ private def permitted_log_params params.require(:lettings_log).permit(LettingsLog.editable_fields) - end + end def find_resource @lettings_log = LettingsLog.find_by(id: params[:id]) diff --git a/app/controllers/logs_controller.rb b/app/controllers/logs_controller.rb index fb274993b..723d7adca 100644 --- a/app/controllers/logs_controller.rb +++ b/app/controllers/logs_controller.rb @@ -44,7 +44,7 @@ private api_log_params end end - + def api_log_params return {} unless params[:lettings_log] || params[:sales_log] diff --git a/app/controllers/sales_logs_controller.rb b/app/controllers/sales_logs_controller.rb index 84cf0d275..3d13b3b4b 100644 --- a/app/controllers/sales_logs_controller.rb +++ b/app/controllers/sales_logs_controller.rb @@ -24,5 +24,5 @@ class SalesLogsController < LogsController def permitted_log_params params.require(:sales_log).permit(SalesLog.editable_fields) - end + end end diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index cdeaf0695..28c47952b 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -9,7 +9,7 @@ class SalesLog < Log before_save :update_status! scope :filter_by_organisation, ->(org, _user = nil) { where(owning_organisation: org).or(where(managing_organisation: org)) } - + STATUS = { "not_started" => 0, "in_progress" => 1, "completed" => 2 }.freeze enum status: STATUS @@ -47,7 +47,7 @@ class SalesLog < Log status == "completed" end - private +private def update_status! self.status = if all_fields_completed? && errors.empty? diff --git a/config/initializers/feature_toggle.rb b/config/initializers/feature_toggle.rb index 7a06d5c9d..0e01531ca 100644 --- a/config/initializers/feature_toggle.rb +++ b/config/initializers/feature_toggle.rb @@ -4,7 +4,7 @@ class FeatureToggle end def self.sales_log_enabled? - return true unless Rails.env.production? + return true unless Rails.env.production? false end diff --git a/spec/features/log_spec.rb b/spec/features/log_spec.rb index 6939201e3..c08b15143 100644 --- a/spec/features/log_spec.rb +++ b/spec/features/log_spec.rb @@ -155,14 +155,15 @@ RSpec.describe "Log Features" do expect(page).to have_content("2022") end end - context "When the sales log feature flag is toggled" do + + context "when the sales log feature flag is toggled" do before do allow(Rails.env).to receive(:production?).and_return(true) end it "hides the create sales log button in production" do visit("/logs") - expect(page).to_not have_content("Create a new sales log") + expect(page).not_to have_content("Create a new sales log") end end end