jira-ruby 3.0.0.beta1 → 3.0.0

data/spec/integration/user_spec.rb

@@ -40,14 +40,23 @@ describe JIRA::Resource::User do
       end
 
       before do
+        user_factory = double('UserFactory')
+
         allow(client).to receive(:get)
-          .with('/rest/api/2/users/search?username=_&maxResults=1000') { OpenStruct.new(body: '["User1"]') }
-        allow(client).to receive_message_chain(:User, :build).with('users') { [] }
+          .with('/rest/api/2/users/search?username=_&maxResults=1000')
+          .and_return(double(body: '["User1"]'))
+        allow(client).to receive(:User).and_return(user_factory)
+        allow(user_factory).to receive(:build).with('users').and_return([])
       end
 
       it 'gets users with maxResults of 1000' do
+        user_factory = double('UserFactory')
+
         expect(client).to receive(:get).with('/rest/api/2/users/search?username=_&maxResults=1000')
-        expect(client).to receive_message_chain(:User, :build).with('User1')
+                                       .and_return(double(body: '["User1"]'))
+        expect(client).to receive(:User).and_return(user_factory)
+        expect(user_factory).to receive(:build).with('User1')
+
         described_class.all(client)
       end
     end

data/spec/integration/watcher_spec.rb

@@ -46,15 +46,19 @@ describe JIRA::Resource::Watcher do
 
       it 'returnses all the watchers' do
         issue = client.Issue.find('10002')
-        watchers = client.Watcher.all(options = { issue: })
+        watchers = client.Watcher.all({ issue: })
         expect(watchers.length).to eq(1)
       end
 
       it 'adds a watcher' do
         issue = client.Issue.find('10002')
-        watcher = described_class.new(client, issue:)
+        watcher = described_class.new(client, issue: issue)
         user_id = 'tester'
+
         watcher.save!(user_id)
+
+        expect(WebMock).to have_requested(:post, "#{site_url}/jira/rest/api/2/issue/10002/watchers")
+          .with(body: '"tester"')
       end
     end
   end

data/spec/integration/{webhook.rb → webhook_spec.rb}

@@ -9,7 +9,7 @@ describe JIRA::Resource::Webhook do
 
     let(:expected_attributes) do
       { 'name' => 'from API', 'url' => 'http://localhost:3000/webhooks/1', 'excludeBody' => false,
-'filters' => { 'issue-related-events-section' => '' }, 'events' => [], 'enabled' => true, 'self' => 'http://localhost:2990/jira/rest/webhooks/1.0/webhook/2', 'lastUpdatedUser' => 'admin', 'lastUpdatedDisplayName' => 'admin', 'lastUpdated' => 1_453_306_520_188 }
+        'filters' => { 'issue-related-events-section' => '' }, 'events' => [], 'enabled' => true, 'self' => 'http://localhost:2990/jira/rest/webhooks/1.0/webhook/2', 'lastUpdatedUser' => 'admin', 'lastUpdatedDisplayName' => 'admin', 'lastUpdated' => 1_453_306_520_188 }
     end
 
     let(:expected_collection_length) { 1 }
@@ -21,6 +21,13 @@ describe JIRA::Resource::Webhook do
     it 'returns a collection of components' do
       stub_request(:get, site_url + described_class.singular_path(client, key))
         .to_return(status: 200, body: get_mock_response('webhook/webhook.json'))
+
+      webhook = client.Webhook.find(key)
+
+      expect(webhook).to be_a described_class
+      expect(webhook.name).to eq 'from API'
+      expect(webhook.url).to eq '/jira/rest/webhooks/1.0/webhook/2'
+      expect(webhook.enabled).to be true
     end
   end
 end

data/spec/jira/base_factory_spec.rb

@@ -1,8 +1,17 @@
 require 'spec_helper'
 
 describe JIRA::BaseFactory do
-  class JIRA::Resource::FooFactory < JIRA::BaseFactory; end
-  class JIRA::Resource::Foo; end
+  module JIRA
+    module Resource
+      class FooFactory < JIRA::BaseFactory; end
+    end
+  end
+
+  module JIRA
+    module Resource
+      class Foo; end
+    end
+  end
 
   subject       { JIRA::Resource::FooFactory.new(client) }
 

data/spec/jira/base_spec.rb

