1 files changed, 24 insertions, 39 deletions
diff --git a/test/unit/test_request.rb b/test/unit/test_request.rb
index 4943dc0..a57cbcd 100644
--- a/test/unit/test_request.rb
+++ b/test/unit/test_request.rb
@@ -30,47 +30,43 @@ class RequestTest < Test::Unit::TestCase
    def test_options
      client = MockRequest.new("OPTIONS * HTTP/1.1\r\n" \
                               "Host: foo\r\n\r\n")
-    res = env = nil
-    assert_nothing_raised { env = @request.read(client) }
+    env = @request.read(client)
      assert_equal '', env['REQUEST_PATH']
      assert_equal '', env['PATH_INFO']
      assert_equal '*', env['REQUEST_URI']
-    assert_nothing_raised { res = @lint.call(env) }
+    res = @lint.call(env)
    end
  
    def test_absolute_uri_with_query
      client = MockRequest.new("GET http://e:3/x?y=z HTTP/1.1\r\n" \
                               "Host: foo\r\n\r\n")
-    res = env = nil
-    assert_nothing_raised { env = @request.read(client) }
+    env = @request.read(client)
      assert_equal '/x', env['REQUEST_PATH']
      assert_equal '/x', env['PATH_INFO']
      assert_equal 'y=z', env['QUERY_STRING']
-    assert_nothing_raised { res = @lint.call(env) }
+    res = @lint.call(env)
    end
  
    def test_absolute_uri_with_fragment
      client = MockRequest.new("GET http://e:3/x#frag HTTP/1.1\r\n" \
                               "Host: foo\r\n\r\n")
-    res = env = nil
-    assert_nothing_raised { env = @request.read(client) }
+    env = @request.read(client)
      assert_equal '/x', env['REQUEST_PATH']
      assert_equal '/x', env['PATH_INFO']
      assert_equal '', env['QUERY_STRING']
      assert_equal 'frag', env['FRAGMENT']
-    assert_nothing_raised { res = @lint.call(env) }
+    res = @lint.call(env)
    end
  
    def test_absolute_uri_with_query_and_fragment
      client = MockRequest.new("GET http://e:3/x?a=b#frag HTTP/1.1\r\n" \
                               "Host: foo\r\n\r\n")
-    res = env = nil
-    assert_nothing_raised { env = @request.read(client) }
+    env = @request.read(client)
      assert_equal '/x', env['REQUEST_PATH']
      assert_equal '/x', env['PATH_INFO']
      assert_equal 'a=b', env['QUERY_STRING']
      assert_equal 'frag', env['FRAGMENT']
-    assert_nothing_raised { res = @lint.call(env) }
+    res = @lint.call(env)
    end
  
    def test_absolute_uri_unsupported_schemes
@@ -82,48 +78,43 @@ class RequestTest < Test::Unit::TestCase
    end
  
    def test_x_forwarded_proto_https
-    res = env = nil
      client = MockRequest.new("GET / HTTP/1.1\r\n" \
                               "X-Forwarded-Proto: https\r\n" \
                               "Host: foo\r\n\r\n")
-    assert_nothing_raised { env = @request.read(client) }
+    env = @request.read(client)
      assert_equal "https", env['rack.url_scheme']
-    assert_nothing_raised { res = @lint.call(env) }
+    res = @lint.call(env)
    end
  
    def test_x_forwarded_proto_http
-    res = env = nil
      client = MockRequest.new("GET / HTTP/1.1\r\n" \
                               "X-Forwarded-Proto: http\r\n" \
                               "Host: foo\r\n\r\n")
-    assert_nothing_raised { env = @request.read(client) }
+    env = @request.read(client)
      assert_equal "http", env['rack.url_scheme']
-    assert_nothing_raised { res = @lint.call(env) }
+    res = @lint.call(env)
    end
  
    def test_x_forwarded_proto_invalid
-    res = env = nil
      client = MockRequest.new("GET / HTTP/1.1\r\n" \
                               "X-Forwarded-Proto: ftp\r\n" \
                               "Host: foo\r\n\r\n")
-    assert_nothing_raised { env = @request.read(client) }
+    env = @request.read(client)
      assert_equal "http", env['rack.url_scheme']
-    assert_nothing_raised { res = @lint.call(env) }
+    res = @lint.call(env)
    end
  
    def test_rack_lint_get
      client = MockRequest.new("GET / HTTP/1.1\r\nHost: foo\r\n\r\n")
-    res = env = nil
-    assert_nothing_raised { env = @request.read(client) }
+    env = @request.read(client)
      assert_equal "http", env['rack.url_scheme']
      assert_equal '127.0.0.1', env['REMOTE_ADDR']
-    assert_nothing_raised { res = @lint.call(env) }
+    res = @lint.call(env)
    end
  
    def test_no_content_stringio
      client = MockRequest.new("GET / HTTP/1.1\r\nHost: foo\r\n\r\n")
-    env = nil
-    assert_nothing_raised { env = @request.read(client) }
+    env = @request.read(client)
      assert_equal StringIO, env['rack.input'].class
    end
  
@@ -131,8 +122,7 @@ class RequestTest < Test::Unit::TestCase
      client = MockRequest.new("PUT / HTTP/1.1\r\n" \
                               "Content-Length: 0\r\n" \
                               "Host: foo\r\n\r\n")
-    env = nil
-    assert_nothing_raised { env = @request.read(client) }
+    env = @request.read(client)
      assert_equal StringIO, env['rack.input'].class
    end
  
@@ -140,8 +130,7 @@ class RequestTest < Test::Unit::TestCase
      client = MockRequest.new("PUT / HTTP/1.1\r\n" \
                               "Content-Length: 1\r\n" \
                               "Host: foo\r\n\r\n")
-    env = nil
-    assert_nothing_raised { env = @request.read(client) }
+    env = @request.read(client)
      assert_equal Unicorn::TeeInput, env['rack.input'].class
    end
  
@@ -152,10 +141,9 @@ class RequestTest < Test::Unit::TestCase
        "Content-Length: 5\r\n" \
        "\r\n" \
        "abcde")
-    res = env = nil
-    assert_nothing_raised { env = @request.read(client) }
+    env = @request.read(client)
      assert ! env.include?(:http_body)
-    assert_nothing_raised { res = @lint.call(env) }
+    res = @lint.call(env)
    end
  
    def test_rack_lint_big_put
@@ -179,8 +167,7 @@ class RequestTest < Test::Unit::TestCase
        "\r\n")
      count.times { assert_equal bs, client.syswrite(buf) }
      assert_equal 0, client.sysseek(0)
-    res = env = nil
-    assert_nothing_raised { env = @request.read(client) }
+    env = @request.read(client)
      assert ! env.include?(:http_body)
      assert_equal length, env['rack.input'].size
      count.times {
@@ -189,9 +176,7 @@ class RequestTest < Test::Unit::TestCase
        assert_equal buf, tmp
      }
      assert_nil env['rack.input'].read(bs)
-    assert_nothing_raised { env['rack.input'].rewind }
-    assert_nothing_raised { res = @lint.call(env) }
+    env['rack.input'].rewind
+    res = @lint.call(env)
    end
-
  end
-