From 8ae80cd1a101da30926a9e1ffe8def5b7b52f41d Mon Sep 17 00:00:00 2001
From: Julian Herrero <microweb10@gmail.com>
Date: Wed, 13 Mar 2019 11:51:12 +0100
Subject: [PATCH] Cleanup (remove unnecessary code)

---
 spec/features/admin/feature_flags_spec.rb                   | 5 -----
 spec/features/admin/legislation/questions_spec.rb           | 4 ----
 spec/features/comments/budget_investments_valuation_spec.rb | 5 -----
 spec/features/moderation/budget_investments_spec.rb         | 2 --
 spec/features/users_spec.rb                                 | 3 ---
 spec/features/valuation/budget_investments_spec.rb          | 2 --
 6 files changed, 21 deletions(-)

diff --git a/spec/features/admin/feature_flags_spec.rb b/spec/features/admin/feature_flags_spec.rb
index 181a8a34c..92b8f0f55 100644
--- a/spec/features/admin/feature_flags_spec.rb
+++ b/spec/features/admin/feature_flags_spec.rb
@@ -8,11 +8,6 @@ feature "Admin feature flags" do
     login_as(create(:administrator).user)
   end
 
-  after do
-    Setting["feature.spending_proposals"] = nil
-    Setting["feature.spending_proposal_features.voting_allowed"] = nil
-  end
-
   scenario "Enabled features are listed on menu" do
     visit admin_root_path
 
diff --git a/spec/features/admin/legislation/questions_spec.rb b/spec/features/admin/legislation/questions_spec.rb
index f90a59ecc..bd97672c7 100644
--- a/spec/features/admin/legislation/questions_spec.rb
+++ b/spec/features/admin/legislation/questions_spec.rb
@@ -20,10 +20,6 @@ feature "Admin legislation questions" do
       Setting["feature.legislation"] = nil
     end
 
-    after do
-      Setting["feature.legislation"] = true
-    end
-
     scenario "Disabled with a feature flag" do
       expect{ visit admin_legislation_process_questions_path(process) }.to raise_exception(FeatureFlags::FeatureDisabled)
     end
diff --git a/spec/features/comments/budget_investments_valuation_spec.rb b/spec/features/comments/budget_investments_valuation_spec.rb
index b17cd1b47..1db3ab8be 100644
--- a/spec/features/comments/budget_investments_valuation_spec.rb
+++ b/spec/features/comments/budget_investments_valuation_spec.rb
@@ -10,15 +10,10 @@ feature "Internal valuation comments on Budget::Investments" do
   let(:investment) { create(:budget_investment, budget: budget, group: group, heading: heading) }
 
   background do
-    Setting["feature.budgets"] = true
     investment.valuators << valuator_user.valuator
     login_as(valuator_user)
   end
 
-  after do
-    Setting["feature.budgets"] = nil
-  end
-
   context "Show valuation comments" do
     context "Show valuation comments without public comments" do
       background do
diff --git a/spec/features/moderation/budget_investments_spec.rb b/spec/features/moderation/budget_investments_spec.rb
index 83191120e..58d61aa30 100644
--- a/spec/features/moderation/budget_investments_spec.rb
+++ b/spec/features/moderation/budget_investments_spec.rb
@@ -16,8 +16,6 @@ feature "Moderate budget investments" do
     login_as(@mod.user)
 
     expect{ visit moderation_budget_investments_path }.to raise_exception(FeatureFlags::FeatureDisabled)
-
-    Setting["feature.budgets"] = true
   end
 
   scenario "Hiding an investment", :js do
diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index ec4970887..81c8cc2c6 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -416,9 +416,6 @@ feature "Users" do
       Setting["feature.budgets"] = nil
       visit user_path(user)
       expect(page).to have_content("4 Comments")
-
-      Setting["feature.debates"] = true
-      Setting["feature.budgets"] = true
     end
   end
 
diff --git a/spec/features/valuation/budget_investments_spec.rb b/spec/features/valuation/budget_investments_spec.rb
index 5649c8873..560d1ec14 100644
--- a/spec/features/valuation/budget_investments_spec.rb
+++ b/spec/features/valuation/budget_investments_spec.rb
@@ -16,8 +16,6 @@ feature "Valuation budget investments" do
     expect{
       visit valuation_budget_budget_investments_path(create(:budget))
     }.to raise_exception(FeatureFlags::FeatureDisabled)
-
-    Setting["feature.budgets"] = true
   end
 
   scenario "Display link to valuation section" do