rspec-rails 1.3.2 → 1.3.3.rc

data/History.rdoc

@@ -1,3 +1,15 @@
+=== Version 1.3.3 / (in git)
+
+* enhancements
+  * replace use of 'returning' with 'tap'
+
+* bug fixes
+  * support message expectation on template.render with locals (Sergey
+    Nebolsin). Closes #941.
+  * helper instance variable no longer persists across examples
+    (alex rothenberg). Closes #627.
+  * mock_model stubs marked_for_destruction? (returns false).
+
 === Version 1.3.2 / 2010-01-13
 
 * bug fix

data/README.rdoc

@@ -13,6 +13,9 @@ Behaviour Driven Development for Ruby on Rails.
 rspec-rails is an RSpec extension that allows you to drive the development of
 Ruby on Rails applications with RSpec.
 
+This is the repository for rspec-rails-1.x. If you're looking
+for rspec-rails-2 for rails-3, see http://github.com/rspec/rspec-rails.
+
 == FEATURES:
 
 * Use RSpec to independently specify Rails Models, Views, Controllers and Helpers

data/Rakefile

@@ -15,7 +15,7 @@ Hoe.spec 'rspec-rails' do
   self.description = "Behaviour Driven Development for Ruby on Rails."
   self.rubyforge_name = 'rspec'
   self.developer 'RSpec Development Team', 'rspec-devel@rubyforge.org'
-  self.extra_deps = [["rspec",">=1.3.0"],["rack",">=1.0.0"]]
+  self.extra_deps = [["rspec","1.3.1.rc"],["rack",">=1.0.0"]]
   self.extra_dev_deps = [["cucumber",">= 0.3.99"]]
   self.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
   self.history_file = 'History.rdoc'

data/lib/spec/rails/example/helper_example_group.rb

@@ -56,7 +56,7 @@ module Spec
           end
           
           def helper
-            @helper_object ||= returning HelperObject.new do |helper_object|
+            HelperObject.new.tap do |helper_object|
               if @helper_being_described.nil?
                 if described_type.class == Module
                   helper_object.extend described_type
@@ -87,7 +87,7 @@ module Spec
         #   end
         #
         def helper
-          self.class.helper
+          @helper ||= self.class.helper
         end
         
         def orig_assigns
@@ -110,7 +110,7 @@ module Spec
           @output_buffer = ""
           @template = helper
           ActionView::Helpers::AssetTagHelper::reset_javascript_include_default
-          
+
           helper.session = session
           helper.request = @request
           helper.flash = flash

data/lib/spec/rails/example/routing_example_group.rb

@@ -3,7 +3,10 @@ module Spec
     module Example
 
       class RoutingExampleGroup < ActionController::TestCase
-        tests Class.new(ActionController::Base)
+        class RoutingController < ActionController::Base
+        end
+        
+        tests RoutingController
         
         Spec::Example::ExampleGroupFactory.register(:routing, self)
       end

data/lib/spec/rails/extensions/action_view/base.rb

@@ -20,7 +20,9 @@ module ActionView #:nodoc:
     alias_method_chain :render_partial, :base_view_path_handling
 
     def render_with_mock_proxy(options = {}, old_local_assigns = {}, &block)
-      if render_proxy.__send__(:__mock_proxy).__send__(:find_matching_expectation, :render, options)
+      if render_proxy.__send__(:__mock_proxy).__send__(:find_matching_expectation, :render, options, old_local_assigns)
+        render_proxy.render(options, old_local_assigns)
+      elsif render_proxy.__send__(:__mock_proxy).__send__(:find_matching_expectation, :render, options)
         render_proxy.render(options)
       else
         unless render_proxy.__send__(:__mock_proxy).__send__(:find_matching_method_stub, :render, options)

data/lib/spec/rails/extensions/spec/runner/configuration.rb

@@ -30,6 +30,7 @@ if defined?(ActiveRecord::Base)
         end
         def fixture_path=(path)
           ActiveSupport::TestCase.fixture_path = path
+          ActionController::IntegrationTest.fixture_path = path
         end
 
         def global_fixtures

data/lib/spec/rails/mocks.rb

@@ -15,6 +15,7 @@ module Spec
           :to_param => id.to_s,
           :new_record? => false,
           :destroyed? => false,
+          :marked_for_destruction? => false,
           :errors => stub("errors", :count => 0)
         })
         m = mock("#{model_class.name}_#{id}", options_and_stubs)
@@ -97,7 +98,7 @@ module Spec
       #   end
       def stub_model(model_class, stubs={})
         stubs = {:id => next_id}.merge(stubs)
-        returning model_class.new do |model|
+        model_class.new.tap do |model|
           model.id = stubs.delete(:id)
           model.extend ModelStubber
           stubs.each do |k,v|

data/lib/spec/rails/version.rb

@@ -4,8 +4,8 @@ module Spec # :nodoc:
       unless defined? MAJOR
         MAJOR  = 1
         MINOR  = 3
-        TINY   = 2
-        PRE    = nil
+        TINY   = 3
+        PRE    = 'rc'
       
         STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
 

data/spec/spec/rails/example/configuration_spec.rb

@@ -44,12 +44,14 @@ module Spec
         it "should default to RAILS_ROOT + '/spec/fixtures'" do
           config.fixture_path.should == RAILS_ROOT + '/spec/fixtures'
           ActiveSupport::TestCase.fixture_path.should == RAILS_ROOT + '/spec/fixtures'
