summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-08-11 13:50:40 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2016-08-11 13:50:40 -0700
commit09d36b317feb91b53092601e7010dbbbf00fab5d (patch)
treebbc7c816695de028bafc82dbb8f5fd5cd5e7b7c6
parent01211298359487b5a18657c8b289efc8eeeb13cd (diff)
downloadchef-lcg/keepalives-again-again.tar.gz
okay i really, really hate ruby 2.1 nowlcg/keepalives-again-again
this is reaching ruby 1.8.7-levels of pissing me off Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--.rubocop.yml1
-rw-r--r--spec/unit/http/basic_client_spec.rb4
2 files changed, 2 insertions, 3 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 2379a7b0a3..3c2a48e548 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,4 @@
AllCops:
- TargetRubyVersion: 2.2
Exclude:
- "spec/data/**/*"
- "vendor/**/*"
diff --git a/spec/unit/http/basic_client_spec.rb b/spec/unit/http/basic_client_spec.rb
index 79fd4ec042..0def00a220 100644
--- a/spec/unit/http/basic_client_spec.rb
+++ b/spec/unit/http/basic_client_spec.rb
@@ -33,7 +33,7 @@ describe "HTTP Connection" do
it "calls .start when doing keepalives" do
basic_client = Chef::HTTP::BasicClient.new(uri, keepalives: true)
expect(basic_client).to receive(:configure_ssl)
- net_http_mock = instance_double(Net::HTTP, proxy_address: nil, "proxy_port=": nil, "read_timeout=": nil, "open_timeout=": nil)
+ net_http_mock = instance_double(Net::HTTP, proxy_address: nil, "proxy_port=" => nil, "read_timeout=" => nil, "open_timeout=" => nil)
expect(net_http_mock).to receive(:start).and_return(net_http_mock)
expect(Net::HTTP).to receive(:new).and_return(net_http_mock)
expect(basic_client.http_client).to eql(net_http_mock)
@@ -42,7 +42,7 @@ describe "HTTP Connection" do
it "does not call .start when not doing keepalives" do
basic_client = Chef::HTTP::BasicClient.new(uri)
expect(basic_client).to receive(:configure_ssl)
- net_http_mock = instance_double(Net::HTTP, proxy_address: nil, "proxy_port=": nil, "read_timeout=": nil, "open_timeout=": nil)
+ net_http_mock = instance_double(Net::HTTP, proxy_address: nil, "proxy_port=" => nil, "read_timeout=" => nil, "open_timeout=" => nil)
expect(net_http_mock).not_to receive(:start)
expect(Net::HTTP).to receive(:new).and_return(net_http_mock)
expect(basic_client.http_client).to eql(net_http_mock)