Merge pull request #9802 from alphagov/remove-delete-review-reminder-…

…feature-flag Remove delete review reminder feature flag
alphagov · Jan 10, 2025 · 2d6473f · 2d6473f
2 parents 6b45cc8 + 2571f11
commit 2d6473f
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 11 deletions.
diff --git a/app/components/admin/editions/show/sidebar_actions_component.rb b/app/components/admin/editions/show/sidebar_actions_component.rb
@@ -182,7 +182,7 @@ def add_review_reminder_action
         href:,
         secondary_quiet: true,
       })
-      if Flipflop.delete_review_reminders? && review_reminder.present?
+      if review_reminder.present?
         actions << link_to("Delete review date", confirm_destroy_admin_document_review_reminder_path(@edition.document, @edition.document.review_reminder), class: "govuk-link gem-link--destructive govuk-link--no-visited-state")
       end
     end

diff --git a/config/features.rb b/config/features.rb
@@ -22,7 +22,6 @@
   #   default: true,
   #   description: "Take over the world."
   feature :maintenance_mode, description: "Put Whitehall into maintenance mode for planned downtime", default: false
-  feature :delete_review_reminders, description: "Enables deletion of review reminders", default: false
   feature :govspeak_visual_editor, description: "Enables a visual editor for Govspeak fields", default: false
   feature :override_government, description: "Enables GDS Editors and Admins to override the government associated with a document", default: false
   feature :show_link_to_content_block_manager, description: "Shows link to Content Block Manager from Whitehall editor", default: Whitehall.integration_or_staging?

diff --git a/features/review_reminder.feature b/features/review_reminder.feature
@@ -26,7 +26,6 @@ Feature: Review reminders
 
   Scenario: Deleting the review date for a published publication
     Given a published publication "Standard Beard Lengths" with a PDF attachment
-    And The delete review reminder feature flag is "enabled"
     And a review reminder exists for "Standard Beard Lengths" with the date "2032-1-1"
     When I click the link "Delete review date" on the edition summary page for "Standard Beard Lengths"
     Then I should see the review date of "1 January 2032" on the deletion confirmation page

diff --git a/features/step_definitions/review_reminder_steps.rb b/features/step_definitions/review_reminder_steps.rb
@@ -1,8 +1,3 @@
-And(/^The delete review reminder feature flag is "(enabled|disabled)"$/) do |enabled|
-  @test_strategy ||= Flipflop::FeatureSet.current.test!
-  @test_strategy.switch!(:delete_review_reminders, enabled == "enabled")
-end
-
 And(/^I add a review date of "([^"]*)" and the email address "([^"]*)" on the edit page$/) do |date, email|
   click_link "Edit draft"
   check "Set a reminder to review this content after it has been published"

diff --git a/test/components/admin/editions/show/sidebar_actions_component_test.rb b/test/components/admin/editions/show/sidebar_actions_component_test.rb
@@ -27,8 +27,6 @@ class Admin::Editions::Show::SidebarActionsComponentTest < ViewComponent::TestCa
   end
 
   test "actions for published edition with review date" do
-    @test_strategy ||= Flipflop::FeatureSet.current.test!
-    @test_strategy.switch!(:delete_review_reminders, true)
     current_user = build_stubbed(:user)
     edition = create(:published_edition)
     create(:review_reminder, :reminder_due, document: edition.document)
@@ -40,7 +38,6 @@ class Admin::Editions::Show::SidebarActionsComponentTest < ViewComponent::TestCa
     assert_selector "a", text: "Delete review date"
     assert_selector "a", text: "View data about page"
     assert_selector "a[href='https://www.test.gov.uk/government/generic-editions/#{edition.title}']", text: "View on website (opens in new tab)"
-    @test_strategy.switch!(:delete_review_reminders, false)
   end
 
   test "actions for published edition for non-english document" do