@@ -4,32 +4,44 @@ describe JIRA::Base do
   class JIRADelegation < SimpleDelegator # :nodoc:
   end
 
-  class JIRA::Resource::Deadbeef < JIRA::Base # :nodoc:
-  end
-
-  class JIRA::Resource::HasOneExample < JIRA::Base # :nodoc:
-    has_one :deadbeef
-    has_one :muffin, class: JIRA::Resource::Deadbeef
-    has_one :brunchmuffin, class: JIRA::Resource::Deadbeef,
-                           nested_under: 'nested'
-    has_one :breakfastscone,
-            class: JIRA::Resource::Deadbeef,
-            nested_under: %w[nested breakfastscone]
-    has_one :irregularly_named_thing,
-            class: JIRA::Resource::Deadbeef,
-            attribute_key: 'irregularlyNamedThing'
-  end
-
-  class JIRA::Resource::HasManyExample < JIRA::Base # :nodoc:
-    has_many :deadbeefs
-    has_many :brunchmuffins, class: JIRA::Resource::Deadbeef,
-                             nested_under: 'nested'
-    has_many :breakfastscones,
-             class: JIRA::Resource::Deadbeef,
-             nested_under: %w[nested breakfastscone]
-    has_many :irregularly_named_things,
-             class: JIRA::Resource::Deadbeef,
-             attribute_key: 'irregularlyNamedThings'
+  module JIRA
+    module Resource
+      class Deadbeef < JIRA::Base # :nodoc:
+      end
+    end
+  end
+
+  module JIRA
+    module Resource
+      class HasOneExample < JIRA::Base # :nodoc:
+        has_one :deadbeef
+        has_one :muffin, class: JIRA::Resource::Deadbeef
+        has_one :brunchmuffin, class: JIRA::Resource::Deadbeef,
+                               nested_under: 'nested'
+        has_one :breakfastscone,
+                class: JIRA::Resource::Deadbeef,
+                nested_under: %w[nested breakfastscone]
+        has_one :irregularly_named_thing,
+                class: JIRA::Resource::Deadbeef,
+                attribute_key: 'irregularlyNamedThing'
+      end
+    end
+  end
+
+  module JIRA
+    module Resource
+      class HasManyExample < JIRA::Base # :nodoc:
+        has_many :deadbeefs
+        has_many :brunchmuffins, class: JIRA::Resource::Deadbeef,
+                                 nested_under: 'nested'
+        has_many :breakfastscones,
+                 class: JIRA::Resource::Deadbeef,
+                 nested_under: %w[nested breakfastscone]
+        has_many :irregularly_named_things,
+                 class: JIRA::Resource::Deadbeef,
+                 attribute_key: 'irregularlyNamedThings'
+      end
+    end
   end
 
   subject { JIRA::Resource::Deadbeef.new(client, attrs:) }
@@ -42,7 +54,7 @@ describe JIRA::Base do
   describe '#respond_to?' do
     describe 'when decorated using SimpleDelegator' do
       it 'responds to client' do
-        expect(decorated.respond_to?(:client)).to eq(true)
+        expect(decorated.respond_to?(:client)).to be(true)
       end
 
       it 'does not raise an error' do
@@ -69,23 +81,23 @@ describe JIRA::Base do
     expect(first.class).to eq(JIRA::Resource::Deadbeef)
     expect(first.attrs['self']).to eq('http://deadbeef/')
     expect(first.attrs['id']).to eq('98765')
-    expect(first.expanded?).to be_falsey
+    expect(first).not_to be_expanded
   end
 
   it 'finds a deadbeef by id' do
-    response = instance_double('Response', body: '{"self":"http://deadbeef/","id":"98765"}')
+    response = instance_double(Response, body: '{"self":"http://deadbeef/","id":"98765"}')
     expect(client).to receive(:get).with('/jira/rest/api/2/deadbeef/98765').and_return(response)
     expect(JIRA::Resource::Deadbeef).to receive(:collection_path).and_return('/jira/rest/api/2/deadbeef')
     deadbeef = JIRA::Resource::Deadbeef.find(client, '98765')
     expect(deadbeef.client).to eq(client)
     expect(deadbeef.attrs['self']).to eq('http://deadbeef/')
     expect(deadbeef.attrs['id']).to eq('98765')
-    expect(deadbeef.expanded?).to be_truthy
+    expect(deadbeef).to be_expanded
   end
 
   it 'finds a deadbeef containing changelog by id' do
     response = instance_double(
-      'Response',
+      Response,
       body: '{"self":"http://deadbeef/","id":"98765","changelog":{"histories":[]}}'
     )
     expect(client).to receive(:get).with('/jira/rest/api/2/deadbeef/98765?expand=changelog').and_return(response)
@@ -96,13 +108,13 @@ describe JIRA::Base do
     expect(deadbeef.client).to eq(client)
     expect(deadbeef.attrs['self']).to eq('http://deadbeef/')
     expect(deadbeef.attrs['id']).to eq('98765')
-    expect(deadbeef.expanded?).to be_truthy
+    expect(deadbeef).to be_expanded
     expect(deadbeef.attrs['changelog']['histories']).to eq([])
   end
 
   it 'builds a deadbeef' do
     deadbeef = JIRA::Resource::Deadbeef.build(client, 'id' => '98765')
-    expect(deadbeef.expanded?).to be_falsey
+    expect(deadbeef).not_to be_expanded
 
     expect(deadbeef.client).to eq(client)
     expect(deadbeef.attrs['id']).to eq('98765')
@@ -172,19 +184,19 @@ describe JIRA::Base do
 
     describe 'not cached' do
       before do
-        response = instance_double('Response', body: '{"self":"http://deadbeef/","id":"98765"}')
+        response = instance_double(Response, body: '{"self":"http://deadbeef/","id":"98765"}')
         expect(client).to receive(:get).with('/jira/rest/api/2/deadbeef/98765').and_return(response)
         expect(JIRA::Resource::Deadbeef).to receive(:collection_path).and_return('/jira/rest/api/2/deadbeef')
       end
 
       it 'sets expanded to true after fetch' do
-        expect(subject.expanded?).to be_falsey
+        expect(subject).not_to be_expanded
         subject.fetch
-        expect(subject.expanded?).to be_truthy
+        expect(subject).to be_expanded
       end
 
       it 'performs a fetch' do
-        expect(subject.expanded?).to be_falsey
+        expect(subject).not_to be_expanded
         subject.fetch
         expect(subject.self).to eq('http://deadbeef/')
         expect(subject.id).to eq('98765')
@@ -193,6 +205,10 @@ describe JIRA::Base do
       it 'performs a fetch if already fetched and force flag is true' do
         subject.expanded = true
         subject.fetch(true)
+
+        expect(subject.self).to eq('http://deadbeef/')
+        expect(subject.id).to eq('98765')
+        expect(subject).to be_expanded
       end
     end
 
@@ -207,7 +223,7 @@ describe JIRA::Base do
     context "with expand parameter 'changelog'" do
       it "fetchs changelogs '" do
         response = instance_double(
-          'Response',
+          Response,
           body: '{"self":"http://deadbeef/","id":"98765","changelog":{"histories":[]}}'
         )
         expect(client).to receive(:get).with('/jira/rest/api/2/deadbeef/98765?expand=changelog').and_return(response)
@@ -233,7 +249,7 @@ describe JIRA::Base do
     end
 
     it 'POSTs a new record' do
-      response = instance_double('Response', body: '{"id":"123"}')
+      response = instance_double(Response, body: '{"id":"123"}')
       allow(subject).to receive(:new_record?).and_return(true)
       expect(client).to receive(:post).with('/foo/bar', '{"foo":"bar"}').and_return(response)
       expect(subject.save('foo' => 'bar')).to be_truthy
@@ -242,7 +258,7 @@ describe JIRA::Base do
     end
 
     it 'PUTs an existing record' do
-      response = instance_double('Response', body: nil)
+      response = instance_double(Response, body: nil)
       allow(subject).to receive(:new_record?).and_return(false)
       expect(client).to receive(:put).with('/foo/bar', '{"foo":"bar"}').and_return(response)
       expect(subject.save('foo' => 'bar')).to be_truthy
@@ -250,7 +266,7 @@ describe JIRA::Base do
     end
 
     it 'merges attrs on save' do
-      response = instance_double('Response', body: nil)
+      response = instance_double(Response, body: nil)
       expect(client).to receive(:post).with('/foo/bar', '{"foo":{"fum":"dum"}}').and_return(response)
       subject.attrs = { 'foo' => { 'bar' => 'baz' } }
       subject.save('foo' => { 'fum' => 'dum' })
@@ -259,7 +275,7 @@ describe JIRA::Base do
 
     it 'returns false when an invalid field is set' do
       # The JIRA REST API apparently ignores fields that you aren't allowed to set manually
-      response = instance_double('Response', body: '{"errorMessages":["blah"]}', status: 400)
+      response = instance_double(Response, body: '{"errorMessages":["blah"]}', status: 400)
       allow(subject).to receive(:new_record?).and_return(false)
       expect(client).to receive(:put).with('/foo/bar',
                                            '{"invalid_field":"foobar"}').and_raise(JIRA::HTTPError.new(response))
@@ -268,7 +284,7 @@ describe JIRA::Base do
 
     it 'returns false with exception details when non json response body (unauthorized)' do
       # Unauthorized requests return a non-json body. This makes sure we can handle non-json bodies on HTTPError
-      response = double('Response', body: 'totally invalid json', code: 401, message: 'Unauthorized')
+      response = double(Response, body: 'totally invalid json', code: 401, message: 'Unauthorized')
       expect(client).to receive(:post).with('/foo/bar', '{"foo":"bar"}').and_raise(JIRA::HTTPError.new(response))
       expect(subject.save('foo' => 'bar')).to be_falsey
       expect(subject.attrs['exception']['code']).to eq(401)
@@ -286,7 +302,7 @@ describe JIRA::Base do
     end
 
     it 'POSTs a new record' do
-      response = instance_double('Response', body: '{"id":"123"}')
+      response = instance_double(Response, body: '{"id":"123"}')
       allow(subject).to receive(:new_record?).and_return(true)
       expect(client).to receive(:post).with('/foo/bar', '{"foo":"bar"}').and_return(response)
       expect(subject.save!('foo' => 'bar')).to be_truthy
@@ -295,7 +311,7 @@ describe JIRA::Base do
     end
 
     it 'PUTs an existing record' do
-      response = instance_double('Response', body: nil)
+      response = instance_double(Response, body: nil)
       allow(subject).to receive(:new_record?).and_return(false)
       expect(client).to receive(:put).with('/foo/bar', '{"foo":"bar"}').and_return(response)
       expect(subject.save!('foo' => 'bar')).to be_truthy
@@ -303,7 +319,7 @@ describe JIRA::Base do
     end
 
     it 'throws an exception when an invalid field is set' do
-      response = instance_double('Response', body: '{"errorMessages":["blah"]}', status: 400)
+      response = instance_double(Response, body: '{"errorMessages":["blah"]}', status: 400)
       allow(subject).to receive(:new_record?).and_return(false)
       expect(client).to receive(:put).with('/foo/bar',
                                            '{"invalid_field":"foobar"}').and_raise(JIRA::HTTPError.new(response))
@@ -332,36 +348,39 @@ describe JIRA::Base do
     end
 
     it 'flags itself as deleted' do
-      expect(subject.deleted?).to be_falsey
+      expect(subject).not_to be_deleted
       subject.delete
-      expect(subject.deleted?).to be_truthy
+      expect(subject).to be_deleted
     end
 
     it 'sends a DELETE request' do
       subject.delete
+
+      expect(subject).to have_received(:url)
+      expect(subject).to be_deleted
     end
   end
 
   describe 'new_record?' do
     it 'returns true for new_record? when new object' do
       subject.attrs['id'] = nil
-      expect(subject.new_record?).to be_truthy
+      expect(subject).to be_new_record
     end
 
     it 'returns false for new_record? when id is set' do
       subject.attrs['id'] = '123'
-      expect(subject.new_record?).to be_falsey
+      expect(subject).not_to be_new_record
     end
   end
 
   describe 'has_errors?' do
     it 'returns true when the response contains errors' do
       attrs['errors'] = { 'invalid' => 'Field invalid' }
-      expect(subject.has_errors?).to be_truthy
+      expect(subject).to have_errors
     end
 
     it 'returns false when the response does not contain any errors' do
-      expect(subject.has_errors?).to be_falsey
+      expect(subject).not_to have_errors
     end
   end
 
