shoulda 2.10.0 → 2.10.1

data/lib/shoulda.rb

@@ -1,5 +1,5 @@
 module Shoulda
-  VERSION = "2.10.0"
+  VERSION = "2.10.1"
 end
 
 if defined? Spec

data/lib/shoulda/action_controller/matchers/set_session_matcher.rb

@@ -26,7 +26,7 @@ module Shoulda # :nodoc:
 
         def matches?(controller)
           @controller = controller
-          assigned_value? && assigned_correct_value?
+          (assigned_value? && assigned_correct_value?) || cleared_value?
         end
 
         def failure_message
@@ -39,7 +39,7 @@ module Shoulda # :nodoc:
 
         def description
           description = "set session variable #{@key.inspect}"
-          description << " to #{@value.inspect}" if @value
+          description << " to #{@value.inspect}" if defined?(@value)
           description
         end
 
@@ -49,6 +49,10 @@ module Shoulda # :nodoc:
           !assigned_value.blank?
         end
 
+        def cleared_value?
+          defined?(@value) && @value.nil? && assigned_value.nil?
+        end
+
         def assigned_correct_value?
           return true if @value.nil?
           assigned_value == @value

data/test/functional/posts_controller_test.rb

@@ -69,11 +69,20 @@ class PostsControllerTest < Test::Unit::TestCase
       should_respond_with_content_type 'application/rss+xml'
       should_respond_with_content_type :rss
       should_respond_with_content_type /rss/
-      should_return_from_session :special, "'$2 off your next purchase'"
+      context "deprecated" do # to avoid redefining a test
+        should_return_from_session :special, "'$2 off your next purchase'"
+      end
+      should_fail do
+        should_return_from_session :special, "'not special'"
+      end
+      should_set_session(:mischief) { nil }
+      should_return_from_session :malarky, "nil"
       should_set_session :special, "'$2 off your next purchase'"
       should_set_session :special_user_id, '@user.id'
-      should_set_session(:special_user_id) { @user.id }
-      should_fail do
+      context "with a block" do
+        should_set_session(:special_user_id) { @user.id }
+      end
+      should_fail do # to avoid redefining a test
         should_set_session(:special_user_id) { 'value' }
       end
       should_assign_to :user, :posts
@@ -83,7 +92,9 @@ class PostsControllerTest < Test::Unit::TestCase
     context "viewing a post on GET to #show" do
       setup { get :show, :user_id => users(:first), :id => posts(:first) }
       should_render_with_layout 'wide'
-      should_render_with_layout :wide
+      context "with a symbol" do # to avoid redefining a test
+        should_render_with_layout :wide
+      end
       should_assign_to :false_flag
     end
 

data/test/matchers/controller/set_session_matcher_test.rb

@@ -22,6 +22,10 @@ class SetSessionMatcherTest < Test::Unit::TestCase # :nodoc:
     should "reject assigning to another variable" do
       assert_rejects set_session(:other), @controller
     end
+
+    should "accept assigning nil to another variable" do
+      assert_accepts set_session(:other).to(nil), @controller
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shoulda
 version: !ruby/object:Gem::Version 
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors: 
 - Tammer Saleh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-04 00:00:00 -05:00
+date: 2009-03-05 00:00:00 -05:00
 default_executable: convert_to_should_syntax
 dependencies: []