Browse Source

CLDC-2863: rename maintenance_mode_enabled? to service_unavailable?

pull/2022/head
Sam Seed 3 years ago
parent
commit
bc05b18855
  1. 4
      app/controllers/application_controller.rb
  2. 2
      app/services/feature_toggle.rb
  3. 2
      app/views/layouts/application.html.erb
  4. 2
      config/initializers/sidekiq.rb
  5. 4
      spec/controllers/maintenance_controller_spec.rb
  6. 4
      spec/features/user_spec.rb
  7. 2
      spec/requests/content_controller_spec.rb
  8. 2
      spec/requests/cookies_controller_spec.rb
  9. 4
      spec/requests/maintenance_controller_spec.rb

4
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

2
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

2
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

2
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

4
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

4
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")

2
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

2
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

4
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

Loading…
Cancel
Save