@@ -1,3 +1,6 @@ +== 1.3.1 + * Update tests/test_patched_net_http.rb to recognize a redirect as success. + == 1.3 * Updated library to work with either "Negotiate" or "NTLM" authorization schemes. Arguments to Win32::SSPI.get_initial_token have changed but that should only impact code directly using the library. Net::HTTP support still works the same. @@ -20,4 +23,4 @@ * Added test to "test_patched_net_http.rb" to ensure net/http has been patched first. * Removed Win32 platform restriction on gem (though it will still only run in Win32 environments, real or emulated). * CHANGELOG begun - \ No newline at end of file + CHANGELOG.txt @@ -6,7 +6,7 @@ require 'rake/testtask' spec = Gem::Specification.new do |s| s.name = "rubysspi" s.summary = "A library which implements Ruby bindings to the Win32 SSPI library. Also includes a module to add Negotiate authentication support to Net::HTTP." - s.version = "1.3" + s.version = "1.3.1" s.author = "Justin Bailey" s.email = "jgbailey @nospam@ gmail.com" s.homepage = "http://rubyforge.org/projects/rubysspi/" Rakefile @@ -9,29 +9,29 @@ # modify this program under the same terms of ruby itself --- # Ruby Distribution License or GNU General Public License. # - -require 'test/unit' -require 'net/http' - -# Intended to test 'patched' version of Net::HTTP. Notice lack of requires at the top. -class PatchedRubyTest < Test::Unit::TestCase - def setup - assert ENV["http_proxy"], "http_proxy must be set before running tests." - end - - def test_net_http - - assert_nothing_raised "net/http does not appear to be patched" do - assert Net::HTTP.sspi?, "sspi? patch applied but did not return true." - end - - assert ENV["http_proxy"], "http_proxy environment variable must be set." - proxy = URI.parse(ENV["http_proxy"]) - assert proxy.host && proxy.port, "Could not parse http_proxy (#{ENV["http_proxy"]}). http_proxy should be a URL with a port (e.g. http://proxy.corp.com:8080)." - - Net::HTTP.Proxy(proxy.host, proxy.port).start("www.google.com") do |http| - resp = http.get("/") - assert resp.code.to_i == 200, "Did not get response from Google as expected." - end - end -end + +require 'test/unit' +require 'net/http' + +# Intended to test 'patched' version of Net::HTTP. Notice lack of requires at the top. +class PatchedRubyTest < Test::Unit::TestCase + def setup + assert ENV["http_proxy"], "http_proxy must be set before running tests." + end + + def test_net_http + + assert_nothing_raised "net/http does not appear to be patched" do + assert Net::HTTP.sspi?, "sspi? patch applied but did not return true." + end + + assert ENV["http_proxy"], "http_proxy environment variable must be set." + proxy = URI.parse(ENV["http_proxy"]) + assert proxy.host && proxy.port, "Could not parse http_proxy (#{ENV["http_proxy"]}). http_proxy should be a URL with a port (e.g. http://proxy.corp.com:8080)." + + Net::HTTP.Proxy(proxy.host, proxy.port).start("www.google.com") do |http| + resp = http.get("/") + assert(resp.code.to_i == 200 || resp.code.to_i == 302, "Did not get response from Google as expected.") + end + end +end test/test_patched_net_http.rb e4a0382029983c62bd10b976fe201e2fe19b6d08 Justin Bailey jgbailey@codeslower.com http://github.com/m4dc4p/rubysspi/commit/81bb20a23027cd20914d48e84f8491a11d62e7ae 81bb20a23027cd20914d48e84f8491a11d62e7ae 2009-01-28T11:33:36-08:00 2009-01-28T11:33:36-08:00 Updated test to recognize redirect as success; rolled versions 752ddd9bdf1751296be9df7099ffeeddda74d6e5 Justin Bailey jgbailey@codeslower.com