Merge pull request #2345 from alphagov/fix-flakey-integration-tests

Fix integration tests
alphagov · Sep 25, 2024 · a1df8c9 · a1df8c9
2 parents 5a98477 + ab8dadb
commit a1df8c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/test/integration/edition_workflow_test.rb b/test/integration/edition_workflow_test.rb
@@ -18,7 +18,6 @@ class EditionWorkflowTest < LegacyJavascriptIntegrationTest
 
     test_strategy = Flipflop::FeatureSet.current.test!
     test_strategy.switch!(:design_system_publications_filter, false)
-    test_strategy.switch!(:design_system_edit, false)
   end
 
   teardown do

diff --git a/test/legacy_integration_test_helper.rb b/test/legacy_integration_test_helper.rb
@@ -9,6 +9,11 @@ class LegacyIntegrationTest < ActionDispatch::IntegrationTest
   include CapybaraSelect2::Helpers
   include Warden::Test::Helpers
 
+  setup do
+    test_strategy = Flipflop::FeatureSet.current.test!
+    test_strategy.switch!(:design_system_edit, false)
+  end
+
   teardown do
     Capybara.reset_sessions! # Forget the (simulated) browser state
     Capybara.use_default_driver # Revert Capybara.current_driver to Capybara.default_driver