Deprecated should_return_from_session in favor of should_set_session [t…

…houghtbot#146 state:resolved]
tomlea · Feb 9, 2009 · 738228f · 738228f
1 parent 33705c8
commit 738228f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/lib/shoulda/action_controller/macros.rb b/lib/shoulda/action_controller/macros.rb
@@ -152,14 +152,13 @@ def should_respond_with_content_type(content_type)
       # set by the controller are available to the evaled string.
       # Example:
       #
-      #   should_return_from_session(:user_id) { '@user.id' }
+      #   should_set_session(:user_id) { '@user.id' }
-      #   should_return_from_session(:message) { "Free stuff" }
+      #   should_set_session(:message) { "Free stuff" }
-      def should_return_from_session(key, expected = nil, &block)
+      def should_set_session(key, expected = nil, &block)
         matcher = set_session(key)
         if expected
-          warn "[DEPRECATION] should_return_from_session :key, 'val' is " <<
+          warn "[DEPRECATION] should_set_session :key, 'val' is deprecated. " <<
-               "deprecated. Use should_return_from_session(:key) { 'val' } " <<
+               "Use should_set_session(:key) { 'val' } instead."
-               "instead."
         end
         should matcher.description do
           if expected
@@ -178,6 +177,13 @@ def should_return_from_session(key, expected = nil, &block)
         end
       end
 
+      # Deprecated. See should_set_session
+      def should_return_from_session(key, expected)
+        warn "[DEPRECATION] should_require_attributes is deprecated. " <<
+             "Use should_set_session instead."
+        should_set_session(key, expected)
+      end
+
       # Macro that creates a test asserting that the controller rendered the given template.
       # Example:
       #

diff --git a/test/functional/posts_controller_test.rb b/test/functional/posts_controller_test.rb
@@ -70,10 +70,11 @@ def setup
       should_respond_with_content_type :rss
       should_respond_with_content_type /rss/
       should_return_from_session :special, "'$2 off your next purchase'"
-      should_return_from_session :special_user_id, '@user.id'
+      should_set_session :special, "'$2 off your next purchase'"
-      should_return_from_session(:special_user_id) { @user.id }
+      should_set_session :special_user_id, '@user.id'
+      should_set_session(:special_user_id) { @user.id }
       should_fail do
-        should_return_from_session(:special_user_id) { 'value' }
+        should_set_session(:special_user_id) { 'value' }
       end
       should_assign_to :user, :posts
       should_not_assign_to :foo, :bar