From b30e962cddc8bc231971d154e84b3d91eacbac67 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Wed, 3 May 2023 15:09:31 +1000
Subject: [PATCH] Remove unknown (deleted) feature toggles at boot

---
 lib/open_food_network/feature_toggle.rb           | 14 +++-----------
 spec/lib/open_food_network/feature_toggle_spec.rb |  9 +++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/open_food_network/feature_toggle.rb b/lib/open_food_network/feature_toggle.rb
index b6a3048209..305511a0a5 100644
--- a/lib/open_food_network/feature_toggle.rb
+++ b/lib/open_food_network/feature_toggle.rb
@@ -9,6 +9,7 @@ module OpenFoodNetwork
   module FeatureToggle
     # Please add your new feature here to appear in the Flipper UI.
     # We way move this to a YAML file when it becomes too awkward.
+    # **WARNING:** Features not in this list will be removed.
     CURRENT_FEATURES = {
       "admin_style_v2" => <<~DESC,
         Change some colour and layout in the backend to a newer version.
@@ -45,23 +46,14 @@ module OpenFoodNetwork
       DESC
     }.freeze
 
-    # Move your feature entry from CURRENT_FEATURES to RETIRED_FEATURES when
-    # you remove it from the code. It will then be deleted from the database.
-    #
-    # We may delete this field one day and regard all features not listed in
-    # CURRENT_FEATURES as unsupported and remove them. But until this approach
-    # is accepted we delete only the features listed here.
-    RETIRED_FEATURES = {}.freeze
-
     def self.setup!
       CURRENT_FEATURES.each_key do |name|
         feature = Flipper.feature(name)
         feature.add unless feature.exist?
       end
 
-      RETIRED_FEATURES.each_key do |name|
-        feature = Flipper.feature(name)
-        feature.remove if feature.exist?
+      Flipper.features.each do |feature|
+        feature.remove unless CURRENT_FEATURES.key?(feature.name)
       end
     end
 
diff --git a/spec/lib/open_food_network/feature_toggle_spec.rb b/spec/lib/open_food_network/feature_toggle_spec.rb
index 6ca2d40de4..3c2dcc121e 100644
--- a/spec/lib/open_food_network/feature_toggle_spec.rb
+++ b/spec/lib/open_food_network/feature_toggle_spec.rb
@@ -31,5 +31,14 @@ describe OpenFoodNetwork::FeatureToggle do
       expect { feature_toggle.setup! }
         .to change { Flipper.features }.by([feature])
     end
+
+    it "removes unknown features" do
+      feature = Flipper.feature(:foo)
+      feature.enable
+
+      expect { feature_toggle.setup! }
+        .to change { Flipper.features.count }.by(-1)
+        .and change { feature.exist? }.to(false)
+    end
   end
 end