jira-ruby 1.2.0 → 2.3.0

data/spec/jira/http_client_spec.rb

@@ -1,78 +1,176 @@
 require 'spec_helper'
 
 describe JIRA::HttpClient do
-
   let(:basic_client) do
-    options = JIRA::Client::DEFAULT_OPTIONS.merge(JIRA::HttpClient::DEFAULT_OPTIONS)
+    options = JIRA::Client::DEFAULT_OPTIONS
+              .merge(JIRA::HttpClient::DEFAULT_OPTIONS)
+              .merge(basic_auth_credentials)
     JIRA::HttpClient.new(options)
   end
 
   let(:basic_cookie_client) do
-    options = JIRA::Client::DEFAULT_OPTIONS.merge(JIRA::HttpClient::DEFAULT_OPTIONS).merge(:use_cookies => true)
+    options = JIRA::Client::DEFAULT_OPTIONS
+              .merge(JIRA::HttpClient::DEFAULT_OPTIONS)
+              .merge(use_cookies: true)
+              .merge(basic_auth_credentials)
+    JIRA::HttpClient.new(options)
+  end
+
+  let(:custom_ssl_version_client) do
+    options = JIRA::Client::DEFAULT_OPTIONS.merge(JIRA::HttpClient::DEFAULT_OPTIONS).merge(ssl_version: :TLSv1_2)
+    JIRA::HttpClient.new(options)
+  end
+
+  let(:basic_cookie_client_with_context_path) do
+    options = JIRA::Client::DEFAULT_OPTIONS.merge(JIRA::HttpClient::DEFAULT_OPTIONS).merge(
+      use_cookies: true,
+      context_path: '/context'
+    )
+    JIRA::HttpClient.new(options)
+  end
+
+  let(:basic_cookie_client_with_additional_cookies) do
+    options = JIRA::Client::DEFAULT_OPTIONS
+              .merge(JIRA::HttpClient::DEFAULT_OPTIONS)
+              .merge(
+                use_cookies: true,
+                additional_cookies: ['sessionToken=abc123', 'internal=true']
+              )
+              .merge(basic_auth_credentials)
+    JIRA::HttpClient.new(options)
+  end
+
+  let(:basic_client_cert_client) do
+    options = JIRA::Client::DEFAULT_OPTIONS.merge(JIRA::HttpClient::DEFAULT_OPTIONS).merge(
+      use_client_cert: true,
+      cert: 'public certificate contents',
+      key: 'private key contents'
+    )
+    JIRA::HttpClient.new(options)
+  end
+
+  let(:basic_client_with_no_auth_credentials) do
+    options = JIRA::Client::DEFAULT_OPTIONS
+              .merge(JIRA::HttpClient::DEFAULT_OPTIONS)
+    JIRA::HttpClient.new(options)
+  end
+
+  let(:basic_auth_credentials) do
+    { username: 'donaldduck', password: 'supersecret' }
+  end
+
+  let(:proxy_client) do
+    options = JIRA::Client::DEFAULT_OPTIONS.merge(JIRA::HttpClient::DEFAULT_OPTIONS).merge(
+      proxy_address: 'proxyAddress',
+      proxy_port: 42,
+      proxy_username: 'proxyUsername',
+      proxy_password: 'proxyPassword'
+    )
     JIRA::HttpClient.new(options)
   end
 
   let(:response) do
-    response = double("response")
+    response = double('response')
     allow(response).to receive(:kind_of?).with(Net::HTTPSuccess).and_return(true)
     response
   end
 
   let(:cookie_response) do
-    response = double("response")
+    response = double('response')
     allow(response).to receive(:kind_of?).with(Net::HTTPSuccess).and_return(true)
     response
   end
 
-  it "creates an instance of Net:HTTP for a basic auth client" do
+  it 'creates an instance of Net:HTTP for a basic auth client' do
     expect(basic_client.basic_auth_http_conn.class).to eq(Net::HTTP)
   end
 
-  it "responds to the http methods" do
+  it 'makes a correct HTTP request for make_cookie_auth_request' do
+    request = double
+    basic_auth_http_conn = double
+
+    headers = { 'Content-Type' => 'application/json' }
+    expected_path = '/context/rest/auth/1/session'
+    expected_body = '{"username":"","password":""}'
+
+    allow(basic_cookie_client_with_context_path).to receive(:basic_auth_http_conn).and_return(basic_auth_http_conn)
+    expect(basic_auth_http_conn).to receive(:request).with(request).and_return(response)
+
+    allow(request).to receive(:basic_auth)
+    allow(response).to receive(:get_fields).with('set-cookie')
+
+    expect(request).to receive(:body=).with(expected_body)
+    expect(Net::HTTP.const_get(:post.to_s.capitalize)).to receive(:new).with(expected_path, headers).and_return(request)
+
+    basic_cookie_client_with_context_path.make_cookie_auth_request
+  end
+
+  it 'responds to the http methods' do
     body = ''
-    headers = double()
-    basic_auth_http_conn = double()
-    request = double()
+    headers = double
+    basic_auth_http_conn = double
+    request = double
     allow(basic_client).to receive(:basic_auth_http_conn).and_return(basic_auth_http_conn)
     expect(request).to receive(:basic_auth).with(basic_client.options[:username], basic_client.options[:password]).exactly(5).times.and_return(request)
     expect(basic_auth_http_conn).to receive(:request).exactly(5).times.with(request).and_return(response)
-    [:delete, :get, :head].each do |method|
+    %i[delete get head].each do |method|
       expect(Net::HTTP.const_get(method.to_s.capitalize)).to receive(:new).with('/path', headers).and_return(request)
       expect(basic_client.make_request(method, '/path', nil, headers)).to eq(response)
     end
-    [:post, :put].each do |method|
+    %i[post put].each do |method|
       expect(Net::HTTP.const_get(method.to_s.capitalize)).to receive(:new).with('/path', headers).and_return(request)
       expect(request).to receive(:body=).with(body).and_return(request)
       expect(basic_client.make_request(method, '/path', body, headers)).to eq(response)
     end
   end
 
-  it "gets and sets cookies" do
+  it 'gets and sets cookies' do
     body = ''
-    headers = double()
-    basic_auth_http_conn = double()
-    request = double()
+    headers = double
+    basic_auth_http_conn = double
+    request = double
     allow(basic_cookie_client).to receive(:basic_auth_http_conn).and_return(basic_auth_http_conn)
     expect(request).to receive(:basic_auth).with(basic_cookie_client.options[:username], basic_cookie_client.options[:password]).exactly(5).times.and_return(request)
     expect(cookie_response).to receive(:get_fields).with('set-cookie').exactly(5).times
     expect(basic_auth_http_conn).to receive(:request).exactly(5).times.with(request).and_return(cookie_response)
-    [:delete, :get, :head].each do |method|
+    %i[delete get head].each do |method|
       expect(Net::HTTP.const_get(method.to_s.capitalize)).to receive(:new).with('/path', headers).and_return(request)
       expect(basic_cookie_client.make_request(method, '/path', nil, headers)).to eq(cookie_response)
     end
-    [:post, :put].each do |method|
+    %i[post put].each do |method|
       expect(Net::HTTP.const_get(method.to_s.capitalize)).to receive(:new).with('/path', headers).and_return(request)
       expect(request).to receive(:body=).with(body).and_return(request)
       expect(basic_cookie_client.make_request(method, '/path', body, headers)).to eq(cookie_response)
     end
   end
 
+  it 'sets additional cookies when they are provided' do
+    client = basic_cookie_client_with_additional_cookies
+    body = ''
+    headers = double
+    basic_auth_http_conn = double
+    request = double
+    allow(client).to receive(:basic_auth_http_conn).and_return(basic_auth_http_conn)
+    expect(request).to receive(:basic_auth).with(client.options[:username], client.options[:password]).exactly(5).times.and_return(request)
+    expect(request).to receive(:add_field).with('Cookie', 'sessionToken=abc123; internal=true').exactly(5).times
+    expect(cookie_response).to receive(:get_fields).with('set-cookie').exactly(5).times
+    expect(basic_auth_http_conn).to receive(:request).exactly(5).times.with(request).and_return(cookie_response)
+    %i[delete get head].each do |method|
+      expect(Net::HTTP.const_get(method.to_s.capitalize)).to receive(:new).with('/path', headers).and_return(request)
+      expect(client.make_request(method, '/path', nil, headers)).to eq(cookie_response)
+    end
+    %i[post put].each do |method|
+      expect(Net::HTTP.const_get(method.to_s.capitalize)).to receive(:new).with('/path', headers).and_return(request)
+      expect(request).to receive(:body=).with(body).and_return(request)
+      expect(client.make_request(method, '/path', body, headers)).to eq(cookie_response)
+    end
+  end
 
-  it "performs a basic http client request" do
+  it 'performs a basic http client request' do
     body = nil
-    headers = double()
-    basic_auth_http_conn = double()
-    http_request = double()
+    headers = double
+    basic_auth_http_conn = double
+    http_request = double
     expect(Net::HTTP::Get).to receive(:new).with('/foo', headers).and_return(http_request)
 
     expect(basic_auth_http_conn).to receive(:request).with(http_request).and_return(response)
@@ -81,16 +179,42 @@ describe JIRA::HttpClient do
     basic_client.make_request(:get, '/foo', body, headers)
   end
 
-  it "returns a URI" do
+  it 'performs a basic http client request with a full domain' do
+    body = nil
+    headers = double
+    basic_auth_http_conn = double
+    http_request = double
+    expect(Net::HTTP::Get).to receive(:new).with('/foo', headers).and_return(http_request)
+
+    expect(basic_auth_http_conn).to receive(:request).with(http_request).and_return(response)
+    expect(http_request).to receive(:basic_auth).with(basic_client.options[:username], basic_client.options[:password]).and_return(http_request)
+    allow(basic_client).to receive(:basic_auth_http_conn).and_return(basic_auth_http_conn)
+    basic_client.make_request(:get, 'http://mydomain.com/foo', body, headers)
+  end
+
+  it 'does not try to use basic auth if the credentials are not set' do
+    body = nil
+    headers = double
+    basic_auth_http_conn = double
+    http_request = double
+    expect(Net::HTTP::Get).to receive(:new).with('/foo', headers).and_return(http_request)
+
+    expect(basic_auth_http_conn).to receive(:request).with(http_request).and_return(response)
+    expect(http_request).not_to receive(:basic_auth)
+    allow(basic_client_with_no_auth_credentials).to receive(:basic_auth_http_conn).and_return(basic_auth_http_conn)
+    basic_client_with_no_auth_credentials.make_request(:get, '/foo', body, headers)
+  end
+
+  it 'returns a URI' do
     uri = URI.parse(basic_client.options[:site])
     expect(basic_client.uri).to eq(uri)
   end
 
-  it "sets up a http connection with options" do
-    http_conn = double()
-    uri = double()
-    host = double()
-    port = double()
+  it 'sets up a http connection with options' do
+    http_conn = double
+    uri = double
+    host = double
+    port = double
     expect(uri).to receive(:host).and_return(host)
     expect(uri).to receive(:port).and_return(port)
     expect(Net::HTTP).to receive(:new).with(host, port).and_return(http_conn)
@@ -100,11 +224,110 @@ describe JIRA::HttpClient do
     expect(basic_client.http_conn(uri)).to eq(http_conn)
   end
 
