Add in-tree mspec and ruby/spec

* For easier modifications of ruby/spec by MRI developers.
* .gitignore: track changes under spec.
* spec/mspec, spec/rubyspec: add in-tree mspec and ruby/spec.
  These files can therefore be updated like any other file in MRI.
  Instructions are provided in spec/README.
  [Feature #13156] [ruby-core:79246]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

28 files changed, 1483 insertions, 0 deletions

diff --git a/spec/rubyspec/library/cgi/htmlextension/a_spec.rb b/spec/rubyspec/library/cgi/htmlextension/a_spec.rb
new file mode 100644
index 0000000000..a4c0ee684c
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/a_spec.rb
@@ -0,0 +1,49 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#a" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when passed a String" do
+    it "returns an 'a'-element, using the passed String as the 'href'-attribute" do
+      output = @html.a("http://www.example.com")
+      output.should equal_element("A", "HREF" => "http://www.example.com")
+    end
+
+    it "includes the passed block's return value when passed a block" do
+      output = @html.a("http://www.example.com") { "Example" }
+      output.should equal_element("A", { "HREF" => "http://www.example.com" }, "Example")
+    end
+  end
+
+  describe "when passed a Hash" do
+    it "returns an 'a'-element, using the passed Hash for attributes" do
+      attributes = {"HREF" => "http://www.example.com", "TARGET" => "_top"}
+      @html.a(attributes).should equal_element("A", attributes)
+    end
+
+    it "includes the passed block's return value when passed a block" do
+      attributes = {"HREF" => "http://www.example.com", "TARGET" => "_top"}
+      @html.a(attributes) { "Example" }.should equal_element("A", attributes, "Example")
+    end
+  end
+
+  describe "when each HTML generation" do
+    it "returns the doctype declaration for HTML3" do
+      CGISpecs.cgi_new("html3").a.should == %(<A HREF=""></A>)
+      CGISpecs.cgi_new("html3").a { "link text" }.should == %(<A HREF="">link text</A>)
+    end
+
+    it "returns the doctype declaration for HTML4" do
+      CGISpecs.cgi_new("html4").a.should == %(<A HREF=""></A>)
+      CGISpecs.cgi_new("html4").a { "link text" }.should == %(<A HREF="">link text</A>)
+    end
+    it "returns the doctype declaration for the Transitional version of HTML4" do
+      CGISpecs.cgi_new("html4Tr").a.should == %(<A HREF=""></A>)
+      CGISpecs.cgi_new("html4Tr").a { "link text" }.should == %(<A HREF="">link text</A>)
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/base_spec.rb b/spec/rubyspec/library/cgi/htmlextension/base_spec.rb
new file mode 100644
index 0000000000..36a8cc55c8
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/base_spec.rb
@@ -0,0 +1,33 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#base" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when bassed a String" do
+    it "returns a 'base'-element, using the passed String as the 'href'-attribute" do
+      output = @html.base("http://www.example.com")
+      output.should equal_element("BASE", {"HREF" => "http://www.example.com"}, nil, not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.base("http://www.example.com") { "Example" }
+      output.should equal_element("BASE", {"HREF" => "http://www.example.com"}, nil, not_closed: true)
+    end
+  end
+
+  describe "when passed a Hash" do
+    it "returns a 'base'-element, using the passed Hash for attributes" do
+      output = @html.base("HREF" => "http://www.example.com", "ID" => "test")
+      output.should equal_element("BASE", {"HREF" => "http://www.example.com", "ID" => "test"}, nil, not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.base("HREF" => "http://www.example.com", "ID" => "test") { "Example" }
+      output.should equal_element("BASE", {"HREF" => "http://www.example.com", "ID" => "test"}, nil, not_closed: true)
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/blockquote_spec.rb b/spec/rubyspec/library/cgi/htmlextension/blockquote_spec.rb
new file mode 100644
index 0000000000..f9848375e8
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/blockquote_spec.rb
@@ -0,0 +1,33 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#blockquote" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when passed a String" do
+    it "returns a 'blockquote'-element, using the passed String for the 'cite'-attribute" do
+      output = @html.blockquote("http://www.example.com/quotes/foo.html")
+      output.should equal_element("BLOCKQUOTE", "CITE" => "http://www.example.com/quotes/foo.html")
+    end
+
+    it "includes the passed block's return value when passed a block" do
+      output = @html.blockquote("http://www.example.com/quotes/foo.html") { "Foo!" }
+      output.should equal_element("BLOCKQUOTE", { "CITE" => "http://www.example.com/quotes/foo.html" }, "Foo!")
+    end
+  end
+
+  describe "when passed a Hash" do
+    it "returns a 'blockquote'-element, using the passed Hash for attributes" do
+      output = @html.blockquote("CITE" => "http://www.example.com/quotes/foo.html", "ID" => "test")
+      output.should equal_element("BLOCKQUOTE", "CITE" => "http://www.example.com/quotes/foo.html", "ID" => "test")
+    end
+
+    it "includes the passed block's return value when passed a block" do
+      output = @html.blockquote("CITE" => "http://www.example.com/quotes/foo.html", "ID" => "test") { "Foo!" }
+      output.should equal_element("BLOCKQUOTE", {"CITE" => "http://www.example.com/quotes/foo.html", "ID" => "test"}, "Foo!")
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/br_spec.rb b/spec/rubyspec/library/cgi/htmlextension/br_spec.rb
new file mode 100644
index 0000000000..875d335fe5
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/br_spec.rb
@@ -0,0 +1,22 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#br" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when each HTML generation" do
+    it "returns the doctype declaration for HTML3" do
+      CGISpecs.cgi_new("html3").br.should == "<BR>"
+    end
+
+    it "returns the doctype declaration for HTML4" do
+      CGISpecs.cgi_new("html4").br.should == "<BR>"
+    end
+    it "returns the doctype declaration for the Transitional version of HTML4" do
+      CGISpecs.cgi_new("html4Tr").br.should == "<BR>"
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/caption_spec.rb b/spec/rubyspec/library/cgi/htmlextension/caption_spec.rb
new file mode 100644
index 0000000000..a1b5f4d964
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/caption_spec.rb
@@ -0,0 +1,33 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#caption" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when passed a String" do
+    it "returns a 'caption'-element, using the passed String for the 'align'-attribute" do
+      output = @html.caption("left")
+      output.should equal_element("CAPTION", "ALIGN" => "left")
+    end
+
+    it "includes the passed block's return value when passed a block" do
+      output = @html.caption("left") { "Capital Cities" }
+      output.should equal_element("CAPTION", {"ALIGN" => "left"}, "Capital Cities")
+    end
+  end
+
+  describe "when passed a Hash" do
+    it "returns a 'caption'-element, using the passed Hash for attributes" do
+      output = @html.caption("ALIGN" => "left", "ID" => "test")
+      output.should equal_element("CAPTION", "ALIGN" => "left", "ID" => "test")
+    end
+
+    it "includes the passed block's return value when passed a block" do
+      output = @html.caption("ALIGN" => "left", "ID" => "test") { "Capital Cities" }
+      output.should equal_element("CAPTION", {"ALIGN" => "left", "ID" => "test"}, "Capital Cities")
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/checkbox_group_spec.rb b/spec/rubyspec/library/cgi/htmlextension/checkbox_group_spec.rb
new file mode 100644
index 0000000000..f739d92a53
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/checkbox_group_spec.rb
@@ -0,0 +1,76 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#checkbox_group" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when passed name, values ..." do
+    it "returns a sequence of 'checkbox'-elements with the passed name and the passed values" do
+      output = CGISpecs.split(@html.checkbox_group("test", "foo", "bar", "baz"))
+      output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
+    end
+
+    it "allows passing a value inside an Array" do
+      output = CGISpecs.split(@html.checkbox_group("test", ["foo"], "bar", ["baz"]))
+      output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
+    end
+
+    it "allows passing a value as an Array containing the value and the checked state or a label" do
+      output = CGISpecs.split(@html.checkbox_group("test", ["foo"], ["bar", true], ["baz", "label for baz"]))
+      output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "baz"}, "label for baz", not_closed: true)
+    end
+
+    it "allows passing a value as an Array containing the value, a label and the checked state" do
+      output = CGISpecs.split(@html.checkbox_group("test", ["foo", "label for foo", true], ["bar", "label for bar", false], ["baz", "label for baz", true]))
+      output[0].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "checkbox", "VALUE" => "foo"}, "label for foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "bar"}, "label for bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "checkbox", "VALUE" => "baz"}, "label for baz", not_closed: true)
+    end
+
+    it "returns an empty String when passed no values" do
+      @html.checkbox_group("test").should == ""
+    end
+
+    it "ignores a passed block" do
+      output = CGISpecs.split(@html.checkbox_group("test", "foo", "bar", "baz") { "test" })
+      output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
+    end
+  end
+
+  describe "when passed Hash" do
+    it "uses the passed Hash to generate the checkbox sequence" do
+      output = CGISpecs.split(@html.checkbox_group("NAME" => "name", "VALUES" => ["foo", "bar", "baz"]))
+      output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
+
+      output = CGISpecs.split(@html.checkbox_group("NAME" => "name", "VALUES" => [["foo"], ["bar", true], "baz"]))
+      output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "name", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
+
+      output = CGISpecs.split(@html.checkbox_group("NAME" => "name", "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"]))
+      output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "1"}, "Foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "name", "TYPE" => "checkbox", "VALUE" => "2"}, "Bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "Baz"}, "Baz", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = CGISpecs.split(@html.checkbox_group("NAME" => "name", "VALUES" => ["foo", "bar", "baz"]) { "test" })
+      output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/checkbox_spec.rb b/spec/rubyspec/library/cgi/htmlextension/checkbox_spec.rb
new file mode 100644
index 0000000000..3abb3b4a31
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/checkbox_spec.rb
@@ -0,0 +1,77 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#checkbox" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when passed no arguments" do
+    it "returns a checkbox-'input'-element without a name" do
+      output = @html.checkbox
+      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "checkbox"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.checkbox { "test" }
+      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "checkbox"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed name" do
+    it "returns a checkbox-'input'-element with the passed name" do
+      output = @html.checkbox("test")
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.checkbox("test") { "test" }
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox"}, "", not_closed: true)
+    end
+  end
+
+  describe "CGI::HtmlExtension#checkbox when passed name, value" do
+    it "returns a checkbox-'input'-element with the passed name and value" do
+      output = @html.checkbox("test", "test-value")
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.checkbox("test", "test-value") { "test" }
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed name, value, checked" do
+    it "returns a checked checkbox-'input'-element with the passed name and value when checked is true" do
+      output = @html.checkbox("test", "test-value", true)
+      output.should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
+
+      output = @html.checkbox("test", "test-value", false)
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
+
+      output = @html.checkbox("test", "test-value", nil)
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.checkbox("test", "test-value", nil) { "test" }
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed Hash" do
+    it "returns a checkbox-'input'-element using the passed Hash for attributes" do
+      attributes = {"NAME" => "test", "VALUE" => "test-value", "CHECKED" => true}
+      output = @html.checkbox(attributes)
+      output.should equal_element("INPUT", attributes, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      attributes = {"NAME" => "test", "VALUE" => "test-value", "CHECKED" => true}
+      output = @html.checkbox(attributes) { "test" }
+      output.should equal_element("INPUT", attributes, "", not_closed: true)
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/doctype_spec.rb b/spec/rubyspec/library/cgi/htmlextension/doctype_spec.rb
new file mode 100644
index 0000000000..339ef20db9
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/doctype_spec.rb
@@ -0,0 +1,27 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#doctype" do
+  describe "when each HTML generation" do
+    it "returns the doctype declaration for HTML3" do
+      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">'
+      CGISpecs.cgi_new("html3").doctype.should == expect
+    end
+
+    it "returns the doctype declaration for HTML4" do
+      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'
+      CGISpecs.cgi_new("html4").doctype.should == expect
+    end
+
+    it "returns the doctype declaration for the Frameset version of HTML4" do
+      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">'
+      CGISpecs.cgi_new("html4Fr").doctype.should == expect
+    end
+
+    it "returns the doctype declaration for the Transitional version of HTML4" do
+      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'
+      CGISpecs.cgi_new("html4Tr").doctype.should == expect
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/file_field_spec.rb b/spec/rubyspec/library/cgi/htmlextension/file_field_spec.rb
new file mode 100644
index 0000000000..57d91b5fd9
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/file_field_spec.rb
@@ -0,0 +1,72 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#file_field" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when passed no arguments" do
+    it "returns a file-'input'-element without a name and a size of 20" do
+      output = @html.file_field
+      output.should equal_element("INPUT", {"SIZE" => 20, "NAME" => "", "TYPE" => "file"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.file_field { "test" }
+      output.should equal_element("INPUT", {"SIZE" => 20, "NAME" => "", "TYPE" => "file"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed name" do
+    it "returns a checkbox-'input'-element with the passed name" do
+      output = @html.file_field("Example")
+      output.should equal_element("INPUT", {"SIZE" => 20, "NAME" => "Example", "TYPE" => "file"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.file_field("Example") { "test" }
+      output.should equal_element("INPUT", {"SIZE" => 20, "NAME" => "Example", "TYPE" => "file"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed name, size" do
+    it "returns a checkbox-'input'-element with the passed name and size" do
+      output = @html.file_field("Example", 40)
+      output.should equal_element("INPUT", {"SIZE" => 40, "NAME" => "Example", "TYPE" => "file"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.file_field("Example", 40) { "test" }
+      output.should equal_element("INPUT", {"SIZE" => 40, "NAME" => "Example", "TYPE" => "file"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed name, size, maxlength" do
+    it "returns a checkbox-'input'-element with the passed name, size and maxlength" do
+      output = @html.file_field("Example", 40, 100)
+      output.should equal_element("INPUT", {"SIZE" => 40, "NAME" => "Example", "TYPE" => "file", "MAXLENGTH" => 100}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.file_field("Example", 40, 100) { "test" }
+      output.should equal_element("INPUT", {"SIZE" => 40, "NAME" => "Example", "TYPE" => "file", "MAXLENGTH" => 100}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed a Hash" do
+    it "returns a file-'input'-element using the passed Hash for attributes" do
+      output = @html.file_field("NAME" => "test", "SIZE" => 40)
+      output.should equal_element("INPUT", {"NAME" => "test", "SIZE" => 40}, "", not_closed: true)
+
+      output = @html.file_field("NAME" => "test", "MAXLENGTH" => 100)
+      output.should equal_element("INPUT", {"NAME" => "test", "MAXLENGTH" => 100}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.file_field("NAME" => "test", "SIZE" => 40) { "test" }
+      output.should equal_element("INPUT", {"NAME" => "test", "SIZE" => 40}, "", not_closed: true)
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/fixtures/common.rb b/spec/rubyspec/library/cgi/htmlextension/fixtures/common.rb
new file mode 100644
index 0000000000..4f951f6389
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/fixtures/common.rb
@@ -0,0 +1,15 @@
+module CGISpecs
+  def self.cgi_new(html = "html4")
+    old_request_method = ENV['REQUEST_METHOD']
+    ENV['REQUEST_METHOD'] = "GET"
+    begin
+      CGI.new(tag_maker: html)
+    ensure
+      ENV['REQUEST_METHOD'] = old_request_method
+    end
+  end
+
+  def self.split(string)
+    string.split("<").reject { |x| x.empty? }.map { |x| "<#{x}" }
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/form_spec.rb b/spec/rubyspec/library/cgi/htmlextension/form_spec.rb
new file mode 100644
index 0000000000..0389910cd6
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/form_spec.rb
@@ -0,0 +1,58 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#form" do
+  before :each do
+    @html = CGISpecs.cgi_new
+    @html.stub!(:script_name).and_return("/path/to/some/script")
+  end
+
+  describe "when passed no arguments" do
+    it "returns a 'form'-element" do
+      output = @html.form
+      output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "post", "ACTION" => "/path/to/some/script"}, "")
+    end
+
+    it "includes the return value of the passed block when passed a block" do
+      output = @html.form { "test" }
+      output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "post", "ACTION" => "/path/to/some/script"}, "test")
+    end
+  end
+
+  describe "when passed method" do
+    it "returns a 'form'-element with the passed method" do
+      output = @html.form("get")
+      output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ACTION" => "/path/to/some/script"}, "")
+    end
+
+    it "includes the return value of the passed block when passed a block" do
+      output = @html.form("get") { "test" }
+      output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ACTION" => "/path/to/some/script"}, "test")
+    end
+  end
+
+  describe "when passed method, action" do
+    it "returns a 'form'-element with the passed method and the passed action" do
+      output = @html.form("get", "/some/other/script")
+      output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ACTION" => "/some/other/script"}, "")
+    end
+
+    it "includes the return value of the passed block when passed a block" do
+      output = @html.form("get", "/some/other/script") { "test" }
+      output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ACTION" => "/some/other/script"}, "test")
+    end
+  end
+
+  describe "when passed method, action, enctype" do
+    it "returns a 'form'-element with the passed method, action and enctype" do
+      output = @html.form("get", "/some/other/script", "multipart/form-data")
+      output.should equal_element("FORM", {"ENCTYPE" => "multipart/form-data", "METHOD" => "get", "ACTION" => "/some/other/script"}, "")
+    end
+
+    it "includes the return value of the passed block when passed a block" do
+      output = @html.form("get", "/some/other/script", "multipart/form-data") { "test" }
+      output.should equal_element("FORM", {"ENCTYPE" => "multipart/form-data", "METHOD" => "get", "ACTION" => "/some/other/script"}, "test")
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/frame_spec.rb b/spec/rubyspec/library/cgi/htmlextension/frame_spec.rb
new file mode 100644
index 0000000000..d433d058e7
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/frame_spec.rb
@@ -0,0 +1,14 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
+require 'cgi'
+
+describe "CGI::HtmlExtension#frame" do
+  before :each do
+    @html = CGISpecs.cgi_new("html4Fr")
+  end
+
+  it "initializes the HTML Generation methods for the Frameset version of HTML4" do
+    @html.frameset.should == "<FRAMESET></FRAMESET>"
+    @html.frameset { "link text" }.should == "<FRAMESET>link text</FRAMESET>"
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/frameset_spec.rb b/spec/rubyspec/library/cgi/htmlextension/frameset_spec.rb
new file mode 100644
index 0000000000..81e92089e4
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/frameset_spec.rb
@@ -0,0 +1,14 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
+require 'cgi'
+
+describe "CGI::HtmlExtension#frameset" do
+  before :each do
+    @html = CGISpecs.cgi_new("html4Fr")
+  end
+
+  it "initializes the HTML Generation methods for the Frameset version of HTML4" do
+    @html.frameset.should == "<FRAMESET></FRAMESET>"
+    @html.frameset { "link text" }.should == "<FRAMESET>link text</FRAMESET>"
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/hidden_spec.rb b/spec/rubyspec/library/cgi/htmlextension/hidden_spec.rb
new file mode 100644
index 0000000000..dd06dfc354
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/hidden_spec.rb
@@ -0,0 +1,59 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#hidden" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when passed no arguments" do
+    it "returns an hidden-'input'-element without a name" do
+      output = @html.hidden
+      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "hidden"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.hidden { "test" }
+      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "hidden"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed name" do
+    it "returns an hidden-'input'-element with the passed name" do
+      output = @html.hidden("test")
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "hidden"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.hidden("test") { "test" }
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "hidden"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed name, value" do
+    it "returns an hidden-'input'-element with the passed name and value" do
+      output = @html.hidden("test", "some value")
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "hidden", "VALUE" => "some value"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.hidden("test", "some value") { "test" }
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "hidden", "VALUE" => "some value"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed Hash" do
+    it "returns a checkbox-'input'-element using the passed Hash for attributes" do
+      attributes = { "NAME" => "test", "VALUE" => "some value" }
+      output = @html.hidden("test", "some value")
+      output.should equal_element("INPUT", attributes, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      attributes = { "NAME" => "test", "VALUE" => "some value" }
+      output = @html.hidden("test", "some value") { "test" }
+      output.should equal_element("INPUT", attributes, "", not_closed: true)
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/html_spec.rb b/spec/rubyspec/library/cgi/htmlextension/html_spec.rb
new file mode 100644
index 0000000000..0dfba297d2
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/html_spec.rb
@@ -0,0 +1,66 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#html" do
+  before :each do
+    @html = CGISpecs.cgi_new
+    @html.stub!(:doctype).and_return("<!DOCTYPE SUPA-FUNKAY-RUBYSPEC-DOCTYPE>")
+  end
+
+  describe "when passed no arguments" do
+    it "returns a self's doctype and an 'html'-element" do
+      expected = '<!DOCTYPE SUPA-FUNKAY-RUBYSPEC-DOCTYPE><HTML>'
+      @html.html.should == expected
+    end
+
+    it "includes the passed block when passed a block" do
+      expected = '<!DOCTYPE SUPA-FUNKAY-RUBYSPEC-DOCTYPE><HTML>test</HTML>'
+      @html.html { "test" }.should == expected
+    end
+  end
+
+  describe "when passed 'PRETTY'" do
+    it "returns pretty output when the passed String is 'PRETTY" do
+      expected = "<!DOCTYPE SUPA-FUNKAY-RUBYSPEC-DOCTYPE>\n<HTML>\n"
+      @html.html("PRETTY").should == expected
+    end
+
+    it "includes the passed block when passed a block" do
+      expected = "<!DOCTYPE SUPA-FUNKAY-RUBYSPEC-DOCTYPE>\n<HTML>\n  test\n</HTML>\n"
+      @html.html("PRETTY") { "test" }.should == expected
+    end
+  end
+
+  describe "when passed a Hash" do
+    it "returns an 'html'-element using the passed Hash for attributes" do
+      expected = '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><HTML BLA="TEST">'
+      @html.html("DOCTYPE" => '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">', "BLA" => "TEST").should == expected
+    end
+
+    it "omits the doctype when the Hash contains a 'DOCTYPE' entry that's false or nil" do
+      @html.html("DOCTYPE" => false).should == "<HTML>"
+      @html.html("DOCTYPE" => nil).should == "<HTML>"
+    end
+  end
+
+  describe "when each HTML generation" do
+    it "returns the doctype declaration for HTML3" do
+      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">'
+      CGISpecs.cgi_new("html3").html.should == expect + "<HTML>"
+      CGISpecs.cgi_new("html3").html { "html body" }.should == expect + "<HTML>html body</HTML>"
+    end
+
+    it "returns the doctype declaration for HTML4" do
+      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'
+      CGISpecs.cgi_new("html4").html.should == expect + "<HTML>"
+      CGISpecs.cgi_new("html4").html { "html body" }.should == expect + "<HTML>html body</HTML>"
+    end
+
+    it "returns the doctype declaration for the Transitional version of HTML4" do
+      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'
+      CGISpecs.cgi_new("html4Tr").html.should == expect + "<HTML>"
+      CGISpecs.cgi_new("html4Tr").html { "html body" }.should == expect + "<HTML>html body</HTML>"
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/image_button_spec.rb b/spec/rubyspec/library/cgi/htmlextension/image_button_spec.rb
new file mode 100644
index 0000000000..f4e39d8028
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/image_button_spec.rb
@@ -0,0 +1,69 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#image_button" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when passed no arguments" do
+    it "returns an image-'input'-element without a source image" do
+      output = @html.image_button
+      output.should equal_element("INPUT", {"SRC" => "", "TYPE" => "image"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.image_button { "test" }
+      output.should equal_element("INPUT", {"SRC" => "", "TYPE" => "image"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed src" do
+    it "returns an image-'input'-element with the passed src" do
+      output = @html.image_button("/path/to/image.png")
+      output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.image_button("/path/to/image.png") { "test" }
+      output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed src, name" do
+    it "returns an image-'input'-element with the passed src and name" do
+      output = @html.image_button("/path/to/image.png", "test")
+      output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image", "NAME" => "test"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.image_button("/path/to/image.png", "test") { "test" }
+      output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image", "NAME" => "test"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed src, name, alt" do
+    it "returns an image-'input'-element with the passed src, name and alt" do
+      output = @html.image_button("/path/to/image.png", "test", "alternative")
+      output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image", "NAME" => "test", "ALT" => "alternative"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.image_button("/path/to/image.png", "test", "alternative") { "test" }
+      output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image", "NAME" => "test", "ALT" => "alternative"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed Hash" do
+    it "returns a image-'input'-element using the passed Hash for attributes" do
+      output = @html.image_button("NAME" => "test", "VALUE" => "test-value")
+      output.should equal_element("INPUT", {"SRC" => "", "TYPE" => "image", "NAME" => "test", "VALUE" => "test-value"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.image_button("NAME" => "test", "VALUE" => "test-value") { "test" }
+      output.should equal_element("INPUT", {"SRC" => "", "TYPE" => "image", "NAME" => "test", "VALUE" => "test-value"}, "", not_closed: true)
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/img_spec.rb b/spec/rubyspec/library/cgi/htmlextension/img_spec.rb
new file mode 100644
index 0000000000..8109bcd6c6
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/img_spec.rb
@@ -0,0 +1,83 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#img" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when passed no arguments" do
+    it "returns an 'img'-element without an src-url or alt-text" do
+      output = @html.img
+      output.should equal_element("IMG", { "SRC" => "", "ALT" => "" }, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.img { "test" }
+      output.should equal_element("IMG", { "SRC" => "", "ALT" => "" }, "", not_closed: true)
+    end
+  end
+
+  describe "when passed src" do
+    it "returns an 'img'-element with the passed src-url" do
+      output = @html.img("/path/to/some/image.png")
+      output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "" }, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.img("/path/to/some/image.png")
+      output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "" }, "", not_closed: true)
+    end
+  end
+
+  describe "when passed src, alt" do
+    it "returns an 'img'-element with the passed src-url and the passed alt-text" do
+      output = @html.img("/path/to/some/image.png", "Alternative")
+      output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "Alternative" }, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.img("/path/to/some/image.png", "Alternative") { "test" }
+      output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "Alternative" }, "", not_closed: true)
+    end
+  end
+
+  describe "when passed src, alt, width" do
+    it "returns an 'img'-element with the passed src-url, the passed alt-text and the passed width" do
+      output = @html.img("/path/to/some/image.png", "Alternative", 40)
+      output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "Alternative", "WIDTH" => "40" }, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.img("/path/to/some/image.png", "Alternative", 40) { "test" }
+      output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "Alternative", "WIDTH" => "40" }, "", not_closed: true)
+    end
+  end
+
+  describe "when passed src, alt, width, height" do
+    it "returns an 'img'-element with the passed src-url, the passed alt-text, the passed width and the passed height" do
+      output = @html.img("/path/to/some/image.png", "Alternative", 40, 60)
+      output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "Alternative", "WIDTH" => "40", "HEIGHT" => "60" }, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.img { "test" }
+      output.should equal_element("IMG", { "SRC" => "", "ALT" => "" }, "", not_closed: true)
+    end
+  end
+
+  describe "when passed Hash" do
+    it "returns an 'img'-element with the passed Hash as attributes" do
+      attributes = { "SRC" => "src", "ALT" => "alt", "WIDTH" => 100, "HEIGHT" => 50 }
+      output = @html.img(attributes)
+      output.should equal_element("IMG", attributes, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      attributes = { "SRC" => "src", "ALT" => "alt", "WIDTH" => 100, "HEIGHT" => 50 }
+      output = @html.img(attributes) { "test" }
+      output.should equal_element("IMG", attributes, "", not_closed: true)
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/multipart_form_spec.rb b/spec/rubyspec/library/cgi/htmlextension/multipart_form_spec.rb
new file mode 100644
index 0000000000..75d1b54666
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/multipart_form_spec.rb
@@ -0,0 +1,64 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#multipart_form" do
+  before :each do
+    @html = CGISpecs.cgi_new
+    @html.stub!(:script_name).and_return("/path/to/some/script.rb")
+  end
+
+  describe "when passed no arguments" do
+    it "returns a 'form'-element with it's enctype set to multipart" do
+      output = @html.multipart_form
+      output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post" }, "")
+    end
+
+    it "includes the return value of the passed block when passed a block" do
+      output = @html.multipart_form { "test" }
+      output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post" }, "test")
+    end
+  end
+
+  describe "when passed action" do
+    it "returns a 'form'-element with the passed action" do
+      output = @html.multipart_form("/some/other/script.rb")
+      output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post", "ACTION" => "/some/other/script.rb" }, "")
+    end
+
+    it "includes the return value of the passed block when passed a block" do
+      output = @html.multipart_form("/some/other/script.rb") { "test" }
+      output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post", "ACTION" => "/some/other/script.rb" }, "test")
+    end
+  end
+
+  describe "when passed action, enctype" do
+    it "returns a 'form'-element with the passed action and enctype" do
+      output = @html.multipart_form("/some/other/script.rb", "application/x-www-form-urlencoded")
+      output.should equal_element("FORM", { "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "post", "ACTION" => "/some/other/script.rb" }, "")
+    end
+
+    it "includes the return value of the passed block when passed a block" do
+      output = @html.multipart_form("/some/other/script.rb", "application/x-www-form-urlencoded") { "test" }
+      output.should equal_element("FORM", { "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "post", "ACTION" => "/some/other/script.rb" }, "test")
+    end
+  end
+
+  describe "when passed Hash" do
+    it "returns a 'form'-element with the passed Hash as attributes" do
+      output = @html.multipart_form("ID" => "test")
+      output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post", "ID" => "test" }, "")
+
+      output = @html.multipart_form("ID" => "test", "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get")
+      output.should equal_element("FORM", { "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ID" => "test" }, "")
+    end
+
+    it "includes the return value of the passed block when passed a block" do
+      output = @html.multipart_form("ID" => "test") { "test" }
+      output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post", "ID" => "test" }, "test")
+
+      output = @html.multipart_form("ID" => "test", "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get") { "test" }
+      output.should equal_element("FORM", { "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ID" => "test" }, "test")
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/password_field_spec.rb b/spec/rubyspec/library/cgi/htmlextension/password_field_spec.rb
new file mode 100644
index 0000000000..bb1181de75
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/password_field_spec.rb
@@ -0,0 +1,84 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#password_field" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when passed no arguments" do
+    it "returns an password-'input'-element without a name" do
+      output = @html.password_field
+      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "password", "SIZE" => "40"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.password_field { "test" }
+      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "password", "SIZE" => "40"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed name" do
+    it "returns an password-'input'-element with the passed name" do
+      output = @html.password_field("test")
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "SIZE" => "40"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.password_field("test") { "test" }
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "SIZE" => "40"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed name, value" do
+    it "returns an password-'input'-element with the passed name and value" do
+      output = @html.password_field("test", "some value")
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "40"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.password_field("test", "some value") { "test" }
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "40"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed name, value, size" do
+    it "returns an password-'input'-element with the passed name, value and size" do
+      output = @html.password_field("test", "some value", 60)
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "60"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.password_field("test", "some value", 60) { "test" }
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "60"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed name, value, size, maxlength" do
+    it "returns an password-'input'-element with the passed name, value, size and maxlength" do
+      output = @html.password_field("test", "some value", 60, 12)
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "60", "MAXLENGTH" => 12}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.password_field("test", "some value", 60, 12) { "test" }
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "60", "MAXLENGTH" => 12}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed Hash" do
+    it "returns a checkbox-'input'-element using the passed Hash for attributes" do
+      output = @html.password_field("NAME" => "test", "VALUE" => "some value")
+      output.should equal_element("INPUT", { "NAME" => "test", "VALUE" => "some value", "TYPE" => "password" }, "", not_closed: true)
+
+      output = @html.password_field("TYPE" => "hidden")
+      output.should equal_element("INPUT", {"TYPE" => "password"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.password_field("NAME" => "test", "VALUE" => "some value") { "test" }
+      output.should equal_element("INPUT", { "NAME" => "test", "VALUE" => "some value", "TYPE" => "password" }, "", not_closed: true)
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/popup_menu_spec.rb b/spec/rubyspec/library/cgi/htmlextension/popup_menu_spec.rb
new file mode 100644
index 0000000000..5e94ec1a3e
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/popup_menu_spec.rb
@@ -0,0 +1,8 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+require File.expand_path('../shared/popup_menu', __FILE__)
+
+describe "CGI::HtmlExtension#popup_menu" do
+  it_behaves_like :cgi_htmlextension_popup_menu, :popup_menu
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/radio_button_spec.rb b/spec/rubyspec/library/cgi/htmlextension/radio_button_spec.rb
new file mode 100644
index 0000000000..0ce88f20d7
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/radio_button_spec.rb
@@ -0,0 +1,77 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#radio_button" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when passed no arguments" do
+    it "returns a radio-'input'-element without a name" do
+      output = @html.radio_button
+      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "radio"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.radio_button { "test" }
+      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "radio"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed name" do
+    it "returns a radio-'input'-element with the passed name" do
+      output = @html.radio_button("test")
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.radio_button("test") { "test" }
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio"}, "", not_closed: true)
+    end
+  end
+
+  describe "CGI::HtmlExtension#checkbox when passed name, value" do
+    it "returns a radio-'input'-element with the passed name and value" do
+      output = @html.radio_button("test", "test-value")
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.radio_button("test", "test-value") { "test" }
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed name, value, checked" do
+    it "returns a checked radio-'input'-element with the passed name and value when checked is true" do
+      output = @html.radio_button("test", "test-value", true)
+      output.should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
+
+      output = @html.radio_button("test", "test-value", false)
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
+
+      output = @html.radio_button("test", "test-value", nil)
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.radio_button("test", "test-value", nil) { "test" }
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed Hash" do
+    it "returns a radio-'input'-element using the passed Hash for attributes" do
+      attributes = {"NAME" => "test", "VALUE" => "test-value", "CHECKED" => true}
+      output = @html.radio_button(attributes)
+      output.should equal_element("INPUT", attributes, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      attributes = {"NAME" => "test", "VALUE" => "test-value", "CHECKED" => true}
+      output = @html.radio_button(attributes) { "test" }
+      output.should equal_element("INPUT", attributes, "", not_closed: true)
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/radio_group_spec.rb b/spec/rubyspec/library/cgi/htmlextension/radio_group_spec.rb
new file mode 100644
index 0000000000..69d3444072
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/radio_group_spec.rb
@@ -0,0 +1,77 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#radio_group" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when passed name, values ..." do
+    it "returns a sequence of 'radio'-elements with the passed name and the passed values" do
+      output = CGISpecs.split(@html.radio_group("test", "foo", "bar", "baz"))
+      output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
+    end
+
+    it "allows passing a value inside an Array" do
+      output = CGISpecs.split(@html.radio_group("test", ["foo"], "bar", ["baz"]))
+      output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
+    end
+
+    it "allows passing a value as an Array containing the value and the checked state or a label" do
+      output = CGISpecs.split(@html.radio_group("test", ["foo"], ["bar", true], ["baz", "label for baz"]))
+      output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "baz"}, "label for baz", not_closed: true)
+    end
+
+    # TODO: CGI does not like passing false instead of true.
+    it "allows passing a value as an Array containing the value, a label and the checked state" do
+      output = CGISpecs.split(@html.radio_group("test", ["foo", "label for foo", true], ["bar", "label for bar", false], ["baz", "label for baz", true]))
+      output[0].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "radio", "VALUE" => "foo"}, "label for foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "bar"}, "label for bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "radio", "VALUE" => "baz"}, "label for baz", not_closed: true)
+    end
+
+    it "returns an empty String when passed no values" do
+      @html.radio_group("test").should == ""
+    end
+
+    it "ignores a passed block" do
+      output = CGISpecs.split(@html.radio_group("test", "foo", "bar", "baz") { "test" })
+      output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
+    end
+  end
+
+  describe "when passed Hash" do
+    it "uses the passed Hash to generate the radio sequence" do
+      output = CGISpecs.split(@html.radio_group("NAME" => "name", "VALUES" => ["foo", "bar", "baz"]))
+      output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
+
+      output = CGISpecs.split(@html.radio_group("NAME" => "name", "VALUES" => [["foo"], ["bar", true], "baz"]))
+      output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "name", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
+
+      output = CGISpecs.split(@html.radio_group("NAME" => "name", "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"]))
+      output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "1"}, "Foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "name", "TYPE" => "radio", "VALUE" => "2"}, "Bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "Baz"}, "Baz", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = CGISpecs.split(@html.radio_group("NAME" => "name", "VALUES" => ["foo", "bar", "baz"]) { "test" })
+      output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
+      output[1].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
+      output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/reset_spec.rb b/spec/rubyspec/library/cgi/htmlextension/reset_spec.rb
new file mode 100644
index 0000000000..09184347d0
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/reset_spec.rb
@@ -0,0 +1,57 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#reset" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when passed no arguments" do
+    it "returns a reset-'input'-element" do
+      output = @html.reset
+      output.should equal_element("INPUT", {"TYPE" => "reset"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.reset { "test" }
+      output.should equal_element("INPUT", {"TYPE" => "reset"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed value" do
+    it "returns a reset-'input'-element with the passed value" do
+      output = @html.reset("Example")
+      output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.reset("Example") { "test" }
+      output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed value, name" do
+    it "returns a reset-'input'-element with the passed value and the passed name" do
+      output = @html.reset("Example", "test-name")
+      output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example", "NAME" => "test-name"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.reset("Example", "test-name") { "test" }
+      output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example", "NAME" => "test-name"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed Hash" do
+    it "returns a reset-'input'-element with the passed value" do
+      output = @html.reset("Example")
+      output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.reset("Example") { "test" }
+      output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example"}, "", not_closed: true)
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/scrolling_list_spec.rb b/spec/rubyspec/library/cgi/htmlextension/scrolling_list_spec.rb
new file mode 100644
index 0000000000..da295278b1
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/scrolling_list_spec.rb
@@ -0,0 +1,8 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
+require 'cgi'
+require File.expand_path('../shared/popup_menu', __FILE__)
+
+describe "CGI::HtmlExtension#scrolling_list" do
+  it_behaves_like :cgi_htmlextension_popup_menu, :scrolling_list
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/shared/popup_menu.rb b/spec/rubyspec/library/cgi/htmlextension/shared/popup_menu.rb
new file mode 100644
index 0000000000..4787fd3f8e
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/shared/popup_menu.rb
@@ -0,0 +1,94 @@
+describe :cgi_htmlextension_popup_menu, shared: true do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when passed no arguments" do
+    it "returns an empty 'select'-element without a name" do
+      output = @html.send(@method)
+      output.should equal_element("SELECT", {"NAME" => ""}, "")
+    end
+
+    it "ignores a passed block" do
+      output = @html.send(@method) { "test" }
+      output.should equal_element("SELECT", {"NAME" => ""}, "")
+    end
+  end
+
+  describe "when passed name, values ..." do
+    it "returns a 'select'-element with the passed name containing 'option'-elements based on the passed values" do
+      content = @html.option("VALUE" => "foo") { "foo" }
+      content << @html.option("VALUE" => "bar") { "bar" }
+      content << @html.option("VALUE" => "baz") { "baz" }
+
+      output = @html.send(@method, "test", "foo", "bar", "baz")
+      output.should equal_element("SELECT", {"NAME" => "test"}, content)
+    end
+
+    it "allows passing values inside of arrays" do
+      content = @html.option("VALUE" => "foo") { "foo" }
+      content << @html.option("VALUE" => "bar") { "bar" }
+      content << @html.option("VALUE" => "baz") { "baz" }
+
+      output = @html.send(@method, "test", ["foo"], ["bar"], ["baz"])
+      output.should equal_element("SELECT", {"NAME" => "test"}, content)
+    end
+
+    it "allows passing a value as an Array containing the value and the select state or a label" do
+      content = @html.option("VALUE" => "foo") { "foo" }
+      content << @html.option("VALUE" => "bar", "SELECTED" => true) { "bar" }
+      content << @html.option("VALUE" => "baz") { "baz" }
+
+      output = @html.send(@method, "test", ["foo"], ["bar", true], "baz")
+      output.should equal_element("SELECT", {"NAME" => "test"}, content)
+    end
+
+    it "allows passing a value as an Array containing the value, a label and the select state" do
+      content = @html.option("VALUE" => "1") { "Foo" }
+      content << @html.option("VALUE" => "2", "SELECTED" => true) { "Bar" }
+      content << @html.option("VALUE" => "Baz") { "Baz" }
+
+      output = @html.send(@method, "test", ["1", "Foo"], ["2", "Bar", true], "Baz")
+      output.should equal_element("SELECT", {"NAME" => "test"}, content)
+    end
+
+    it "ignores a passed block" do
+      content = @html.option("VALUE" => "foo") { "foo" }
+      content << @html.option("VALUE" => "bar") { "bar" }
+      content << @html.option("VALUE" => "baz") { "baz" }
+
+      output = @html.send(@method, "test", "foo", "bar", "baz") { "woot" }
+      output.should equal_element("SELECT", {"NAME" => "test"}, content)
+    end
+  end
+
+  describe "when passed a Hash" do
+    it "uses the passed Hash to generate the 'select'-element and the 'option'-elements" do
+      attributes = {
+        "NAME"   => "test", "SIZE" => 2, "MULTIPLE" => true,
+        "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"]
+      }
+
+      content = @html.option("VALUE" => "1") { "Foo" }
+      content << @html.option("VALUE" => "2", "SELECTED" => true) { "Bar" }
+      content << @html.option("VALUE" => "Baz") { "Baz" }
+
+      output = @html.send(@method, attributes)
+      output.should equal_element("SELECT", {"NAME" => "test", "SIZE" => 2, "MULTIPLE" => true}, content)
+    end
+
+    it "ignores a passed block" do
+      attributes = {
+        "NAME"   => "test", "SIZE" => 2, "MULTIPLE" => true,
+        "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"]
+      }
+
+      content = @html.option("VALUE" => "1") { "Foo" }
+      content << @html.option("VALUE" => "2", "SELECTED" => true) { "Bar" }
+      content << @html.option("VALUE" => "Baz") { "Baz" }
+
+      output = @html.send(@method, attributes) { "testing" }
+      output.should equal_element("SELECT", {"NAME" => "test", "SIZE" => 2, "MULTIPLE" => true}, content)
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/submit_spec.rb b/spec/rubyspec/library/cgi/htmlextension/submit_spec.rb
new file mode 100644
index 0000000000..8b9d9b02d8
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/submit_spec.rb
@@ -0,0 +1,57 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#submit" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when passed no arguments" do
+    it "returns a submit-'input'-element" do
+      output = @html.submit
+      output.should equal_element("INPUT", {"TYPE" => "submit"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.submit { "test" }
+      output.should equal_element("INPUT", {"TYPE" => "submit"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed value" do
+    it "returns a submit-'input'-element with the passed value" do
+      output = @html.submit("Example")
+      output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.submit("Example") { "test" }
+      output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed value, name" do
+    it "returns a submit-'input'-element with the passed value and the passed name" do
+      output = @html.submit("Example", "test-name")
+      output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example", "NAME" => "test-name"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.submit("Example", "test-name") { "test" }
+      output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example", "NAME" => "test-name"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed Hash" do
+    it "returns a submit-'input'-element with the passed value" do
+      output = @html.submit("Example")
+      output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.submit("Example") { "test" }
+      output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example"}, "", not_closed: true)
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/text_field_spec.rb b/spec/rubyspec/library/cgi/htmlextension/text_field_spec.rb
new file mode 100644
index 0000000000..b8031d6ff5
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/text_field_spec.rb
@@ -0,0 +1,84 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#text_field" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when passed no arguments" do
+    it "returns an text-'input'-element without a name" do
+      output = @html.text_field
+      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "text", "SIZE" => "40"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.text_field { "test" }
+      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "text", "SIZE" => "40"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed name" do
+    it "returns an text-'input'-element with the passed name" do
+      output = @html.text_field("test")
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "SIZE" => "40"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.text_field("test") { "test" }
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "SIZE" => "40"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed name, value" do
+    it "returns an text-'input'-element with the passed name and value" do
+      output = @html.text_field("test", "some value")
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "40"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.text_field("test", "some value") { "test" }
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "40"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed name, value, size" do
+    it "returns an text-'input'-element with the passed name, value and size" do
+      output = @html.text_field("test", "some value", 60)
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "60"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.text_field("test", "some value", 60) { "test" }
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "60"}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed name, value, size, maxlength" do
+    it "returns an text-'input'-element with the passed name, value, size and maxlength" do
+      output = @html.text_field("test", "some value", 60, 12)
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "60", "MAXLENGTH" => 12}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.text_field("test", "some value", 60, 12) { "test" }
+      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "60", "MAXLENGTH" => 12}, "", not_closed: true)
+    end
+  end
+
+  describe "when passed Hash" do
+    it "returns a checkbox-'input'-element using the passed Hash for attributes" do
+      output = @html.text_field("NAME" => "test", "VALUE" => "some value")
+      output.should equal_element("INPUT", { "NAME" => "test", "VALUE" => "some value", "TYPE" => "text" }, "", not_closed: true)
+
+      output = @html.text_field("TYPE" => "hidden")
+      output.should equal_element("INPUT", {"TYPE" => "text"}, "", not_closed: true)
+    end
+
+    it "ignores a passed block" do
+      output = @html.text_field("NAME" => "test", "VALUE" => "some value") { "test" }
+      output.should equal_element("INPUT", { "NAME" => "test", "VALUE" => "some value", "TYPE" => "text" }, "", not_closed: true)
+    end
+  end
+end
diff --git a/spec/rubyspec/library/cgi/htmlextension/textarea_spec.rb b/spec/rubyspec/library/cgi/htmlextension/textarea_spec.rb
new file mode 100644
index 0000000000..e47e6ed417
--- /dev/null
+++ b/spec/rubyspec/library/cgi/htmlextension/textarea_spec.rb
@@ -0,0 +1,73 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#textarea" do
+  before :each do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when passed no arguments" do
+    it "returns an 'textarea'-element without a name" do
+      output = @html.textarea
+      output.should equal_element("TEXTAREA", {"NAME" => "", "COLS" => "70", "ROWS" => "10"}, "")
+    end
+
+    it "includes the return value of the passed block when passed a block" do
+      output = @html.textarea { "Example" }
+      output.should equal_element("TEXTAREA", {"NAME" => "", "COLS" => "70", "ROWS" => "10"}, "Example")
+    end
+  end
+
+  describe "when passed name" do
+    it "returns an 'textarea'-element with the passed name" do
+      output = @html.textarea("test")
+      output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "70", "ROWS" => "10"}, "")
+    end
+
+    it "includes the return value of the passed block when passed a block" do
+      output = @html.textarea("test") { "Example" }
+      output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "70", "ROWS" => "10"}, "Example")
+    end
+  end
+
+  describe "when passed name, cols" do
+    it "returns an 'textarea'-element with the passed name and the passed amount of columns" do
+      output = @html.textarea("test", 40)
+      output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "40", "ROWS" => "10"}, "")
+    end
+
+    it "includes the return value of the passed block when passed a block" do
+      output = @html.textarea("test", 40) { "Example" }
+      output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "40", "ROWS" => "10"}, "Example")
+    end
+  end
+
+  describe "when passed name, cols, rows" do
+    it "returns an 'textarea'-element with the passed name, the passed amount of columns and the passed number of rows" do
+      output = @html.textarea("test", 40, 5)
+      output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "40", "ROWS" => "5"}, "")
+    end
+
+    it "includes the return value of the passed block when passed a block" do
+      output = @html.textarea("test", 40, 5) { "Example" }
+      output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "40", "ROWS" => "5"}, "Example")
+    end
+  end
+
+  describe "when passed Hash" do
+    it "uses the passed Hash as attributes" do
+      @html.textarea("ID" => "test").should == '<TEXTAREA ID="test"></TEXTAREA>'
+
+      attributes = {"ID" => "test-id", "NAME" => "test-name"}
+      output = @html.textarea(attributes)
+      output.should equal_element("TEXTAREA", attributes, "")
+    end
+
+    it "includes the return value of the passed block when passed a block" do
+      attributes = {"ID" => "test-id", "NAME" => "test-name"}
+      output = @html.textarea(attributes) { "test" }
+      output.should equal_element("TEXTAREA", attributes, "test")
+    end
+  end
+end