Permalink
Browse files

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

…d its services
  • Loading branch information...
1 parent 3a5cba4 commit bacf868ecf18bf1dc1dbf6a8355321431b68d3aa @dchelimsky dchelimsky committed Jan 3, 2011
View
@@ -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)
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,6 @@
module RSpec::Rails
module ModelExampleGroup
extend ActiveSupport::Concern
-
include RSpec::Rails::RailsExampleGroup
included do
@@ -2,7 +2,6 @@ module RSpec
module Rails
module RailsExampleGroup
extend ActiveSupport::Concern
-
include RSpec::Rails::SetupAndTeardownAdapter
include RSpec::Rails::TestUnitAssertionAdapter
end
@@ -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
@@ -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
@@ -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

0 comments on commit bacf868

Please sign in to comment.