include RSpec::Rails::RailsExampleGroup before other modules that nee…

…d its services
txus · Jan 3, 2011 · bacf868 · bacf868
1 parent 3a5cba4
commit bacf868
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/History.md b/History.md
@@ -1,5 +1,13 @@
 ## rspec-rails-2 release history
 
+### 2.4.1 / 2011-01-03
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.4.0...2.4.1)
+
+* Bug fixes
+  * fixed bug caused by including some Rails modules before RSpec's
+    RailsExampleGroup
+
 ### 2.4.0 / 2011-01-02
 
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.3.1...2.4.0)

diff --git a/lib/rspec/rails/example/controller_example_group.rb b/lib/rspec/rails/example/controller_example_group.rb
@@ -72,9 +72,8 @@ module RSpec::Rails
   #
   module ControllerExampleGroup
     extend ActiveSupport::Concern
-
-    include ActionController::TestCase::Behavior
     include RSpec::Rails::RailsExampleGroup
+    include ActionController::TestCase::Behavior
     include RSpec::Rails::ViewRendering
     include RSpec::Rails::Matchers::RedirectTo
     include RSpec::Rails::Matchers::RenderTemplate

diff --git a/lib/rspec/rails/example/helper_example_group.rb b/lib/rspec/rails/example/helper_example_group.rb
@@ -27,9 +27,8 @@ module RSpec::Rails
   #
   module HelperExampleGroup
     extend ActiveSupport::Concern
-
-    include ActionView::TestCase::Behavior
     include RSpec::Rails::RailsExampleGroup
+    include ActionView::TestCase::Behavior
     include RSpec::Rails::ViewAssigns
     include RSpec::Rails::BrowserSimulators
 

diff --git a/lib/rspec/rails/example/mailer_example_group.rb b/lib/rspec/rails/example/mailer_example_group.rb
@@ -2,9 +2,8 @@
   module RSpec::Rails
     module MailerExampleGroup
       extend ActiveSupport::Concern
-
-      include ActionMailer::TestCase::Behavior
       include RSpec::Rails::RailsExampleGroup
+      include ActionMailer::TestCase::Behavior
       include RSpec::Rails::BrowserSimulators
 
       webrat do

diff --git a/lib/rspec/rails/example/model_example_group.rb b/lib/rspec/rails/example/model_example_group.rb
@@ -1,7 +1,6 @@
 module RSpec::Rails
   module ModelExampleGroup
     extend ActiveSupport::Concern
-
     include RSpec::Rails::RailsExampleGroup
 
     included do

diff --git a/lib/rspec/rails/example/rails_example_group.rb b/lib/rspec/rails/example/rails_example_group.rb
@@ -2,7 +2,6 @@ module RSpec
   module Rails
     module RailsExampleGroup
       extend ActiveSupport::Concern
-
       include RSpec::Rails::SetupAndTeardownAdapter
       include RSpec::Rails::TestUnitAssertionAdapter
     end

diff --git a/lib/rspec/rails/example/request_example_group.rb b/lib/rspec/rails/example/request_example_group.rb
@@ -13,10 +13,9 @@ module RSpec::Rails
   #   => delegates to assert_redirected_to(destination)
   module RequestExampleGroup
     extend ActiveSupport::Concern
-
+    include RSpec::Rails::RailsExampleGroup
     include ActionDispatch::Integration::Runner
     include ActionDispatch::Assertions
-    include RSpec::Rails::RailsExampleGroup
     include RSpec::Rails::BrowserSimulators
 
     module InstanceMethods

diff --git a/lib/rspec/rails/example/routing_example_group.rb b/lib/rspec/rails/example/routing_example_group.rb
@@ -3,9 +3,8 @@
 module RSpec::Rails
   module RoutingExampleGroup
     extend ActiveSupport::Concern
-
-    include ActionDispatch::Assertions::RoutingAssertions
     include RSpec::Rails::RailsExampleGroup
+    include ActionDispatch::Assertions::RoutingAssertions
     include RSpec::Rails::Matchers::RoutingMatchers
 
     module InstanceMethods

diff --git a/lib/rspec/rails/example/view_example_group.rb b/lib/rspec/rails/example/view_example_group.rb
@@ -19,9 +19,8 @@ module RSpec::Rails
   #   end
   module ViewExampleGroup
     extend ActiveSupport::Concern
-
-    include ActionView::TestCase::Behavior
     include RSpec::Rails::RailsExampleGroup
+    include ActionView::TestCase::Behavior
     include RSpec::Rails::ViewAssigns
     include RSpec::Rails::Matchers::RenderTemplate
     include RSpec::Rails::BrowserSimulators