@@ -441,14 +460,14 @@ describe JIRA::Base do
     subject { JIRA::Resource::Deadbeef.new(client, attrs: {}) }
 
     it 'sets the attrs from a response' do
-      response = instance_double('Response', body: '{"foo":"bar"}')
+      response = instance_double(Response, body: '{"foo":"bar"}')
 
       expect(subject.set_attrs_from_response(response)).to eq('foo' => 'bar')
       expect(subject.foo).to eq('bar')
     end
 
     it "doesn't clobber existing attrs not in response" do
-      response = instance_double('Response', body: '{"foo":"bar"}')
+      response = instance_double(Response, body: '{"foo":"bar"}')
 
       subject.attrs = { 'flum' => 'flar' }
       expect(subject.set_attrs_from_response(response)).to eq('foo' => 'bar')
@@ -457,7 +476,7 @@ describe JIRA::Base do
     end
 
     it 'handles nil response body' do
-      response = instance_double('Response', body: nil)
+      response = instance_double(Response, body: nil)
 
       subject.attrs = { 'flum' => 'flar' }
       expect(subject.set_attrs_from_response(response)).to be_nil
@@ -580,8 +599,12 @@ describe JIRA::Base do
   end
 
   describe 'belongs_to' do
-    class JIRA::Resource::BelongsToExample < JIRA::Base
-      belongs_to :deadbeef
+    module JIRA
+      module Resource
+        class BelongsToExample < JIRA::Base
+          belongs_to :deadbeef
+        end
+      end
     end
 
     subject { JIRA::Resource::BelongsToExample.new(client, attrs: { 'id' => '123' }, deadbeef:) }

data/spec/jira/client_spec.rb

@@ -62,18 +62,20 @@ RSpec.shared_examples 'Client Common Tests' do
 
   describe 'SSL client options' do
     context 'without certificate and key' do
-      subject { JIRA::Client.new(options) }
+      let(:basic_options) { { use_client_cert: true } }
 
-      let(:options) { { use_client_cert: true } }
-
-      it 'raises an ArgumentError' do
+      it 'raises an ArgumentError when cert is missing' do
         expect do
-          subject
+          JIRA::Client.new(basic_options)
         end.to raise_exception(ArgumentError,
                                'Options: :cert_path or :ssl_client_cert must be set when :use_client_cert is true')
-        options[:ssl_client_cert] = '<cert></cert>'
+      end
+
+      it 'raises an ArgumentError when key is missing' do
+        options_with_cert = basic_options.merge(ssl_client_cert: '<cert></cert>')
+
         expect do
-          subject
+          JIRA::Client.new(options_with_cert)
         end.to raise_exception(ArgumentError,
                                'Options: :key_path or :ssl_client_key must be set when :use_client_cert is true')
       end
@@ -97,7 +99,7 @@ RSpec.shared_examples 'HttpClient tests' do
 end
 
 RSpec.shared_examples 'OAuth Common Tests' do
-  include_examples 'Client Common Tests'
+  it_behaves_like 'Client Common Tests'
 
   specify { expect(subject.request_client).to be_a JIRA::OauthClient }
 
@@ -105,11 +107,11 @@ RSpec.shared_examples 'OAuth Common Tests' do
     token = double
     expect(OAuth::AccessToken).to receive(:new).with(subject.consumer, '', '').and_return(token)
 
-    expect(subject.authenticated?).to be_falsey
+    expect(subject).not_to be_authenticated
     access_token = subject.set_access_token('', '')
     expect(access_token).to eq(token)
     expect(subject.access_token).to eq(token)
-    expect(subject.authenticated?).to be_truthy
+    expect(subject).to be_authenticated
   end
 
   describe 'that call a oauth client' do
@@ -139,7 +141,7 @@ describe JIRA::Client do
   let(:headers) { { 'Accept' => 'application/json' } }
   let(:merged_headers) { headers.merge(content_type_header) }
 
-  context 'behaviour that applies to all client classes irrespective of authentication method' do
+  context 'without regard to the authentication method, this behaviour applies to all client classes' do
     it 'allows the overriding of some options' do
       client = described_class.new(consumer_key: 'foo', consumer_secret: 'bar', site: 'http://foo.com/')
       expect(client.options[:site]).to eq('http://foo.com/')
