From 7c7f903ed0935bb4c50fa57654a32c8ed818c9e6 Mon Sep 17 00:00:00 2001
From: Bertocq <bertocq@gmail.com>
Date: Tue, 9 Jan 2018 01:33:44 +0100
Subject: [PATCH] Make customization engine spec less prone to flaky failures

---
 spec/customization_engine_spec.rb | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/spec/customization_engine_spec.rb b/spec/customization_engine_spec.rb
index e4259b49a..c36ee68a7 100644
--- a/spec/customization_engine_spec.rb
+++ b/spec/customization_engine_spec.rb
@@ -8,21 +8,33 @@ describe 'Customization Engine' do
   let(:test_key) { I18n.t('account.show.change_credentials_link') }
   let!(:default_path) { I18n.load_path }
 
+  before do
+    reset_load_path_and_reload(default_path)
+  end
+
+  after do
+    reset_load_path_and_reload(default_path)
+  end
+
   it "loads custom and override original locales" do
-    I18n.load_path += Dir[Rails.root.join('spec', 'support', 'locales', 'custom', '*.{rb,yml}')]
-    I18n.reload!
+    increase_load_path_and_reload(Dir[Rails.root.join('spec', 'support',
+                                                      'locales', 'custom', '*.{rb,yml}')])
     expect(test_key).to eq 'Overriden string with custom locales'
   end
 
   it "does not override original locales" do
-    I18n.load_path.delete_if {|item| item =~ /spec\/support\/locales\/custom/ }
-    I18n.load_path += Dir[Rails.root.join('spec', 'support', 'locales', '**', '*.{rb,yml}')]
-    I18n.reload!
+    increase_load_path_and_reload(Dir[Rails.root.join('spec', 'support',
+                                                      'locales', '**', '*.{rb,yml}')])
     expect(test_key).to eq 'Not overriden string with custom locales'
   end
 
-  after do
-    I18n.load_path = default_path
+  def reset_load_path_and_reload(path)
+    I18n.load_path = path
+    I18n.reload!
+  end
+
+  def increase_load_path_and_reload(path)
+    I18n.load_path += path
     I18n.reload!
   end