mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* test/webrick/utils.rb (start_server): provide a reference to log of
webrick. * test/webrick/test_httpproxy.rb, test/webrick/test_httpauth.rb, test/webrick/test_cgi.rb, test/webrick/test_httpserver.rb, test/webrick/test_server.rb, test/webrick/test_filehandler.rb: use webrick log as an assertion message. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
3056933cc0
commit
224471fd57
8 changed files with 157 additions and 140 deletions
|
|
@ -7,7 +7,7 @@ require File.join(File.dirname(__FILE__), "utils.rb")
|
|||
|
||||
class TestWEBrickHTTPAuth < Test::Unit::TestCase
|
||||
def test_basic_auth
|
||||
TestWEBrick.start_httpserver{|server, addr, port|
|
||||
TestWEBrick.start_httpserver{|server, addr, port, log|
|
||||
realm = "WEBrick's realm"
|
||||
path = "/basic_auth"
|
||||
|
||||
|
|
@ -20,14 +20,14 @@ class TestWEBrickHTTPAuth < Test::Unit::TestCase
|
|||
http = Net::HTTP.new(addr, port)
|
||||
g = Net::HTTP::Get.new(path)
|
||||
g.basic_auth("webrick", "supersecretpassword")
|
||||
http.request(g){|res| assert_equal("hoge", res.body)}
|
||||
http.request(g){|res| assert_equal("hoge", res.body, log.call)}
|
||||
g.basic_auth("webrick", "not super")
|
||||
http.request(g){|res| assert_not_equal("hoge", res.body)}
|
||||
http.request(g){|res| assert_not_equal("hoge", res.body, log.call)}
|
||||
}
|
||||
end
|
||||
|
||||
def test_basic_auth2
|
||||
TestWEBrick.start_httpserver{|server, addr, port|
|
||||
TestWEBrick.start_httpserver{|server, addr, port, log|
|
||||
realm = "WEBrick's realm"
|
||||
path = "/basic_auth2"
|
||||
|
||||
|
|
@ -41,9 +41,9 @@ class TestWEBrickHTTPAuth < Test::Unit::TestCase
|
|||
htpasswd = WEBrick::HTTPAuth::Htpasswd.new(tmpfile.path)
|
||||
users = []
|
||||
htpasswd.each{|user, pass| users << user }
|
||||
assert_equal(2, users.size)
|
||||
assert(users.member?("webrick"))
|
||||
assert(users.member?("foo"))
|
||||
assert_equal(2, users.size, log.call)
|
||||
assert(users.member?("webrick"), log.call)
|
||||
assert(users.member?("foo"), log.call)
|
||||
|
||||
server.mount_proc(path){|req, res|
|
||||
auth = WEBrick::HTTPAuth::BasicAuth.new(
|
||||
|
|
@ -56,9 +56,9 @@ class TestWEBrickHTTPAuth < Test::Unit::TestCase
|
|||
http = Net::HTTP.new(addr, port)
|
||||
g = Net::HTTP::Get.new(path)
|
||||
g.basic_auth("webrick", "supersecretpassword")
|
||||
http.request(g){|res| assert_equal("hoge", res.body)}
|
||||
http.request(g){|res| assert_equal("hoge", res.body, log.call)}
|
||||
g.basic_auth("webrick", "not super")
|
||||
http.request(g){|res| assert_not_equal("hoge", res.body)}
|
||||
http.request(g){|res| assert_not_equal("hoge", res.body, log.call)}
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue