Merge pull request #680 from vipulnsward/cleanup_tests

Cleanup unused variables

test/integration_helper.rb

@@ -60,7 +60,7 @@ module IntegrationHelper
     def alive?
       3.times { get('/ping') }
       true
-    rescue Errno::ECONNREFUSED, Errno::ECONNRESET, EOFError, SystemCallError, OpenURI::HTTPError, Timeout::Error => error
+    rescue Errno::ECONNREFUSED, Errno::ECONNRESET, EOFError, SystemCallError, OpenURI::HTTPError, Timeout::Error
       false
     end
 

test/request_test.rb

@@ -38,7 +38,7 @@ class RequestTest < Test::Unit::TestCase
       'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
       'rack.input' => StringIO.new('foo=bar')
     )
-    params = Sinatra::Base.new!.send(:indifferent_hash).replace(request.params)
+    Sinatra::Base.new!.send(:indifferent_hash).replace(request.params)
     dumped = Marshal.dump(request.params)
     assert_equal 'bar', Marshal.load(dumped)['foo']
   end

test/streaming_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
 class StreamingTest < Test::Unit::TestCase
   Stream = Sinatra::Helpers::Stream
 
-  it 'returns the concatinated body' do
+  it 'returns the concatenated body' do
     mock_app do
       get('/') do
         stream do |out|
@@ -41,18 +41,18 @@ class StreamingTest < Test::Unit::TestCase
   it 'calls the callback after it is done' do
     step   = 0
     final  = 0
-    stream = Stream.new { |o| 10.times { step += 1 }}
+    stream = Stream.new { |_| 10.times { step += 1 }}
     stream.callback { final = step }
-    stream.each { |str| }
+    stream.each {|_|}
     assert_equal 10, final
   end
 
   it 'does not trigger the callback if close is set to :keep_open' do
     step   = 0
     final  = 0
-    stream = Stream.new(Stream, :keep_open) { |o| 10.times { step += 1 } }
+    stream = Stream.new(Stream, :keep_open) { |_| 10.times { step += 1 } }
     stream.callback { final = step }
-    stream.each { |str| }
+    stream.each {|_|}
     assert_equal 0, final
   end
 
@@ -61,7 +61,7 @@ class StreamingTest < Test::Unit::TestCase
     stream = Stream.new { }
     stream.callback { a = true }
     stream.callback { b = true }
-    stream.each { |str| }
+    stream.each {|_| }
     assert a, 'should trigger first callback'
     assert b, 'should trigger second callback'
   end
@@ -110,7 +110,7 @@ class StreamingTest < Test::Unit::TestCase
 
   it 'does not trigger an infinite loop if you call close in a callback' do
     stream = Stream.new { |out| out.callback { out.close }}
-    stream.each { |str| }
+    stream.each { |_| }
   end
 
   it 'gives access to route specific params' do