Merge pull request metaskills#73 from metaskills/fixRailsEnv

Revert only require initializers Rails.env.test? done in v4.3.6
Qqwy · Jun 15, 2016 · fc09537 · fc09537
2 parents 60c423c + 2caf086
commit fc09537
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 5.3.1
+
+* Use ENV['RAILS_ENV'] for initializer guards vs memo'ed Rails.env. Fixes #72.
 
 ## 5.3.0
 

diff --git a/gemfiles/rails41.gemfile.lock b/gemfiles/rails41.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
  remote: ../
  specs:
- minitest-spec-rails (5.3.0)
+ minitest-spec-rails (5.4.0)
  minitest (~> 5.0)
  rails (>= 4.1)
 
@@ -46,10 +46,10 @@ GEM
  json (1.8.3)
  mail (2.6.4)
  mime-types (>= 1.16, < 4)
- mime-types (3.0)
+ mime-types (3.1)
  mime-types-data (~> 3.2015)
- mime-types-data (3.2016.0221)
- minitest (5.8.4)
+ mime-types-data (3.2016.0521)
+ minitest (5.9.0)
  rack (1.5.5)
  rack-test (0.6.3)
  rack (>= 1.0)
@@ -68,7 +68,7 @@ GEM
  activesupport (= 4.1.15)
  rake (>= 0.8.7)
  thor (>= 0.18.1, < 2.0)
- rake (11.1.2)
+ rake (11.2.2)
  sprockets (3.6.0)
  concurrent-ruby (~> 1.0)
  rack (> 1, < 3)
@@ -93,4 +93,4 @@ DEPENDENCIES
  sqlite3
 
 BUNDLED WITH
- 1.12.3
+ 1.12.4
diff --git a/gemfiles/rails42.gemfile.lock b/gemfiles/rails42.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
  remote: ../
  specs:
- minitest-spec-rails (5.3.0)
+ minitest-spec-rails (5.4.0)
  minitest (~> 5.0)
  rails (>= 4.1)
 
@@ -59,13 +59,15 @@ GEM
  nokogiri (>= 1.5.9)
  mail (2.6.4)
  mime-types (>= 1.16, < 4)
- mime-types (3.0)
+ mime-types (3.1)
  mime-types-data (~> 3.2015)
- mime-types-data (3.2016.0221)
- mini_portile2 (2.0.0)
- minitest (5.8.4)
- nokogiri (1.6.7.2)
- mini_portile2 (~> 2.0.0.rc2)
+ mime-types-data (3.2016.0521)
+ mini_portile2 (2.1.0)
+ minitest (5.9.0)
+ nokogiri (1.6.8)
+ mini_portile2 (~> 2.1.0)
+ pkg-config (~> 1.1.7)
+ pkg-config (1.1.7)
  rack (1.6.4)
  rack-test (0.6.3)
  rack (>= 1.0)
@@ -93,7 +95,7 @@ GEM
  activesupport (= 4.2.6)
  rake (>= 0.8.7)
  thor (>= 0.18.1, < 2.0)
- rake (11.1.2)
+ rake (11.2.2)
  sprockets (3.6.0)
  concurrent-ruby (~> 1.0)
  rack (> 1, < 3)
@@ -118,4 +120,4 @@ DEPENDENCIES
  sqlite3
 
 BUNDLED WITH
- 1.12.3
+ 1.12.4
diff --git a/gemfiles/rails50.gemfile.lock b/gemfiles/rails50.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
  remote: ../
  specs:
- minitest-spec-rails (5.3.0)
+ minitest-spec-rails (5.4.0)
  minitest (~> 5.0)
  rails (>= 4.1)
 
@@ -62,14 +62,16 @@ GEM
  mail (2.6.4)
  mime-types (>= 1.16, < 4)
  method_source (0.8.2)
- mime-types (3.0)
+ mime-types (3.1)
  mime-types-data (~> 3.2015)
- mime-types-data (3.2016.0221)
- mini_portile2 (2.0.0)
- minitest (5.8.4)
+ mime-types-data (3.2016.0521)
+ mini_portile2 (2.1.0)
+ minitest (5.9.0)
  nio4r (1.2.1)
- nokogiri (1.6.7.2)
- mini_portile2 (~> 2.0.0.rc2)
+ nokogiri (1.6.8)
+ mini_portile2 (~> 2.1.0)
+ pkg-config (~> 1.1.7)
+ pkg-config (1.1.7)
  rack (2.0.0.rc1)
  json
  rack-test (0.6.3)
@@ -100,7 +102,7 @@ GEM
  method_source
  rake (>= 0.8.7)
  thor (>= 0.18.1, < 2.0)
- rake (11.1.2)
+ rake (11.2.2)
  sprockets (3.6.0)
  concurrent-ruby (~> 1.0)
  rack (> 1, < 3)
@@ -113,7 +115,7 @@ GEM
  thread_safe (0.3.5)
  tzinfo (1.2.2)
  thread_safe (~> 0.1)
- websocket-driver (0.6.3)
+ websocket-driver (0.6.4)
  websocket-extensions (>= 0.1.0)
  websocket-extensions (0.1.2)
 
@@ -128,4 +130,4 @@ DEPENDENCIES
  sqlite3
 
 BUNDLED WITH
- 1.12.3
+ 1.12.4
diff --git a/lib/minitest-spec-rails/railtie.rb b/lib/minitest-spec-rails/railtie.rb
@@ -17,15 +17,15 @@ class Railtie < ::Rails::Railtie
  ActiveSupport.on_load(:active_job) do
  require 'minitest-spec-rails/init/active_job'
  end
- end if Rails.env.test?
+ end if ENV['RAILS_ENV'] == 'test'
 
  initializer 'minitest-spec-rails.action_view', :after => 'action_view.setup_action_pack', :group => :all do |app|
  require 'minitest-spec-rails/init/action_view'
- end if Rails.env.test?
+ end if ENV['RAILS_ENV'] == 'test'
 
  initializer 'minitest-spec-rails.mini_shoulda', :group => :all do |app|
  require 'minitest-spec-rails/init/mini_shoulda' if app.config.minitest_spec_rails.mini_shoulda
- end if Rails.env.test?
+ end if ENV['RAILS_ENV'] == 'test'
 
  end
 end
diff --git a/lib/minitest-spec-rails/version.rb b/lib/minitest-spec-rails/version.rb
@@ -1,3 +1,3 @@
 module MiniTestSpecRails
- VERSION = "5.3.0"
+ VERSION = "5.4.0"
 end