-  it "returns a http connection" do
-    http_conn = double()
-    uri = double()
+  it 'sets the SSL version when one is provided' do
+    http_conn = double
+    uri = double
+    host = double
+    port = double
+    expect(uri).to receive(:host).and_return(host)
+    expect(uri).to receive(:port).and_return(port)
+    expect(Net::HTTP).to receive(:new).with(host, port).and_return(http_conn)
+    expect(http_conn).to receive(:use_ssl=).with(basic_client.options[:use_ssl]).and_return(http_conn)
+    expect(http_conn).to receive(:verify_mode=).with(basic_client.options[:ssl_verify_mode]).and_return(http_conn)
+    expect(http_conn).to receive(:ssl_version=).with(custom_ssl_version_client.options[:ssl_version]).and_return(http_conn)
+    expect(http_conn).to receive(:read_timeout=).with(basic_client.options[:read_timeout]).and_return(http_conn)
+    expect(custom_ssl_version_client.http_conn(uri)).to eq(http_conn)
+  end
+
+  it 'sets up a non-proxied http connection by default' do
+    uri = double
+    host = double
+    port = double
+
+    expect(uri).to receive(:host).and_return(host)
+    expect(uri).to receive(:port).and_return(port)
+
+    proxy_configuration = basic_client.http_conn(uri).class
+    expect(proxy_configuration.proxy_address).to be_nil
+    expect(proxy_configuration.proxy_port).to be_nil
+    expect(proxy_configuration.proxy_user).to be_nil
+    expect(proxy_configuration.proxy_pass).to be_nil
+  end
+
+  it 'sets up a proxied http connection when using proxy options' do
+    uri = double
+    host = double
+    port = double
+
+    expect(uri).to receive(:host).and_return(host)
+    expect(uri).to receive(:port).and_return(port)
+
+    proxy_configuration = proxy_client.http_conn(uri).class
+    expect(proxy_configuration.proxy_address).to eq(proxy_client.options[:proxy_address])
+    expect(proxy_configuration.proxy_port).to eq(proxy_client.options[:proxy_port])
+    expect(proxy_configuration.proxy_user).to eq(proxy_client.options[:proxy_username])
+    expect(proxy_configuration.proxy_pass).to eq(proxy_client.options[:proxy_password])
+  end
+
+  it 'can use client certificates' do
+    http_conn = double
+    uri = double
+    host = double
+    port = double
+    expect(Net::HTTP).to receive(:new).with(host, port).and_return(http_conn)
+    expect(uri).to receive(:host).and_return(host)
+    expect(uri).to receive(:port).and_return(port)
+    expect(http_conn).to receive(:use_ssl=).with(basic_client.options[:use_ssl])
+    expect(http_conn).to receive(:verify_mode=).with(basic_client.options[:ssl_verify_mode])
+    expect(http_conn).to receive(:read_timeout=).with(basic_client.options[:read_timeout])
+    expect(http_conn).to receive(:cert=).with(basic_client_cert_client.options[:ssl_client_cert])
+    expect(http_conn).to receive(:key=).with(basic_client_cert_client.options[:ssl_client_key])
+    expect(basic_client_cert_client.http_conn(uri)).to eq(http_conn)
+  end
+
+  it 'can use a certificate authority file' do
+    client = JIRA::HttpClient.new(JIRA::Client::DEFAULT_OPTIONS.merge(ca_file: '/opt/custom.ca.pem'))
+    expect(client.http_conn(client.uri).ca_file).to eql('/opt/custom.ca.pem')
+  end
+
+  it 'returns a http connection' do
+    http_conn = double
+    uri = double
     expect(basic_client).to receive(:uri).and_return(uri)
     expect(basic_client).to receive(:http_conn).and_return(http_conn)
     expect(basic_client.basic_auth_http_conn).to eq(http_conn)
   end
