From 9987b0c240bf77efcce7c59a03f1646a379fa0cb Mon Sep 17 00:00:00 2001 From: Andy Brody Date: Mon, 12 Sep 2016 01:46:38 -0400 Subject: [PATCH] Fix up rubocop and jruby tests. --- .rubocop.yml | 3 +++ spec/unit/request_spec.rb | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 4a11243..e7bedfe 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,3 +1,6 @@ --- +AllCops: + TargetRubyVersion: 2.1 + inherit_from: - .rubocop-disables.yml diff --git a/spec/unit/request_spec.rb b/spec/unit/request_spec.rb index b5a2a9c..bdeb1bb 100644 --- a/spec/unit/request_spec.rb +++ b/spec/unit/request_spec.rb @@ -839,7 +839,8 @@ describe RestClient::Request, :include_helpers do @request.send(:transmit, @uri, 'req', 'payload') end - it "should not set the ssl_ciphers if set to nil" do + it "should not set the ssl_ciphers if set to nil", + :unless => RestClient::Request::WeakDefaultCiphers.include?(OpenSSL::SSL::SSLContext::DEFAULT_PARAMS.fetch(:ciphers)) do @request = RestClient::Request.new( :method => :put, :url => 'https://some/resource',