rspec-rails 1.1.7 → 1.1.8

data/History.txt

@@ -1,6 +1,14 @@
+=== Version 1.1.8 / 2008-10-03
+
+* 2 bug fixes
+
+  * correctly handle assigns that are false. Fixes #552.
+  * ensure that NotYetImplemented examples report as pending (fixed in rspec, not rspec-rails). Fixes #553.
+  
 === Version 1.1.7 / 2008-10-02
 
 * 1 bug fix
+
   * depend on the correct version of rspec
 
 === Version 1.1.6 / 2008-10-02

data/Rakefile

@@ -15,7 +15,7 @@ Hoe.new('rspec-rails', Spec::Rails::VERSION::STRING) do |p|
   p.description = "Behaviour Driven Development for Ruby on Rails."
   p.rubyforge_name = 'rspec'
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
-  p.extra_deps = [["rspec","1.1.7"]]
+  p.extra_deps = [["rspec","1.1.8"]]
 end
 
 ['audit','test','test_deps','default','publish_docs','post_blog', 'release'].each do |task|

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

@@ -8,6 +8,8 @@ module Spec
         end
 
         def [](key)
+          return false if assigns[key] == false
+          return false if assigns[key.to_s] == false
           assigns[key] || assigns[key.to_s] || @target.instance_variable_get("@#{key}")
         end
 
@@ -17,6 +19,7 @@ module Spec
 
         def delete(key)
           assigns.delete(key.to_s)
+          @target.instance_variable_set("@#{key}", nil)
         end
 
         def each(&block)

data/lib/spec/rails/version.rb

@@ -4,7 +4,7 @@ module Spec
       unless defined? MAJOR
         MAJOR  = 1
         MINOR  = 1
-        TINY   = 7
+        TINY   = 8
 
         STRING = [MAJOR, MINOR, TINY].join('.')
 

data/spec/rails/example/assigns_hash_proxy_spec.rb

@@ -27,7 +27,7 @@ describe "AssignsHashProxy" do
   
   it "should access object's assigns with a string" do
     @object.assigns['foo'] = 'bar'
-    @proxy[:foo].should == 'bar'
+    @proxy['foo'].should == 'bar'
   end
   
   it "should access object's assigns with a symbol" do
@@ -35,7 +35,17 @@ describe "AssignsHashProxy" do
     @proxy[:foo].should == 'bar'
   end
 
-  it "iterates through each element like a Hash" do
+  it "should access object's ivars with a string" do
+    @object.instance_variable_set('@foo', 'bar')
+    @proxy['foo'].should == 'bar'
+  end
+  
+  it "should access object's ivars with a symbol" do
+    @object.instance_variable_set('@foo', 'bar')
+    @proxy[:foo].should == 'bar'
+  end
+
+  it "should iterate through each element like a Hash" do
     values = {
       'foo' => 1,
       'bar' => 2,
@@ -51,20 +61,36 @@ describe "AssignsHashProxy" do
     end
   end
   
-  it "deletes the element of passed in key" do
+  it "should delete the ivar of passed in key" do
+    @object.instance_variable_set('@foo', 'bar')
+    @proxy.delete('foo')
+    @proxy['foo'].should be_nil
+  end
+  
+  it "should delete the assigned element of passed in key" do
     @object.assigns['foo'] = 'bar'
-    @proxy.delete('foo').should == 'bar'
+    @proxy.delete('foo')
     @proxy['foo'].should be_nil
   end
   
-  it "detects the presence of a key" do
+  it "should detect the presence of a key in assigns" do
     @object.assigns['foo'] = 'bar'
     @proxy.has_key?('foo').should == true
     @proxy.has_key?('bar').should == false
   end
   
-  it "should expose values set in example" do
+  it "should expose values set in example back to the example" do
     @proxy[:foo] = 'bar'
     @proxy[:foo].should == 'bar'
   end
+  
+  it "should allow assignment of false via proxy" do
+    @proxy['foo'] = false
+    @proxy['foo'].should be_false
+  end
+  
+  it "should allow assignment of false" do
+    @object.instance_variable_set('@foo',false)
+    @proxy['foo'].should be_false
+  end
 end

data/spec/rails/example/controller_spec_spec.rb

@@ -6,6 +6,8 @@ require 'controller_spec_controller'
     controller_name :controller_spec
     integrate_views if mode == 'integration'
     
+    specify "this example should be pending, not an error"
+    
     it "should provide controller.session as session" do
       get 'action_with_template'
       session.should equal(controller.session)
@@ -173,6 +175,11 @@ require 'controller_spec_controller'
       assigns[:indirect_assigns_key].should == :indirect_assigns_key_value
     end
     
+    it "should expose instance vars through the assigns hash that are set to false" do
+      get 'action_that_assigns_false_to_a_variable'
+      assigns[:a_variable].should be_false
+    end
+    
     it "should NOT complain when calling should_receive with arguments other than :render" do
       controller.should_receive(:anything_besides_render)
       lambda {

data/spec_resources/controllers/controller_spec_controller.rb

@@ -85,6 +85,11 @@ class ControllerSpecController < ActionController::Base
   def action_with_skipped_before_filter
     render :text => ""
   end
+  
+  def action_that_assigns_false_to_a_variable
+    @a_variable = false
+    render :text => ""
+  end
 end
 
 class ControllerInheritingFromApplicationControllerController < ApplicationController

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-02 00:00:00 -05:00
+date: 2008-10-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.7
+        version: 1.1.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -229,6 +229,6 @@ rubyforge_project: rspec
 rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
-summary: rspec-rails 1.1.7
+summary: rspec-rails 1.1.8
 test_files: []