Merge pull request #397 from raimondasv/faraday_0_16

Bump faraday version to 0.15+

Author: pboling

gemfiles/jruby_1.7.gemfile

@@ -1,11 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '~> 0.9.2'
-gem 'jwt', '< 1.5.2'
-gem 'mime-types', '~> 1.25'
-gem 'rack', '~> 1.2'
-gem 'rest-client', '~> 1.6.0'
-
 group :test do
   # Some changes to defaults make older version config incompatible with newer version config
   # gem "rubocop", "~> 0.41.2"

oauth2.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'oauth2/version'
 
 Gem::Specification.new do |spec|
-  spec.add_dependency 'faraday', ['>= 0.8', '< 0.15.0']
+  spec.add_dependency 'faraday', ['>= 0.8', '< 0.16.0']
   spec.add_dependency 'jwt', ['>= 1.0', '< 3.0']
   spec.add_dependency 'multi_json', '~> 1.3'
   spec.add_dependency 'multi_xml', '~> 0.5'

spec/oauth2/client_spec.rb

@@ -248,7 +248,7 @@
           subject.request(:get, '/success')
         end
 
-        expect(output).to include 'INFO -- : get https://api.example.com/success', 'INFO -- : get https://api.example.com/success'
+        expect(output).to include 'INFO -- request: GET https://api.example.com/success'
       end
     end