Changeset 1108

Timestamp:

12/14/07 06:03:30 (9 months ago)

Author:

has.s..@gmail.com

Message:

Fixes issue with merb_helpers errorifying fields with new records. closes #346

Files:

• plugins/merb_helpers/lib/merb_helpers/form_helpers.rb (modified) (1 diff)
• plugins/merb_helpers/specs/merb_helpers_spec.rb (modified) (6 diffs)
• plugins/merb_helpers/specs/spec_helper.rb (modified) (1 diff)

plugins/merb_helpers/lib/merb_helpers/form_helpers.rb

@@ -531 +531 @@
-      
-      def errorify_field(attrs, col)
-!@_obj.valid? && 
+
-      end         
-      

plugins/merb_helpers/specs/merb_helpers_spec.rb

@@ -32 +32 @@
-    errs = error_messages_for(@obj, proc {|err| "<li>#{err[0]} column: #{err[1]}</li>"})
-    errs.should include("<li>foo column: bar</li>")
-
-
+
-end
-
@@ -165 +164 @@
-    result = text_field(:label => "LABEL" )
-    result.should match(/<label>LABEL<\/label><input type="text"\s*\/>/)
-
+ 
-end
-
@@ -191 +190 @@
-    res[2].should_not match_tag(:input, :label => "LABEL")
-  end
+  
+  it "should not errorify the field for a new object" do
+    f = form_for :obj do
+      text_control(:foo, :bar =>"7").should_not match_tag(:input, :type => "text", :name => "fake_model[foo]", :class => "error")    
+    end
+  end
+  
+  it "should errorify a field for a model with errors" do
+    model = mock("model")
+    model.stub!(:new_record?).and_return(true)
+    model.stub!(:class).and_return("MyClass")
+    model.stub!(:foo).and_return("FOO")
+    errors = mock("errors")
+    errors.should_receive(:on).with(:foo).and_return(true)
+    
+    model.stub!(:errors).and_return(errors)
+    
+    f = form_for model do
+      text_control(:foo).should match_tag(:input, :class => "error")
+    end
+  end
-end
-
@@ -229 +249 @@
-    res[2].should_not match_tag(:input, :label => "LABEL")
-  end
+  
+  it "should not errorify the field for a new object" do
+    f = form_for :obj do
+      password_control(:foo, :bar =>"7").should_not match_tag(:input, :class => "error")    
+    end
+  end
+  
+  it "should errorify a field for a model with errors" do
+    model = mock("model")
+    model.stub!(:new_record?).and_return(true)
+    model.stub!(:class).and_return("MyClass")
+    model.stub!(:foo).and_return("FOO")
+    errors = mock("errors")
+    errors.should_receive(:on).with(:foo).and_return(true)
+    
+    model.stub!(:errors).and_return(errors)
+    
+    f = form_for model do
+      password_control(:foo).should match_tag(:input, :class => "error")
+    end
+  end
+  
-end
-
@@ -288 +330 @@
-    res[2].should_not match_tag(:input, :label => "LABEL")
-    end
+    
+    it "should not errorify the field for a new object" do
+      f = form_for :obj do
+        checkbox_control(:foo, :bar =>"7").should_not match_tag(:input, :type => "checkbox", :class => "error checkbox")
+      end
+    end
+
+    it "should errorify a field for a model with errors" do
+      model = mock("model")
+      model.stub!(:new_record?).and_return(true)
+      model.stub!(:class).and_return("MyClass")
+      model.stub!(:foo).and_return("FOO")
+      errors = mock("errors")
+      errors.should_receive(:on).with(:foo).and_return(true)
+    
+      model.stub!(:errors).and_return(errors)
+    
+      f = form_for model do
+        checkbox_control(:foo, :bar =>"7").should match_tag(:input, :type => "checkbox", :class => "error checkbox")
+      end
+    end
-end
-
@@ -323 +386 @@
-      res.should_not match(/<label>LABEL/)
-      res.should_not match_tag(:input, :label=> "LABEL")  
+    end
+  end
+  
+  it "should not errorify the field for a new object" do
+    f = form_for :obj do
+      hidden_control(:foo, :bar =>"7").should_not match_tag(:input, :type => "hidden", :class => "error")
+    end
+  end
+
+  it "should not errorify a field for a model with errors" do
+    model = mock("model")
+    model.stub!(:new_record?).and_return(true)
+    model.stub!(:class).and_return("MyClass")
+    model.stub!(:foo).and_return("FOO")
+    errors = mock("errors")
+    errors.should_receive(:on).with(:foo).and_return(true)
+  
+    model.stub!(:errors).and_return(errors)
+  
+    f = form_for model do
+      hidden_control(:foo, :bar =>"7").should match_tag(:input, :type => "hidden", :name => "my_class[foo]", :class => "error")
-    end
-  end

plugins/merb_helpers/specs/spec_helper.rb

@@ -3 +3 @@
-require 'rubygems'
-require 'merb'
-
+
+
+
+
+
+
+
+
-
-class FakeModel