Merge pull request #727 from alphagov/remove-qa-feature-flag

Remove qa feature flag
alphagov · Dec 19, 2018 · 75c8a7f · 75c8a7f
2 parents 29d0114 + b65f8b3
commit 75c8a7f
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 10 deletions.
diff --git a/app/controllers/qa_controller.rb b/app/controllers/qa_controller.rb
@@ -5,8 +5,6 @@ class QaController < ApplicationController
   include GdsApi::Helpers
 
   def show
-    return error_not_found unless ENV["FINDER_FRONTEND_ENABLE_QA"]
-
     redirect_to_finder if finder_page?
     raw_finder
   end

diff --git a/app/controllers/qa_to_content_controller.rb b/app/controllers/qa_to_content_controller.rb
@@ -8,8 +8,6 @@ class QaToContentController < ApplicationController
   include GdsApi::Helpers
 
   def show
-    return error_not_found unless ENV["FINDER_FRONTEND_ENABLE_QA_TO_CONTENT"]
-
     return redirect_to content_url if redirect_to_content?
 
     render "qa_to_content/show"

diff --git a/features/support/env.rb b/features/support/env.rb
@@ -61,7 +61,3 @@
 # The :transaction strategy is faster, but might give you threading problems.
 # See https://github.com/cucumber/cucumber-rails/blob/master/features/choose_javascript_database_strategy.feature
 Cucumber::Rails::Database.javascript_strategy = :truncation
-
-ENV["FINDER_FRONTEND_ENABLE_QA"] = 'true'
-# A temporary environment variable acting as a feature flag. This can be removed when the corresponding
-# 'return error_not_found unless ENV["FINDER_FRONTEND_ENABLE_QA"]' is removed from the QAController
diff --git a/spec/controllers/qa_controller_spec.rb b/spec/controllers/qa_controller_spec.rb
@@ -6,7 +6,6 @@
   include FixturesHelper
   include GovukContentSchemaExamples
   render_views
-  ENV["FINDER_FRONTEND_ENABLE_QA"] = "true"
 
   describe "GET show" do
     let(:aaib_reports_finder)         { aaib_reports_content_item }

diff --git a/spec/controllers/qa_to_content_controller_spec.rb b/spec/controllers/qa_to_content_controller_spec.rb
@@ -4,7 +4,6 @@
 describe QaToContentController, type: :controller do
   include FixturesHelper
   render_views
-  ENV["FINDER_FRONTEND_ENABLE_QA_TO_CONTENT"] = "true"
 
   describe "GET show" do
     let(:uk_nationals_in_eu_yaml) { uk_nationals_in_eu_config }