diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ae9e1beb9..bcf8bd428 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -7,9 +7,9 @@ class ApplicationController < ActionController::Base before_action :set_paper_trail_whodunnit def check_maintenance - if FeatureToggle.maintenance_mode_enabled? && !%w[service-unavailable accessibility-statement privacy-notice cookies].include?(request.fullpath.split("?")[0].delete("/")) + if FeatureToggle.service_unavailable? && !%w[service-unavailable accessibility-statement privacy-notice cookies].include?(request.fullpath.split("?")[0].delete("/")) redirect_to service_unavailable_path - elsif !FeatureToggle.maintenance_mode_enabled? && request.fullpath.split("?")[0].delete("/") == "service-unavailable" + elsif !FeatureToggle.service_unavailable? && request.fullpath.split("?")[0].delete("/") == "service-unavailable" redirect_back(fallback_location: root_path) end end diff --git a/app/services/feature_toggle.rb b/app/services/feature_toggle.rb index 3cad5dadb..94ad48906 100644 --- a/app/services/feature_toggle.rb +++ b/app/services/feature_toggle.rb @@ -38,7 +38,7 @@ class FeatureToggle !Rails.env.production? end - def self.maintenance_mode_enabled? + def self.service_unavailable? false end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d70c1e09a..2df4b9379 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -91,7 +91,7 @@ navigation_classes: "govuk-header__navigation--end", ) do |component| component.product_name(name: t("service_name")) - unless FeatureToggle.maintenance_mode_enabled? + unless FeatureToggle.service_unavailable? if current_user.nil? component.navigation_item(text: "Sign in", href: user_session_path) else diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 60cc29b3a..bb492ed23 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -33,7 +33,7 @@ Redis.silence_deprecations = true Sidekiq.configure_server do |config| config.on(:startup) do Sidekiq::Cron::Job.all.each(&:destroy) - unless FeatureToggle.maintenance_mode_enabled? + unless FeatureToggle.service_unavailable? Sidekiq::Cron::Job.load_from_hash YAML.load_file("config/sidekiq_cron_schedule.yml") end end diff --git a/spec/controllers/maintenance_controller_spec.rb b/spec/controllers/maintenance_controller_spec.rb index 032ac4858..8d27f1588 100644 --- a/spec/controllers/maintenance_controller_spec.rb +++ b/spec/controllers/maintenance_controller_spec.rb @@ -6,7 +6,7 @@ RSpec.describe MaintenanceController do describe "GET #service_unavailable" do context "when maintenance mode is enabled" do it "logs the user out" do - allow(FeatureToggle).to receive(:maintenance_mode_enabled?).and_return(true) + allow(FeatureToggle).to receive(:service_unavailable?).and_return(true) sign_in user expect(controller).to be_user_signed_in get :service_unavailable @@ -16,7 +16,7 @@ RSpec.describe MaintenanceController do context "when maintenance mode is disabled" do it "doesn't log the user out" do - allow(FeatureToggle).to receive(:maintenance_mode_enabled?).and_return(false) + allow(FeatureToggle).to receive(:service_unavailable?).and_return(false) sign_in user expect(controller).to be_user_signed_in get :service_unavailable diff --git a/spec/features/user_spec.rb b/spec/features/user_spec.rb index ca4e01ac6..285ddef27 100644 --- a/spec/features/user_spec.rb +++ b/spec/features/user_spec.rb @@ -141,7 +141,7 @@ RSpec.describe "User Features" do end it "does not show 'Sign in' link if maintenance mode is enabled" do - allow(FeatureToggle).to receive(:maintenance_mode_enabled?).and_return(true) + allow(FeatureToggle).to receive(:service_unavailable?).and_return(true) visit("/lettings-logs") expect(page).not_to have_link("Sign in") end @@ -332,7 +332,7 @@ RSpec.describe "User Features" do end it "does not show 'Your account' or 'Sign out' links if maintenance mode is enabled" do - allow(FeatureToggle).to receive(:maintenance_mode_enabled?).and_return(true) + allow(FeatureToggle).to receive(:service_unavailable?).and_return(true) visit("/lettings-logs") expect(page).not_to have_link("Your account") expect(page).not_to have_link("Sign out") diff --git a/spec/requests/content_controller_spec.rb b/spec/requests/content_controller_spec.rb index c978ecaa9..35068682b 100644 --- a/spec/requests/content_controller_spec.rb +++ b/spec/requests/content_controller_spec.rb @@ -50,7 +50,7 @@ RSpec.describe ContentController, type: :request do describe "when maintenance mode is enabled" do before do - allow(FeatureToggle).to receive(:maintenance_mode_enabled?).and_return(true) + allow(FeatureToggle).to receive(:service_unavailable?).and_return(true) end describe "render privacy notice content page" do diff --git a/spec/requests/cookies_controller_spec.rb b/spec/requests/cookies_controller_spec.rb index 82cf06a10..ef530c930 100644 --- a/spec/requests/cookies_controller_spec.rb +++ b/spec/requests/cookies_controller_spec.rb @@ -22,7 +22,7 @@ RSpec.describe CookiesController, type: :request do describe "when maintenance mode is enabled" do before do - allow(FeatureToggle).to receive(:maintenance_mode_enabled?).and_return(true) + allow(FeatureToggle).to receive(:service_unavailable?).and_return(true) end describe "render cookies page" do diff --git a/spec/requests/maintenance_controller_spec.rb b/spec/requests/maintenance_controller_spec.rb index d900df3c5..1e8251518 100644 --- a/spec/requests/maintenance_controller_spec.rb +++ b/spec/requests/maintenance_controller_spec.rb @@ -10,7 +10,7 @@ RSpec.describe MaintenanceController, type: :request do describe "when maintenance mode is enabled" do before do - allow(FeatureToggle).to receive(:maintenance_mode_enabled?).and_return(true) + allow(FeatureToggle).to receive(:service_unavailable?).and_return(true) end context "when a user visits a page other than the maintenance page" do @@ -48,7 +48,7 @@ RSpec.describe MaintenanceController, type: :request do describe "when maintenance mode is disabled" do before do - allow(FeatureToggle).to receive(:maintenance_mode_enabled?).and_return(false) + allow(FeatureToggle).to receive(:service_unavailable?).and_return(false) end context "when a user visits a page other than the maintenance page" do