rspec-rails 2.10.0 → 2.10.1

data/Changelog.md

@@ -1,3 +1,11 @@
+### 2.10.1 / 2012-05-03
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.10.0...v2.10.1)
+
+Bug fixes
+
+* fix regression introduced in 2.10.0 that broke integration with Devise
+  (https://github.com/rspec/rspec-rails/issues/534)
+
 ### 2.10.0 / 2012-05-03
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.9.0...v2.10.0)
 

data/lib/rspec/rails/adapters.rb

@@ -12,7 +12,13 @@ module RSpec
         # Wraps `setup` calls from within Rails' testing framework in `before`
         # hooks.
         def setup(*methods)
-          methods.each {|method| prepend_before { send method } }
+          methods.each do |method|
+            if method.to_s =~ /^setup_(fixtures|controller_request_and_response)$/
+              prepend_before { send method }
+            else
+              before         { send method }
+            end
+          end
         end
 
         # @api private
@@ -20,7 +26,7 @@ module RSpec
         # Wraps `teardown` calls from within Rails' testing framework in
         # `after` hooks.
         def teardown(*methods)
-          methods.each {|method| after { send method } }
+          methods.each { |method| after { send method } }
         end
       end
 

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Rails
     module Version
-      STRING = '2.10.0'
+      STRING = '2.10.1'
     end
   end
 end

data/spec/rspec/rails/setup_and_teardown_adapter_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe RSpec::Rails::SetupAndTeardownAdapter do
+  describe "::setup" do
+    it "registers before hooks in the order setup is received" do
+      klass = Class.new do
+        include RSpec::Rails::SetupAndTeardownAdapter
+        def self.foo; "foo"; end
+        def self.bar; "bar"; end
+      end
+      klass.should_receive(:before).ordered { |&block| block.call.should eq "foo" }
+      klass.should_receive(:before).ordered { |&block| block.call.should eq "bar" }
+
+      klass.setup :foo
+      klass.setup :bar
+    end
+
+    it "registers prepend_before hooks for the Rails' setup methods" do
+      klass = Class.new do
+        include RSpec::Rails::SetupAndTeardownAdapter
+        def self.setup_fixtures; "setup fixtures"  end
+        def self.setup_controller_request_and_response; "setup controller"  end
+      end
+
+      klass.should_receive(:prepend_before) { |&block| block.call.should eq "setup fixtures" }
+      klass.should_receive(:prepend_before) { |&block| block.call.should eq "setup controller" }
+
+      klass.setup :setup_fixtures
+      klass.setup :setup_controller_request_and_response
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.5
 description: RSpec for Rails
 email: rspec-users@rubyforge.org
 executables: []
@@ -296,6 +296,7 @@ files:
 - spec/rspec/rails/matchers/route_to_spec.rb
 - spec/rspec/rails/mocks/mock_model_spec.rb
 - spec/rspec/rails/mocks/stub_model_spec.rb
+- spec/rspec/rails/setup_and_teardown_adapter_spec.rb
 - spec/rspec/rails/view_rendering_spec.rb
 - spec/spec_helper.rb
 - spec/support/ar_classes.rb
@@ -317,7 +318,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2355321046634655389
+      hash: -3242320813797165557
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -326,13 +327,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2355321046634655389
+      hash: -3242320813797165557
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.10.0
+summary: rspec-rails-2.10.1
 test_files:
 - features/Autotest.md
 - features/Generators.md
@@ -404,6 +405,7 @@ test_files:
 - spec/rspec/rails/matchers/route_to_spec.rb
 - spec/rspec/rails/mocks/mock_model_spec.rb
 - spec/rspec/rails/mocks/stub_model_spec.rb
+- spec/rspec/rails/setup_and_teardown_adapter_spec.rb
 - spec/rspec/rails/view_rendering_spec.rb
 - spec/spec_helper.rb
 - spec/support/ar_classes.rb