@@ -160,8 +162,8 @@ describe JIRA::Client do
         .to_return(status: 401, headers: {})
     end
 
-    include_examples 'Client Common Tests'
-    include_examples 'HttpClient tests'
+    it_behaves_like 'Client Common Tests'
+    it_behaves_like 'HttpClient tests'
 
     specify { expect(subject.request_client).to be_a JIRA::HttpClient }
 
@@ -173,12 +175,12 @@ describe JIRA::Client do
     it 'only returns a true for #authenticated? once we have requested some data' do
       expect(subject.authenticated?).to be_nil
       expect(subject.Project.all).to be_empty
-      expect(subject.authenticated?).to be_truthy
+      expect(subject).to be_authenticated
     end
 
     it 'fails with wrong user name and password' do
       bad_login = described_class.new(username: 'foo', password: 'badpassword', auth_type: :basic)
-      expect(bad_login.authenticated?).to be_falsey
+      expect(bad_login).not_to be_authenticated
       expect { bad_login.Project.all }.to raise_error JIRA::HTTPError
     end
   end
@@ -191,8 +193,8 @@ describe JIRA::Client do
       {
         session: { 'name' => 'JSESSIONID', 'value' => session_cookie },
         loginInfo: { 'failedLoginCount' => 1, 'loginCount' => 2,
-                       'lastFailedLoginTime' => (DateTime.now - 2).iso8601,
-                       'previousLoginTime' => (DateTime.now - 5).iso8601 }
+                     'lastFailedLoginTime' => (DateTime.now - 2).iso8601,
+                     'previousLoginTime' => (DateTime.now - 5).iso8601 }
       }
     end
 
@@ -212,8 +214,8 @@ describe JIRA::Client do
         .to_return(status: 200, body: '[]', headers: {})
     end
 
-    include_examples 'Client Common Tests'
-    include_examples 'HttpClient tests'
+    it_behaves_like 'Client Common Tests'
+    it_behaves_like 'HttpClient tests'
 
     specify { expect(subject.request_client).to be_a JIRA::HttpClient }
 
@@ -249,8 +251,8 @@ describe JIRA::Client do
         .to_return(status: 200, body: '[]', headers: {})
     end
 
-    include_examples 'Client Common Tests'
-    include_examples 'HttpClient tests'
+    it_behaves_like 'Client Common Tests'
+    it_behaves_like 'HttpClient tests'
 
     specify { expect(subject.request_client).to be_a JIRA::JwtClient }
 
@@ -266,7 +268,7 @@ describe JIRA::Client do
       end
 
       it 'is not authenticated' do
-        expect(subject.authenticated?).to be_falsey
+        expect(subject).not_to be_authenticated
       end
 
       it 'raises a JIRA::HTTPError when trying to fetch projects' do
@@ -275,22 +277,22 @@ describe JIRA::Client do
     end
 
     it 'only returns a true for #authenticated? once we have requested some data' do
-      expect(subject.authenticated?).to be_falsey
+      expect(subject).not_to be_authenticated
       expect(subject.Project.all).to be_empty
-      expect(subject.authenticated?).to be_truthy
+      expect(subject).to be_authenticated
     end
   end
 
-  context 'oauth authentication' do
+  context 'with oauth' do
     subject { described_class.new(consumer_key: 'foo', consumer_secret: 'bar') }
 
-    include_examples 'OAuth Common Tests'
+    it_behaves_like 'OAuth Common Tests'
   end
 
   context 'with oauth_2legged' do
     subject { described_class.new(consumer_key: 'foo', consumer_secret: 'bar', auth_type: :oauth_2legged) }
 
-    include_examples 'OAuth Common Tests'
+    it_behaves_like 'OAuth Common Tests'
   end
 
   context 'with unknown options' do

data/spec/jira/http_client_spec.rb

@@ -88,7 +88,7 @@ describe JIRA::HttpClient do
     response
   end
 
-  context 'simple client' do
+  context 'with a simple client' do
     let(:client) do
       options_local = JIRA::Client::DEFAULT_OPTIONS.merge(JIRA::HttpClient::DEFAULT_OPTIONS).merge(
         proxy_address: 'proxyAddress',
@@ -295,7 +295,7 @@ describe JIRA::HttpClient do
     expect(proxy_configuration.proxy_pass).to be_nil
   end
 
-  context 'client has proxy settings' do
+  context 'when the client has proxy settings' do
     subject(:proxy_conn) { proxy_client.basic_auth_http_conn }
 
     let(:proxy_client) do

data/spec/jira/oauth_client_spec.rb

@@ -37,7 +37,7 @@ describe JIRA::OauthClient do
 
     it 'could pre-process the response body in a block' do
       response = Net::HTTPSuccess.new(1.0, '200', 'OK')
-      allow_any_instance_of(OAuth::Consumer).to receive(:request).and_return(response)
+      allow(oauth_client.consumer).to receive(:request).and_return(response)
       allow(response).to receive(:body).and_return('&oauth_token=token&oauth_token_secret=secret&password=top_secret')
 
       result = oauth_client.request_token do |response_body|
@@ -127,16 +127,20 @@ describe JIRA::OauthClient do
         oauth_client.request(:get, '/foo', body, headers)
       end
 
-      context 'for a multipart request' do
+      context 'when a multipart request' do
         subject { oauth_client.make_multipart_request('/path', data, headers) }
 
         let(:data) { {} }
         let(:headers) { {} }
 
         it 'signs the access_token and performs the request' do
+          http_mock = double('HTTP')
+
+          consumer_mock = oauth_client.consumer
+
           expect(access_token).to receive(:sign!).with(an_instance_of(Net::HTTP::Post::Multipart))
-          expect(oauth_client.consumer).to receive_message_chain(:http,
-                                                                 :request).with(an_instance_of(Net::HTTP::Post::Multipart))
+          expect(consumer_mock).to receive(:http).and_return(http_mock)
+          expect(http_mock).to receive(:request).with(an_instance_of(Net::HTTP::Post::Multipart))
 
           subject
         end

data/spec/jira/resource/agile_spec.rb

@@ -31,7 +31,7 @@ describe JIRA::Resource::Agile do
       expect(client).to receive(:get).with('/jira/rest/agile/1.0/board/1/issue?').and_return(response)
       expect(response).to receive(:body).and_return(get_mock_response('board/1_issues.json'))
 
-      expect(client).to receive(:get).with('/jira/rest/api/2/search?jql=id+IN%2810546%2C+10547%2C+10556%2C+10557%2C+10558%2C+10559%2C+10600%2C+10601%2C+10604%29').and_return(response)
+      expect(client).to receive(:get).with('/jira/rest/api/2/search/jql?jql=id+IN%2810546%2C+10547%2C+10556%2C+10557%2C+10558%2C+10559%2C+10600%2C+10601%2C+10604%29').and_return(response)
       expect(response).to receive(:body).and_return(get_mock_response('board/1_issues.json'))
 
       issues = described_class.get_board_issues(client, 1)
@@ -40,7 +40,7 @@ describe JIRA::Resource::Agile do
 
       issues.each do |issue|
         expect(issue.class).to eq(JIRA::Resource::Issue)
-        expect(issue.expanded?).to be_falsey
+        expect(issue).not_to be_expanded
       end
     end
 
@@ -48,7 +48,7 @@ describe JIRA::Resource::Agile do
       expect(client).to receive(:get).with('/jira/rest/agile/1.0/board/1/issue?startAt=50').and_return(response)
       expect(response).to receive(:body).and_return(get_mock_response('board/1_issues.json'))
 
-      expect(client).to receive(:get).with('/jira/rest/api/2/search?jql=id+IN%2810546%2C+10547%2C+10556%2C+10557%2C+10558%2C+10559%2C+10600%2C+10601%2C+10604%29').and_return(response)
+      expect(client).to receive(:get).with('/jira/rest/api/2/search/jql?jql=id+IN%2810546%2C+10547%2C+10556%2C+10557%2C+10558%2C+10559%2C+10600%2C+10601%2C+10604%29').and_return(response)
       expect(response).to receive(:body).and_return(get_mock_response('board/1_issues.json'))
 
       issues = described_class.get_board_issues(client, 1, startAt: 50)
@@ -57,7 +57,7 @@ describe JIRA::Resource::Agile do
 
       issues.each do |issue|
         expect(issue.class).to eq(JIRA::Resource::Issue)
-        expect(issue.expanded?).to be_falsey
+        expect(issue).not_to be_expanded
       end
     end
   end