Merge branch 'sh-disable-flipper-midddlware-tests' into 'master'

Disable Flipper memoizer in tests to avoid transient failures Closes #34278 See merge request !12656

Merge branch 'sh-disable-flipper-midddlware-tests' into 'master'
11e03bf4 · Rémy Coutable · dc793933 · 416c6754 · 11e03bf4
Commit 11e03bf4 authored Jul 05, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

flipper.rb config/initializers/flipper.rb +4 -2

No files found.
--- a/config/initializers/flipper.rb
+++ b/config/initializers/flipper.rb
 require 'flipper/middleware/memoizer'

-Rails.application.config.middleware.use Flipper::Middleware::Memoizer,
-  lambda { Feature.flipper }
+unless Rails.env.test?
+  Rails.application.config.middleware.use Flipper::Middleware::Memoizer,
+    lambda { Feature.flipper }
+end