+
+  describe '#make_multipart_request' do
+    subject do
+      basic_client.make_multipart_request(path, data, headers)
+    end
+
+    let(:path) { '/foo' }
+    let(:data) { {} }
+    let(:headers) { { 'X-Atlassian-Token' => 'no-check' } }
+    let(:basic_auth_http_conn) { double }
+    let(:request) { double('Http Request', path: path) }
+    let(:response) { double('response') }
+
+    before do
+      allow(request).to receive(:basic_auth)
+      allow(Net::HTTP::Post::Multipart).to receive(:new).with(path, data, headers).and_return(request)
+      allow(basic_client).to receive(:basic_auth_http_conn).and_return(basic_auth_http_conn)
+      allow(basic_auth_http_conn).to receive(:request).with(request).and_return(response)
+    end
+
+    it 'performs a basic http client request' do
+      expect(request).to receive(:basic_auth).with(basic_client.options[:username], basic_client.options[:password]).and_return(request)
+
+      subject
+    end
+
+    it 'makes a correct HTTP request' do
+      expect(basic_auth_http_conn).to receive(:request).with(request).and_return(response)
+      expect(response).to receive(:is_a?).with(Net::HTTPOK)
+
+      subject
+    end
+  end
 end

data/spec/jira/http_error_spec.rb

@@ -1,26 +1,24 @@
 require 'spec_helper'
 
 describe JIRA::HTTPError do
-
-  let(:response)  {
-    response = double("response")
+  let(:response) do
+    response = double('response')
     allow(response).to receive(:code).and_return(401)
-    allow(response).to receive(:message).and_return("A MESSAGE WOO")
+    allow(response).to receive(:message).and_return('A MESSAGE WOO')
     response
-  }
+  end
 
   subject { described_class.new(response) }
 
-  it "takes the response object as an argument" do
+  it 'takes the response object as an argument' do
     expect(subject.response).to eq(response)
   end
 
-  it "has a code method" do
+  it 'has a code method' do
     expect(subject.code).to eq(response.code)
   end
 
-  it "returns code and class from message" do
+  it 'returns code and class from message' do
     expect(subject.message).to eq(response.message)
   end
-
 end

data/spec/jira/jwt_uri_builder_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe JIRA::JwtClient::JwtUriBuilder do
+  subject(:url_builder) do
+    JIRA::JwtClient::JwtUriBuilder.new(url, http_method, shared_secret, site, issuer)
+  end
+
+  let(:url) { '/foo' }
+  let(:http_method) { :get }
+  let(:shared_secret) { 'shared_secret' }
+  let(:site) { 'http://localhost:2990' }
+  let(:issuer) { nil }
+
+  describe '#build' do
+    subject { url_builder.build }
+
+    it 'includes the jwt param' do
+      expect(subject).to include('?jwt=')
+    end
+
+    context 'when the url already contains params' do
+      let(:url) { '/foo?expand=projects.issuetypes.fields' }
+
+      it 'includes the jwt param' do
+        expect(subject).to include('&jwt=')
+      end
+    end
+
+    context 'with a complete url' do
+      let(:url) { 'http://localhost:2990/rest/api/2/issue/createmeta' }
+
+      it 'includes the jwt param' do
+        expect(subject).to include('?jwt=')
+      end
+
+      it { is_expected.to start_with('/') }
+
+      it 'contains only one ?' do
+        expect(subject.count('?')).to eq(1)
+      end
+    end
+
+    context 'with a complete url containing a param' do
+      let(:url) do
+        'http://localhost:2990/rest/api/2/issue/createmeta?expand=projects.issuetypes.fields'
+      end
+
+      it 'includes the jwt param' do
+        expect(subject).to include('&jwt=')
+      end
+
+      it { is_expected.to start_with('/') }
+
+      it 'contains only one ?' do
+        expect(subject.count('?')).to eq(1)
+      end
+    end
+  end
+end

data/spec/jira/oauth_client_spec.rb

@@ -1,43 +1,62 @@
 require 'spec_helper'
 
 describe JIRA::OauthClient do
-
   let(:oauth_client) do
-    options = { :consumer_key => 'foo', :consumer_secret => 'bar' }
+    options = { consumer_key: 'foo', consumer_secret: 'bar' }
     options = JIRA::Client::DEFAULT_OPTIONS.merge(options)
     JIRA::OauthClient.new(options)
   end
 
   let(:response) do
