fix issues rubocop couldn't

Author: keelerm84

contract-tests/service.rb

@@ -58,8 +58,8 @@
     last_event_id: opts[:lastEventId],
     read_timeout: opts[:readTimeoutMs].nil? ? nil : (opts[:readTimeoutMs].to_f / 1000),
     reconnect_time: opts[:initialDelayMs].nil? ? nil : (opts[:initialDelayMs].to_f / 1000)
-  ) do |sse|
-    entity = StreamEntity.new(sse, tag, callbackUrl)
+  ) do |client|
+    entity = StreamEntity.new(client, tag, callbackUrl)
   end
 
   streams[streamId] = entity

spec/client_spec.rb

@@ -112,7 +112,7 @@ def send_stream_content(res, content, keep_open:)
         c.on_event { |event| event_sink << event }
       end
 
-      with_client(client) do |client|
+      with_client(client) do |c|
         expect(event_sink.pop).to eq(simple_event_1)
         expect(event_sink.pop).to eq(simple_event_2)
       end
@@ -133,9 +133,9 @@ def send_stream_content(res, content, keep_open:)
         c.on_error { |error| error_sink << error }
       end
 
-      with_client(client) do |client|
+      with_client(client) do |c|
         event_sink.pop  # wait till we have definitely started reading the stream
-        client.close
+        c.close
         sleep 0.25  # there's no way to really know when the stream thread has finished
         expect(error_sink.empty?).to be true
       end
@@ -164,7 +164,7 @@ def send_stream_content(res, content, keep_open:)
         c.on_error { |error| error_sink << error }
       end
 
-      with_client(client) do |client|
+      with_client(client) do |c|
         expect(event_sink.pop).to eq(simple_event_1)
         expect(error_sink.pop).to eq(SSE::Errors::HTTPStatusError.new(500, "sorry"))
         expect(attempt).to eq 2
@@ -195,7 +195,7 @@ def send_stream_content(res, content, keep_open:)
         c.on_error { |error| error_sink << error }
       end
 
-      with_client(client) do |client|
+      with_client(client) do |c|
         expect(event_sink.pop).to eq(simple_event_1)
         expect(error_sink.pop).to eq(SSE::Errors::HTTPContentTypeError.new("text/plain"))
         expect(attempt).to eq 2
@@ -220,7 +220,7 @@ def send_stream_content(res, content, keep_open:)
         c.on_event { |event| event_sink << event }
       end
 
-      with_client(client) do |client|
+      with_client(client) do |c|
         expect(event_sink.pop).to eq(simple_event_1)
         expect(attempt).to eq 2
       end
@@ -241,7 +241,7 @@ def send_stream_content(res, content, keep_open:)
         c.on_event { |event| event_sink << event }
       end
 
-      with_client(client) do |client|
+      with_client(client) do |c|
         expect(event_sink.pop).to eq(simple_event_1)
         expect(event_sink.pop).to eq(simple_event_2)
         expect(attempt).to eq 2
@@ -268,7 +268,7 @@ def send_stream_content(res, content, keep_open:)
         c.on_event { |event| event_sink << event }
       end
 
-      with_client(client) do |client|
+      with_client(client) do |c|
         req1 = requests.pop
         req2 = requests.pop
         expect(req2.header["last-event-id"]).to eq([ "a" ])
@@ -294,7 +294,7 @@ def send_stream_content(res, content, keep_open:)
         c.on_event { |event| event_sink << event }
       end
 
-      with_client(client) do |client|
+      with_client(client) do |c|
         last_interval = nil
         max_requests.times do |i|
           expect(event_sink.pop).to eq(simple_event_1)
@@ -334,7 +334,7 @@ def send_stream_content(res, content, keep_open:)
         c.on_event { |event| event_sink << event }
       end
 
-      with_client(client) do |client|
+      with_client(client) do |c|
         last_interval = nil
         max_requests.times do |i|
           expect(event_sink.pop).to eq(simple_event_1)
@@ -369,7 +369,7 @@ def send_stream_content(res, content, keep_open:)
         c.on_event { |event| event_sink << event }
       end
 
-      with_client(client) do |client|
+      with_client(client) do |c|
         expect(event_sink.pop).to eq(simple_event_1)
         interval = request_times[1] - request_times[0]
         expect(interval).to be < 0.5
@@ -389,7 +389,7 @@ def send_stream_content(res, content, keep_open:)
           c.on_event { |event| event_sink << event }
         end
 
-        with_client(client) do |client|
+        with_client(client) do |c|
           expect(event_sink.pop).to eq(simple_event_1)
           expect(proxy.request_count).to eq(1)
         end
@@ -424,7 +424,7 @@ def send_stream_content(res, content, keep_open:)
         c.on_event { |event| event_sink << event }
       end
 
-      with_client(client) do |client|
+      with_client(client) do |c|
         4.times {
           expect(event_sink.pop).to eq(simple_event_1)
         }