Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

1 files changed, 45 insertions, 0 deletions

diff --git a/actionpack/test/dispatch/test_request_test.rb b/actionpack/test/dispatch/test_request_test.rb
new file mode 100644
index 0000000000..5da02b2ea6
--- /dev/null
+++ b/actionpack/test/dispatch/test_request_test.rb
@@ -0,0 +1,45 @@
+require 'abstract_unit'
+
+class TestRequestTest < ActiveSupport::TestCase
+  test "sane defaults" do
+    env = ActionDispatch::TestRequest.new.env
+
+    assert_equal "GET", env.delete("REQUEST_METHOD")
+    assert_equal "off", env.delete("HTTPS")
+    assert_equal "http", env.delete("rack.url_scheme")
+    assert_equal "example.org", env.delete("SERVER_NAME")
+    assert_equal "80", env.delete("SERVER_PORT")
+    assert_equal "/", env.delete("PATH_INFO")
+    assert_equal "", env.delete("SCRIPT_NAME")
+    assert_equal "", env.delete("QUERY_STRING")
+    assert_equal "0", env.delete("CONTENT_LENGTH")
+
+    assert_equal "test.host", env.delete("HTTP_HOST")
+    assert_equal "0.0.0.0", env.delete("REMOTE_ADDR")
+    assert_equal "Rails Testing", env.delete("HTTP_USER_AGENT")
+
+    assert_equal [1, 0], env.delete("rack.version")
+    assert_equal "", env.delete("rack.input").string
+    assert_kind_of StringIO, env.delete("rack.errors")
+    assert_equal true, env.delete("rack.multithread")
+    assert_equal true, env.delete("rack.multiprocess")
+    assert_equal false, env.delete("rack.run_once")
+
+    assert env.empty?, env.inspect
+  end
+
+  test "cookie jar" do
+    req = ActionDispatch::TestRequest.new
+
+    assert_equal({}, req.cookies)
+    assert_equal nil, req.env["HTTP_COOKIE"]
+
+    req.cookies["user_name"] = "david"
+    assert_equal({"user_name" => "david"}, req.cookies)
+    assert_equal "user_name=david;", req.env["HTTP_COOKIE"]
+
+    req.cookies["login"] = "XJ-122"
+    assert_equal({"user_name" => "david", "login" => "XJ-122"}, req.cookies)
+    assert_equal %w(login=XJ-122 user_name=david), req.env["HTTP_COOKIE"].split(/; ?/).sort
+  end
+end