-    response = double("response")
-    allow(response).to receive(:kind_of?).with(Net::HTTPSuccess).and_return(true)
+    response = double('response')
+    allow(response).to receive(:is_a?).with(Net::HTTPSuccess).and_return(true)
     response
   end
 
-  describe "authenticating with oauth" do
-    it "prepends the context path to all authorization and rest paths" do
-      options = [:request_token_path, :authorize_path, :access_token_path]
+  describe 'authenticating with oauth' do
+    it 'prepends the context path to all authorization and rest paths' do
+      options = %i[request_token_path authorize_path access_token_path]
       defaults = JIRA::Client::DEFAULT_OPTIONS.merge(JIRA::OauthClient::DEFAULT_OPTIONS)
       options.each do |key|
         expect(oauth_client.options[key]).to eq(defaults[:context_path] + defaults[key])
       end
     end
 
-    it "creates a Oauth::Consumer on initialize" do
+    it 'creates a Oauth::Consumer on initialize' do
       expect(oauth_client.consumer.class).to eq(OAuth::Consumer)
       expect(oauth_client.consumer.key).to eq(oauth_client.key)
       expect(oauth_client.consumer.secret).to eq(oauth_client.secret)
     end
 
-    it "returns an OAuth request_token" do
+    it 'returns an OAuth request_token' do
       # Cannot just check for method delegation as http connection will be attempted
       request_token = OAuth::RequestToken.new(oauth_client.consumer)
       allow(oauth_client).to receive(:get_request_token).and_return(request_token)
       expect(oauth_client.get_request_token).to eq(request_token)
     end
 
-    it "allows setting the request token" do
-      token = double()
+    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(response).to receive(:body).and_return('&oauth_token=token&oauth_token_secret=secret&password=top_secret')
+
+      result = oauth_client.request_token do |response_body|
+        CGI.parse(response_body).each_with_object({}) do |(k, v), h|
+          next if k == 'password'
+
+          h[k.strip.to_sym] = v.first
+        end
+      end
+
+      expect(result).to be_an_instance_of(OAuth::RequestToken)
+      expect(result.consumer).to eql(oauth_client.consumer)
+      expect(result.params[:oauth_token]).to eql('token')
+      expect(result.params[:oauth_token_secret]).to eql('secret')
+      expect(result.params[:password]).to be_falsey
+    end
+
+    it 'allows setting the request token' do
+      token = double
       expect(OAuth::RequestToken).to receive(:new).with(oauth_client.consumer, 'foo', 'bar').and_return(token)
 
       request_token = oauth_client.set_request_token('foo', 'bar')
@@ -46,34 +65,33 @@ describe JIRA::OauthClient do
       expect(oauth_client.request_token).to eq(token)
     end
 
-    it "allows setting the consumer key" do
+    it 'allows setting the consumer key' do
       expect(oauth_client.key).to eq('foo')
     end
 
-    it "allows setting the consumer secret" do
+    it 'allows setting the consumer secret' do
       expect(oauth_client.secret).to eq('bar')
     end
 
-    describe "the access token" do
-
-      it "initializes" do
+    describe 'the access token' do
+      it 'initializes' do
         request_token = OAuth::RequestToken.new(oauth_client.consumer)
         allow(oauth_client).to receive(:get_request_token).and_return(request_token)
-        mock_access_token = double()
-        expect(request_token).to receive(:get_access_token).with(:oauth_verifier => 'abc123').and_return(mock_access_token)
-        oauth_client.init_access_token(:oauth_verifier => 'abc123')
+        mock_access_token = double
+        expect(request_token).to receive(:get_access_token).with({ oauth_verifier: 'abc123' }).and_return(mock_access_token)
+        oauth_client.init_access_token(oauth_verifier: 'abc123')
         expect(oauth_client.access_token).to eq(mock_access_token)
       end
 
