fix rubocop and rspec

DePayFi · Oct 21, 2024 · 2d3e8a2 · 2d3e8a2
1 parent 2684bb0
commit 2d3e8a2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/lib/dhc/interceptors/default_timeout.rb b/lib/dhc/interceptors/default_timeout.rb
@@ -9,7 +9,7 @@ class DHC::DefaultTimeout < DHC::Interceptor
   TIMEOUT = 15 # seconds
 
   def before_init
-    request_options = (request.options || {})
+    request_options = request.options || {}
     request_options[:timeout] ||= timeout || TIMEOUT
     request_options[:connecttimeout] ||= connecttimeout || CONNECTTIMEOUT
   end

diff --git a/lib/dhc/interceptors/throttle.rb b/lib/dhc/interceptors/throttle.rb
@@ -45,9 +45,8 @@ def provider
   end
 
   def track?
-    (options.dig(:remaining) && [options.dig(:track), response.headers].none?(&:blank?) ||
+    options.dig(:remaining) && [options.dig(:track), response.headers].none?(&:blank?) ||
       options.dig(:track).present?
-    )
   end
 
   def break?

diff --git a/spec/interceptors/logging/main_spec.rb b/spec/interceptors/logging/main_spec.rb
@@ -17,7 +17,7 @@
       %r{Before DHC request <\d+> GET http://depay.fi at \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2} Params={} Headers={.*?}}
     )
     expect(logger).to have_received(:info).once.with(
-      %r{After DHC response for request <\d+> GET http://depay.fi at \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2} Time=0ms URL=http://depay.fi:80/}
+      %r{After DHC response for request <\d+> GET http://depay.fi at \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2} Time=\d+(\.\d+)?ms URL=http://depay.fi:80/}
     )
   end
 
@@ -27,10 +27,10 @@
     it 'does log the source if provided as option' do
       DHC.get('http://depay.fi', source: source)
       expect(logger).to have_received(:info).once.with(
-        %r{Before DHC request <\d+> GET http://depay.fi at \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2} Params={} Headers={.*?} \nCalled from #{source}}
+        %r{Before DHC request <\d+> GET http://depay.fi at \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2} Params={} Headers={.*?} \nCalled from #{Regexp.escape(source)}}
       )
       expect(logger).to have_received(:info).once.with(
-        %r{After DHC response for request <\d+> GET http://depay.fi at \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2} Time=0ms URL=http://depay.fi:80/ \nCalled from #{source}}
+        %r{After DHC response for request <\d+> GET http://depay.fi at \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2} Time=\d+(\.\d+)?ms URL=http://depay.fi:80/ \nCalled from #{Regexp.escape(source)}}
       )
     end
   end

diff --git a/spec/response/data_spec.rb b/spec/response/data_spec.rb
@@ -14,15 +14,15 @@
       let(:body) { { some_key: { nested: value } } }
 
       it 'makes data from response body available' do
-        expect(response.data.dig("some_key", "nested")).to eq value
+        expect(response.data.dig('some_key', 'nested')).to eq value
       end
 
       it 'can be converted to json with the as_json method' do
         expect(response.data.as_json).to eq body.as_json
       end
 
       it 'returns nil when data is not available' do
-        expect(response.data["something"]).to be_nil
+        expect(response.data['something']).to be_nil
       end
     end
 
@@ -34,7 +34,7 @@
       end
 
       it 'makes item data from response body available' do
-        expect(response.data.dig(0, "some_key", "nested")).to eq value
+        expect(response.data.dig(0, 'some_key', 'nested')).to eq value
       end
     end
   end
@@ -57,7 +57,7 @@
         DHC.get('http://listings')
       rescue DHC::Error => error
         expect(
-          error.response.request.response.data.dig("meta", "errors").detect { |item| item["code"] == 2000 }['msg']
+          error.response.request.response.data.dig('meta', 'errors').detect { |item| item['code'] == 2000 }['msg']
         ).to eq 'I like to hide error messages (this is meta).'
       end
     end