+          ActionController::IntegrationTest.fixture_path.should == RAILS_ROOT + '/spec/fixtures'
         end
 
         it "should set fixture_path" do
           config.fixture_path = "/new/path"
           config.fixture_path.should == "/new/path"
           ActiveSupport::TestCase.fixture_path.should == "/new/path"
+          ActionController::IntegrationTest.fixture_path.should == "/new/path"
         end
       end
 

data/spec/spec/rails/example/controller_example_group_spec.rb

@@ -8,7 +8,7 @@ require File.join(File.dirname(__FILE__), "/shared_routing_example_group_example
     integrate_views if mode == 'integration'
 
     accesses_configured_helper_methods
-    include RoutingExampleGroupSpec
+    it_should_behave_like "a routing example"
 
     describe "with an implicit subject" do
       it "uses the controller" do

data/spec/spec/rails/example/helper_example_group_spec.rb

@@ -175,6 +175,20 @@ module Spec
         end
       end
 
+      # both specs the same as textmate invokes first-then-second but rake spec:plugins:rspec_on_rails invokes second-then-first
+      describe HelperExampleGroup, "new helper for each spec - instance variables side effects are isolated", :type=> :helper do
+        it 'should be able to set an instance variable on the helper on a new instance of the helper' do
+          helper.instance_variable_get(:@test_instance_var).should be_nil
+          helper.instance_variable_set(:@test_instance_var, :first_value)
+          helper.instance_variable_get(:@test_instance_var).should == :first_value 
+        end
+
+        it 'should get a clean copy of the helper with no saved instance variables from the last run' do
+          helper.instance_variable_get(:@test_instance_var).should be_nil
+          helper.instance_variable_set(:@test_instance_var, :second_value)
+          helper.instance_variable_get(:@test_instance_var).should == :second_value 
+        end
+      end
     end
   end
 end

data/spec/spec/rails/example/routing_example_group_spec.rb

@@ -3,8 +3,7 @@ require 'controller_spec_controller'
 require File.join(File.dirname(__FILE__), "/shared_routing_example_group_examples.rb")
 
 describe "Routing Examples", :type => :routing do
-  
-  include RoutingExampleGroupSpec
-  include RouteToExampleGroupSpec
-  include BeRoutableExampleGroupSpec
+  it_should_behave_like "a routing example"
+  it_should_behave_like "a be routable spec"
+  it_should_behave_like "a route to spec"
 end

data/spec/spec/rails/example/shared_routing_example_group_examples.rb

@@ -1,7 +1,7 @@
 class CustomRouteSpecController < ActionController::Base; end
 class RspecOnRailsSpecsController < ActionController::Base; end
 
-share_as :RoutingExampleGroupSpec do
+shared_examples_for "a routing example" do
   describe "using backward compatible route_for()" do
     it "translates GET-only paths to be explicit" do
       self.should_receive(:assert_routing).with(hash_including(:method => :get), anything, {}, anything)
@@ -93,7 +93,7 @@ share_as :RoutingExampleGroupSpec do
   end
 end
 
-share_as :BeRoutableExampleGroupSpec do
+shared_examples_for "a be routable spec" do
   describe "using should_not be_routable()" do
     it "passes for a bad route" do
       { :put => "/rspec_on_rails_specs/bad_route/37" }.
@@ -151,7 +151,7 @@ share_as :BeRoutableExampleGroupSpec do
   end
 end
 
-share_as :RouteToExampleGroupSpec do
+shared_examples_for "a route to spec" do
   describe "using should[_not] route_to()" do
     it "supports existing routes" do
       { :get => "/controller_spec/some_action" }.

data/spec/spec/rails/extensions/action_view_base_spec.rb

@@ -9,6 +9,11 @@ describe ActionView::Base, "with RSpec extensions:", :type => :view do
       template.render :partial => "name"
     end
   
+    it "should not raise when render with local assignments has been received" do
+      template.should_receive(:render).with('name', :param => 1)
+      template.render 'name', :param => 1
+    end
+    
     it "should raise when render has NOT been received" do
       template.should_receive(:render).with(:partial => "name")
       lambda {

data/spec/spec/rails/mocks/mock_model_spec.rb

@@ -27,6 +27,9 @@ describe "mock_model" do
     it "should say it is not destroyed" do
       @model.destroyed?(SubMockableModel).should be(false)
     end
+    it "should say it is not marked_for_destruction" do
+      @model.marked_for_destruction?.should be(false)
+    end
   end
 
   describe "with params" do

metadata

@@ -1,7 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
+  hash: 7712030
+  prerelease: true
+  segments: 
+  - 1
+  - 3
+  - 3
+  - rc
+  version: 1.3.3.rc
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,49 +16,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-13 00:00:00 -06:00
+date: 2010-10-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
-    version: 
+        hash: 7712022
+        segments: 
+        - 1
+        - 3
+        - 1
+        - rc
+        version: 1.3.1.rc
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 213
+        segments: 
+        - 0
+        - 3
+        - 99
         version: 0.3.99
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+        hash: 19
+        segments: 
+        - 2
+        - 6
+        - 2
+        version: 2.6.2
+  type: :development
+  version_requirements: *id004
 description: Behaviour Driven Development for Ruby on Rails.
 email: 
 - rspec-devel@rubyforge.org
@@ -237,7 +269,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-1.3.2
+    Thank you for installing rspec-rails-1.3.3.rc
     
     If you are upgrading, do this in each of your rails apps
     that you want to upgrade:
@@ -255,23 +287,31 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-rails 1.3.2
+summary: rspec-rails 1.3.3.rc
 test_files: []