Changeset 2635

Timestamp:

10/16/05 02:20:53 (3 years ago)

Author:

xal

Message:

added assert_valid to AP

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/assertions.rb (modified) (1 diff)
• trunk/actionpack/test/controller/action_pack_assertions_test.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/active_record_assertions_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added assert_vaild. Reports the proper AR error messages as fail message when the passed record is invalid [Tobias Luetke]
-
-* Add temporary support for passing locals to render using string keys [Nicholas Seckar]

trunk/actionpack/lib/action_controller/assertions.rb

@@ -284 +284 @@
-        end
-      end
+
+      # ensures that the passed record is valid by active record standards. returns the error messages if not
+      def assert_valid(record)                                   
+        clean_backtrace do
+          assert record.valid?, record.errors.full_messages        
+        end
+      end             
-      
-      def clean_backtrace(&block)

trunk/actionpack/test/controller/action_pack_assertions_test.rb

@@ -78 +78 @@
-    raise "post" if @request.post?
-    render_text "request method: #{@request.env['REQUEST_METHOD']}"
+  end       
+  
+  def get_valid_record
+    @record = Class.new do       
+      def valid?
+        true
+      end
+
+      def errors
+        Class.new do 
+           def full_messages; '...stuff...'; end          
+        end.new
+      end    
+    
+    end.new
+        
+    render :nothing => true    
+  end
+
+
+  def get_invalid_record
+    @record = Class.new do 
+      
+      def valid?
+        false
+      end
+      
+      def errors
+        Class.new do 
+           def full_messages; '...stuff...'; end          
+        end.new
+      end
+    end.new                
+    
+    render :nothing => true    
-  end
-
@@ -421 +456 @@
-    get :redirect_to_fellow_controller
-    assert_redirected_to :controller => 'admin/user'
+  end                 
+  
+  def test_assert_valid
+    get :get_valid_record
+    assert_valid assigns('record')    
+  end                
+  
+  def test_assert_valid_failing
+    get :get_invalid_record
+    
+    begin
+      assert_valid assigns('record')    
+      assert false
+    rescue Test::Unit::AssertionFailedError => e             
+    end
-  end
-end

trunk/actionpack/test/controller/active_record_assertions_test.rb

@@ -76 +76 @@
-  def rescue_action(e) raise; end
-end
-
-
+
-class ActiveRecordAssertionsControllerTest < Test::Unit::TestCase
-  def setup