Changeset 1146

Timestamp:

01/02/08 09:32:11 (9 months ago)

Author:

wayneesegu..@gmail.com

Message:

Applying Patch for ticket #383.
Patch also fixes #385.
Thanks to lancecarlson@gmail.com.

Files:

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

plugins/merb_helpers/lib/merb_helpers/form_helpers.rb

@@ -502 +502 @@
-        self_closing_tag("input", attrs)
-      end
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      private
+
-      # Fake out the browser to send back the method for RESTful stuff.
-      # Fall silently back to post if a method is given that is not supported here

plugins/merb_helpers/specs/merb_helpers_spec.rb

@@ -656 +656 @@
-  end
-end
+
+
+describe "delete_button" do
+  before(:each) do
+    @obj = mock("a model")
+    Merb::Router.prepare do |r|
+      r.resources :objs
+    end
+  end
+
+  it "should return a button inside of a form for the object" do
+    result = delete_button(:obj, @obj)
+    result.should match_tag(:form, :action => "/objs/#{@obj.id}", :method => "post")
+    result.should match_tag(:input, :type => "hidden", :value => "delete", :name => "_method")
+    result.should match_tag(:button, :type => "submit")
+    result.should match(/<button.*>Delete<\/button>/)
+  end
+
+  it "should allow you to modify it's contents" do
+    result = delete_button(:obj, @obj, "Remove")
+    result.should match(/<button.*>Remove<\/button>/)
+  end
+end

plugins/merb_helpers/specs/spec_helper.rb

@@ -9 +9 @@
-  config.include(Merb::Test::Helper)
-  config.include(Merb::Test::RspecMatchers)
-  config.include(Merb::Test::MerbRspecControllerRedirect)  
-end
-