From 92c4ecd9ca36057be884514cafa9751ec8e33e55 Mon Sep 17 00:00:00 2001 From: Subin Walter Date: Mon, 4 Nov 2019 15:02:35 +0530 Subject: [PATCH 1/3] remove hard-coded faraday version --- spec/bitbucket_rest_api/request_spec.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/bitbucket_rest_api/request_spec.rb b/spec/bitbucket_rest_api/request_spec.rb index a84c2c2..20f2113 100644 --- a/spec/bitbucket_rest_api/request_spec.rb +++ b/spec/bitbucket_rest_api/request_spec.rb @@ -22,7 +22,7 @@ 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer 12345', - 'User-Agent' => 'Faraday v0.9.2' + 'User-Agent' => "Faraday v#{Faraday::VERSION}" }) fake_api.new.request(:get, '/1.0/endpoint', {}, {}) @@ -35,7 +35,7 @@ 'Accept' => '*/*', 'Content-Type'=>'application/x-www-form-urlencoded', 'Authorization' => 'Bearer 12345', - 'User-Agent' => 'Faraday v0.9.2' + 'User-Agent' => "Faraday v#{Faraday::VERSION}" }) fake_api.new.request(:put, '/1.0/endpoint', { 'data' => { 'key' => 'value'} }, {}) @@ -48,7 +48,7 @@ 'Accept' => '*/*', 'Content-Type'=>'application/x-www-form-urlencoded', 'Authorization' => 'Bearer 12345', - 'User-Agent' => 'Faraday v0.9.2' + 'User-Agent' => "Faraday v#{Faraday::VERSION}" }) fake_api.new.request(:patch, '/1.0/endpoint', { 'data' => { 'key' => 'value'} }, {}) @@ -59,7 +59,7 @@ with(:headers => { 'Accept' => '*/*', 'Authorization' => 'Bearer 12345', - 'User-Agent' => 'Faraday v0.9.2' + 'User-Agent' => "Faraday v#{Faraday::VERSION}" }) fake_api.new.request(:delete, '/1.0/endpoint', {}, {}) end @@ -71,7 +71,7 @@ 'Accept' => '*/*', 'Content-Type'=>'application/x-www-form-urlencoded', 'Authorization' => 'Bearer 12345', - 'User-Agent' => 'Faraday v0.9.2' + 'User-Agent' => "Faraday v#{Faraday::VERSION}" }) fake_api.new.request(:post, '/1.0/endpoint', { 'data' => { 'key' => 'value'} }, {}) From e75a5c3023e17409bcd9143fe6013705d3cc38d4 Mon Sep 17 00:00:00 2001 From: Subin Walter Date: Mon, 4 Nov 2019 15:03:52 +0530 Subject: [PATCH 2/3] don't stub just define methods in class new --- spec/bitbucket_rest_api/request_spec.rb | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/spec/bitbucket_rest_api/request_spec.rb b/spec/bitbucket_rest_api/request_spec.rb index 20f2113..10b4085 100644 --- a/spec/bitbucket_rest_api/request_spec.rb +++ b/spec/bitbucket_rest_api/request_spec.rb @@ -2,8 +2,19 @@ require 'bitbucket_rest_api/request' describe BitBucket::Request do - let(:fake_api) { (Class.new { include BitBucket::Request })} - let(:faraday_connection) { Faraday.new(:url => 'https://api.bitbucket.org') } + let(:fake_api) do + Class.new do + include BitBucket::Request + + def connection(*args) + Faraday.new(:url => 'https://api.bitbucket.org') + end + + def new_access_token + "12345" + end + end + end describe "request" do it "raises an ArgumentError if an unsupported HTTP verb is used" do @@ -11,11 +22,6 @@ end context "with a connection" do - before do - (fake_api).any_instance.stubs(:connection).returns(faraday_connection) - (fake_api).any_instance.stubs(:new_access_token).returns("12345") - end - it "supports get" do stub_request(:get, "https://api.bitbucket.org/1.0/endpoint"). with(:headers => { From f4b880dd31559cf2b7a4209b0de022d92cea8e43 Mon Sep 17 00:00:00 2001 From: Subin Walter Date: Mon, 4 Nov 2019 15:05:12 +0530 Subject: [PATCH 3/3] remove mocha --- bitbucket_rest_api.gemspec | 1 - spec/spec_helper.rb | 1 - 2 files changed, 2 deletions(-) diff --git a/bitbucket_rest_api.gemspec b/bitbucket_rest_api.gemspec index 81204bd..ab8312b 100644 --- a/bitbucket_rest_api.gemspec +++ b/bitbucket_rest_api.gemspec @@ -30,5 +30,4 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'rake' gem.add_development_dependency 'bundler' gem.add_development_dependency 'pry-byebug' - gem.add_development_dependency 'mocha' end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 27cfe60..18a9777 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -10,7 +10,6 @@ RSpec.configure do |config| config.expect_with :rspec do |expectations| expectations.include_chain_clauses_in_custom_matcher_descriptions = true - config.mock_with :mocha end config.mock_with :rspec do |mocks|