-      it "raises an exception when accessing without initialisation" do
-        expect {
+      it 'raises an exception when accessing without initialisation' do
+        expect do
           oauth_client.access_token
-        }.to raise_exception(JIRA::OauthClient::UninitializedAccessTokenError,
-                             "init_access_token must be called before using the client")
+        end.to raise_exception(JIRA::OauthClient::UninitializedAccessTokenError,
+                               'init_access_token must be called before using the client')
       end
 
-      it "allows setting the access token" do
-        token = double()
+      it 'allows setting the access token' do
+        token = double
         expect(OAuth::AccessToken).to receive(:new).with(oauth_client.consumer, 'foo', 'bar').and_return(token)
 
         access_token = oauth_client.set_access_token('foo', 'bar')
@@ -83,29 +101,82 @@ describe JIRA::OauthClient do
       end
     end
 
-    describe "http" do
-      it "responds to the http methods" do
-        headers = double()
-        mock_access_token = double()
-        allow(oauth_client).to receive(:access_token).and_return(mock_access_token)
-        [:delete, :get, :head].each do |method|
-          expect(mock_access_token).to receive(method).with('/path', headers).and_return(response)
+    describe 'http' do
+      let(:headers) { double }
+      let(:access_token) { double }
+      let(:body) { nil }
+
+      before do
+        allow(oauth_client).to receive(:access_token).and_return(access_token)
+      end
+
+      it 'responds to the http methods' do
+        %i[delete get head].each do |method|
+          expect(access_token).to receive(method).with('/path', headers).and_return(response)
           oauth_client.make_request(method, '/path', '', headers)
         end
-        [:post, :put].each do |method|
-          expect(mock_access_token).to receive(method).with('/path', '', headers).and_return(response)
+        %i[post put].each do |method|
+          expect(access_token).to receive(method).with('/path', '', headers).and_return(response)
           oauth_client.make_request(method, '/path', '', headers)
         end
       end
 
-      it "performs a request" do
-        body = nil
-        headers = double()
-        access_token = double()
+      it 'performs a request' do
         expect(access_token).to receive(:send).with(:get, '/foo', headers).and_return(response)
-        allow(oauth_client).to receive(:access_token).and_return(access_token)
+
+
         oauth_client.request(:get, '/foo', body, headers)
       end
+
+      context 'for 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
+          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))
+
+          subject
+        end
+      end
+    end
+
+    describe 'auth type is oauth_2legged' do
+      let(:oauth__2legged_client) do
+        options = { consumer_key: 'foo', consumer_secret: 'bar', auth_type: :oauth_2legged }
+        options = JIRA::Client::DEFAULT_OPTIONS.merge(options)
+        JIRA::OauthClient.new(options)
+      end
+
+      it 'responds to the http methods adding oauth_token parameter' do
+        headers = double
+        mock_access_token = double
+        allow(oauth__2legged_client).to receive(:access_token).and_return(mock_access_token)
+        %i[delete get head].each do |method|
+          expect(mock_access_token).to receive(method).with('/path?oauth_token=', headers).and_return(response)
+          oauth__2legged_client.make_request(method, '/path', '', headers)
+        end
+        %i[post put].each do |method|
+          expect(mock_access_token).to receive(method).with('/path?oauth_token=', '', headers).and_return(response)
+          oauth__2legged_client.make_request(method, '/path', '', headers)
+        end
+      end
+
+      it 'responds to the http methods adding oauth_token parameter to any existing parameters' do
+        headers = double
+        mock_access_token = double
+        allow(oauth__2legged_client).to receive(:access_token).and_return(mock_access_token)
+        %i[delete get head].each do |method|
+          expect(mock_access_token).to receive(method).with('/path?any_param=toto&oauth_token=', headers).and_return(response)
+          oauth__2legged_client.make_request(method, '/path?any_param=toto', '', headers)
+        end
+        %i[post put].each do |method|
+          expect(mock_access_token).to receive(method).with('/path?any_param=toto&oauth_token=', '', headers).and_return(response)
+          oauth__2legged_client.make_request(method, '/path?any_param=toto', '', headers)
+        end
+      end
     end
   end
 end