airborne 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f1bb8d459481fbacaafd1d72b5849e435ca611c
-  data.tar.gz: 2454e521d94443aaae41290fdd798560e14f808c
+  metadata.gz: c6f55b477b3b74d9872eb367610d368fb6b987b4
+  data.tar.gz: e6b5489646213522e340f9f3d0e314535dd8ef15
 SHA512:
-  metadata.gz: 24a08e05af16617fc9a5cc5d5e11fec8c512d8571281ba162e42ed9834e6307a3611ee3018a1f9a7e270764a89dd8649bdf69124b4ea2d3ce0db175942515dc0
-  data.tar.gz: 2f48afa8c36161e387d9800a114e6effc8aa1a9d52b78fb1afb704dddaa4d52e95567cd11c67a726f26ecce8673e75a355a621e0c1b386bb88f3e41b2b132e16
+  metadata.gz: 127e91334701c8b69e7bdbe8430b19c903708e608147f7c67c9a9e127d8b0757d7f9fa786497ccfc3ca789b4486f061333a9490cf6a3fe82e58ffd95ef6469d5
+  data.tar.gz: 89693d8b556bdd84127685789ee3d38da29bc4b209f08faf4ea0e32faa482b5616730f24e8bab9f6389916dd1beec20e2f687714bb795a8245319a987eb17df5

data/airborne.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'airborne'
-  s.version     = '0.2.2'
+  s.version     = '0.2.3'
   s.date        = Date.today.to_s
   s.summary = 'RSpec driven API testing framework'
   s.authors     = ['Alex Friedman', 'Seth Pollack']

data/lib/airborne/rest_client_requester.rb

@@ -3,25 +3,29 @@ require 'rest_client'
 module Airborne
   module RestClientRequester
     def make_request(method, url, options = {})
-      headers = { content_type: :json }.merge(options[:headers] || {})
-      base_headers = Airborne.configuration.headers || {}
-      headers = base_headers.merge(headers)
+      headers = base_headers.merge(options[:headers] || {})
       res = if method == :post || method == :patch || method == :put
-              begin
-                request_body = options[:body].nil? ? '' : options[:body]
-                request_body = request_body.to_json if options[:body].is_a?(Hash)
-                RestClient.send(method, get_url(url), request_body, headers)
-              rescue RestClient::Exception => e
-                e.response
-              end
-            else
-              begin
-                RestClient.send(method, get_url(url), headers)
-              rescue RestClient::Exception => e
-                e.response
-              end
-            end
+        begin
+          request_body = options[:body].nil? ? '' : options[:body]
+          request_body = request_body.to_json if options[:body].is_a?(Hash)
+          RestClient.send(method, get_url(url), request_body, headers)
+        rescue RestClient::Exception => e
+          e.response
+        end
+      else
+        begin
+          RestClient.send(method, get_url(url), headers)
+        rescue RestClient::Exception => e
+          e.response
+        end
+      end
       res
     end
+
+    private
+
+    def base_headers
+      { content_type: :json }.merge(Airborne.configuration.headers || {})
+    end
   end
 end

data/spec/airborne/client_requester_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe 'client requester' do
+  before do
+    allow(RestClient).to receive(:send)
+    RSpec::Mocks.space.proxy_for(self).remove_stub_if_present(:get)
+  end
+
+  after do
+    allow(RestClient).to receive(:send).and_call_original
+    Airborne.configure { |config| config.headers =  {} }
+  end
+
+  it 'should set :content_type to :json by default' do
+    get '/foo'
+
+    expect(RestClient).to have_received(:send)
+                            .with(:get, 'http://www.example.com/foo', { content_type: :json })
+  end
+
+  it 'should override headers with option[:headers]' do
+    get '/foo', { content_type: 'application/x-www-form-urlencoded' }
+
+    expect(RestClient).to have_received(:send)
+                            .with(:get, 'http://www.example.com/foo', { content_type: 'application/x-www-form-urlencoded' })
+  end
+
+  it 'should override headers with airborne config headers' do
+    Airborne.configure { |config| config.headers = { content_type: 'text/plain' } }
+
+    get '/foo'
+
+    expect(RestClient).to have_received(:send)
+                            .with(:get, 'http://www.example.com/foo', { content_type: 'text/plain' })
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airborne
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Alex Friedman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -123,6 +123,7 @@ files:
 - lib/airborne/request_expectations.rb
 - lib/airborne/rest_client_requester.rb
 - spec/airborne/base_spec.rb
+- spec/airborne/client_requester_spec.rb
 - spec/airborne/delete_spec.rb
 - spec/airborne/expectations/expect_header_contains_spec.rb
 - spec/airborne/expectations/expect_header_spec.rb
@@ -189,8 +190,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: RSpec driven API testing framework
 test_files: []
+has_rdoc: