airborne 0.1.15 → 0.1.16

data/spec/airborne/expectations/expect_json_types_lambda_spec.rb

@@ -1,11 +1,9 @@
 require 'spec_helper'
 
 describe 'expect_json_types lambda' do
-
-	it 'should invoke proc passed in' do
+  it 'should invoke proc passed in' do
     mock_get('simple_get')
     get '/simple_get'
-    expect_json_types({name: ->(name){expect(name.length).to eq(4)}})
+    expect_json_types(name: ->(name) { expect(name.length).to eq(4) })
   end
-
-end
+end

data/spec/airborne/expectations/expect_json_types_optional_spec.rb

@@ -1,17 +1,15 @@
 require 'spec_helper'
 
 describe 'expect_json_types optional' do
+  it 'should test optional nested hash when exists' do
+    mock_get('simple_nested_path')
+    get '/simple_nested_path'
+    expect_json_types('address.coordinates', optional(lattitude: :float, longitutde: :float))
+  end
 
-	it 'should test optional nested hash when exists' do
-		mock_get('simple_nested_path')
-		get '/simple_nested_path'
-		expect_json_types("address.coordinates", optional({lattitude: :float, longitutde: :float}))
-	end
-
-	it 'should allow optional nested hash' do
-		mock_get('simple_path_get')
-		get '/simple_path_get'
-		expect_json_types("address.coordinates", optional({lattitude: :float, longitutde: :float}))
-	end
-	
-end
+  it 'should allow optional nested hash' do
+    mock_get('simple_path_get')
+    get '/simple_path_get'
+    expect_json_types('address.coordinates', optional(lattitude: :float, longitutde: :float))
+  end
+end

data/spec/airborne/expectations/expect_json_types_path_spec.rb

@@ -1,67 +1,65 @@
 require 'spec_helper'
 
 describe 'expect_json_types wih path' do
+  it 'should allow simple path and verify only that path' do
+    mock_get('simple_path_get')
+    get '/simple_path_get'
+    expect_json_types('address', street: :string, city: :string, state: :string)
+  end
 
-	it 'should allow simple path and verify only that path' do
-		mock_get('simple_path_get')
-		get '/simple_path_get'
-		expect_json_types('address', {street: :string, city: :string, state: :string})
-	end
+  it 'should allow nested paths' do
+    mock_get('simple_nested_path')
+    get '/simple_nested_path'
+    expect_json_types('address.coordinates', lattitude: :float, longitutde: :float)
+  end
 
-	it 'should allow nested paths' do
-		mock_get('simple_nested_path')
-		get '/simple_nested_path'
-		expect_json_types('address.coordinates', {lattitude: :float, longitutde: :float} )
-	end
+  it 'should index into array and test against specific element' do
+    mock_get('array_with_index')
+    get '/array_with_index'
+    expect_json_types('cars.0', make: :string, model: :string)
+  end
 
-	it 'should index into array and test against specific element' do
-		mock_get('array_with_index')
-		get '/array_with_index'
-		expect_json_types('cars.0', {make: :string, model: :string})
-	end
+  it 'should allow properties to be tested against a path' do
+    mock_get('array_with_index')
+    get '/array_with_index'
+    expect_json_types('cars.0.make', :string)
+  end
 
-	it 'should allow properties to be tested against a path' do
-		mock_get('array_with_index')
-		get '/array_with_index'
-		expect_json_types('cars.0.make', :string)
-	end
+  it 'should test against all elements in the array' do
+    mock_get('array_with_index')
+    get '/array_with_index'
+    expect_json_types('cars.*', make: :string, model: :string)
+  end
 
-	it 'should test against all elements in the array' do
-		mock_get('array_with_index')
-		get '/array_with_index'
-		expect_json_types('cars.*', {make: :string, model: :string})
-	end
+  it 'should ensure all elements of array are valid' do
+    mock_get('array_with_index')
+    get '/array_with_index'
+    expect { expect_json_types('cars.*', make: :string, model: :int) }.to raise_error
+  end
 
-	it 'should ensure all elements of array are valid' do
-		mock_get('array_with_index')
-		get '/array_with_index'
-		expect{expect_json_types('cars.*', {make: :string, model: :int})}.to raise_error
-	end
+  it 'should deep symbolize array responses' do
+    mock_get('array_response')
+    get '/array_response'
+    expect_json_types('*', name: :string)
+  end
 
-	it 'should deep symbolize array responses' do
-		mock_get('array_response')
-		get '/array_response'
-		expect_json_types("*", {name: :string})
-	end
+  it 'should check all nested arrays for specified elements' do
+    mock_get('array_with_nested')
+    get '/array_with_nested'
+    expect_json_types('cars.*.owners.*', name: :string)
+  end
 
-	it 'should check all nested arrays for specified elements' do
-		mock_get('array_with_nested')
-		get '/array_with_nested'
-		expect_json_types('cars.*.owners.*', {name: :string})
-	end
-
-	it 'should ensure all nested arrays contain correct data' do
-		mock_get('array_with_nested_bad_data')
-		get '/array_with_nested_bad_data'
-		expect{expect_json_types('cars.*.owners.*', {name: :string})}.to raise_error
-	end
-
-	it "should raise ExpectationError when expectation expects an object instead of type" do
-		mock_get('array_with_index')
-		get '/array_with_index'
-		expect do
-			expect_json_types('cars.0.make', {make: :string})
-		end.to raise_error(Airborne::ExpectationError, "Expected String Tesla\nto be an object with property make")
-	end
+  it 'should ensure all nested arrays contain correct data' do
+    mock_get('array_with_nested_bad_data')
+    get '/array_with_nested_bad_data'
+    expect { expect_json_types('cars.*.owners.*', name: :string) }.to raise_error
+  end
 
+  it 'should raise ExpectationError when expectation expects an object instead of type' do
+    mock_get('array_with_index')
+    get '/array_with_index'
+    expect do
+      expect_json_types('cars.0.make', make: :string)
+    end.to raise_error(Airborne::ExpectationError, "Expected String Tesla\nto be an object with property make")
+  end
 end

data/spec/airborne/expectations/expect_json_types_spec.rb

@@ -1,47 +1,57 @@
 require 'spec_helper'
 
 describe 'expect_json_types' do
-
   it 'should detect current type' do
     mock_get('simple_get')
     get '/simple_get'
-    expect_json_types({name: :string, age: :int})
+    expect_json_types(name: :string, age: :int)
   end
 
   it 'should fail when incorrect json types tested' do
     mock_get('simple_get')
     get '/simple_get'
-    expect{expect_json_types({bad: :bool})}.to raise_error
+    expect { expect_json_types(bad: :bool) }.to raise_error
   end
 
   it 'should not fail when optional property is not present' do
     mock_get('simple_get')
     get '/simple_get'
-    expect_json_types({name: :string, age: :int, optional: :bool_or_null })
+    expect_json_types(name: :string, age: :int, optional: :bool_or_null)
   end
 
   it 'should allow full object graph' do
     mock_get('simple_path_get')
     get '/simple_path_get'
-    expect_json_types({name: :string, address: {street: :string, city: :string, state: :string}})
+    expect_json_types(name: :string, address: { street: :string, city: :string, state: :string })
   end
 
   it 'should check all types in a simple array' do
     mock_get('array_of_values')
     get '/array_of_values'
-    expect_json_types({grades: :array_of_ints})
+    expect_json_types(grades: :array_of_ints)
   end
 
   it 'should ensure all valid types in a simple array' do
     mock_get('array_of_values')
     get '/array_of_values'
-    expect{expect_json_types({bad: :array_of_ints})}.to raise_error
+    expect { expect_json_types(bad: :array_of_ints) }.to raise_error
   end
 
   it 'should allow empty array' do
     mock_get('array_of_values')
     get '/array_of_values'
-    expect_json_types({emptyArray: :array_of_ints})
+    expect_json_types(emptyArray: :array_of_ints)
+  end
+
+  it 'should be able to test for a nil type' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect_json_types(name: :string, age: :int, address: :null)
   end
 
+  it 'Should throw bad type error' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect { expect_json_types(name: :foo) }.to raise_error(Airborne::ExpectationError, "Expected type foo\nis an invalid type")
+  end
 end

data/spec/airborne/expectations/expect_status_spec.rb

@@ -4,20 +4,20 @@ describe 'expect_status' do
   it 'should verify correct status code' do
     mock_get('simple_get')
     get '/simple_get'
-    expect_status(200)
+    expect_status 200
   end
 
   it 'should fail when incorrect status code is returned' do
     mock_get('simple_get')
     get '/simple_get'
-    expect{expect_status(123)}.to raise_error
+    expect { expect_status 123 }.to raise_error
   end
 
   it 'should translate symbol codes to whatever is appropriate for the request' do
     mock_get('simple_get')
     get '/simple_get'
-    expect_status(:ok)
-    expect_status(200)
-    expect_status('200')
+    expect_status :ok
+    expect_status 200
+    expect_status '200'
   end
-end
+end

data/spec/airborne/head_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe 'head' do
   it 'should allow testing on head requests' do
-    mock_head('simple_head', {'foo' => 'foo'})
+    mock_head('simple_head', 'foo' => 'foo')
     head '/simple_head', {}
-    expect_status(200)
+    expect_status 200
     expect_header('foo', 'foo')
   end
 end

data/spec/airborne/options_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe 'head' do
   it 'should allow testing on options requests' do
-    mock_options('simple_options', {'foo' => 'foo'})
+    mock_options('simple_options', 'foo' => 'foo')
     options '/simple_options', {}
-    expect_status(200)
+    expect_status 200
     expect_header('foo', 'foo')
   end
 end

data/spec/airborne/patch_spec.rb

@@ -4,6 +4,6 @@ describe 'patch' do
   it 'should allow testing on patch requests' do
     mock_patch('simple_patch')
     patch '/simple_patch', {}
-    expect_json_types({status: :string, someNumber: :int})
+    expect_json_types(status: :string, someNumber: :int)
   end
-end
+end

data/spec/airborne/path_spec.rb

@@ -1,36 +1,34 @@
 require 'spec_helper'
 
-describe 'expect path' do 
+describe 'expect path' do
+  describe 'errors' do
+    before :each do
+      mock_get('array_with_index')
+      get '/array_with_index'
+    end
 
-	describe "errors" do
-		before :each do
-			mock_get('array_with_index')
-			get '/array_with_index'
-		end
+    it 'should raise PathError when incorrect path containing .. is used' do
+      expect do
+        expect_json('cars..make', 'Tesla')
+      end.to raise_error(Airborne::PathError, "Invalid Path, contains '..'")
+    end
 
-		it "should raise PathError when incorrect path containing .. is used" do 
-			expect do
-				expect_json('cars..make', "Tesla")
-			end.to raise_error(Airborne::PathError, "Invalid Path, contains '..'")
-		end
+    it 'should raise PathError when trying to call property on an array' do
+      expect do
+        expect_json('cars.make', 'Tesla')
+      end.to raise_error(Airborne::PathError, "Expected Array\nto be an object with property make")
+    end
+  end
 
-		it "should raise PathError when trying to call property on an array" do
-			expect do
-				expect_json('cars.make', "Tesla")
-			end.to raise_error(Airborne::PathError, "Expected Array\nto to be an object with property make")
-		end
-	end
+  it 'should work with numberic properties' do
+    mock_get('numeric_property')
+    get '/numeric_property'
+    expect_json('cars.0.make', 'Tesla')
+  end
 
-	it "should work with numberic properties" do 
-		mock_get('numeric_property')
-		get '/numeric_property'
-		expect_json('cars.0.make', "Tesla")
-	end
-
-	it "should work with numberic properties" do 
-		mock_get('numeric_property')
-		get '/numeric_property'
-		expect_json_keys('cars.0',[:make, :model])
-	end
-
-end
+  it 'should work with numberic properties' do
+    mock_get('numeric_property')
+    get '/numeric_property'
+    expect_json_keys('cars.0', [:make, :model])
+  end
+end

data/spec/airborne/post_spec.rb

@@ -5,13 +5,13 @@ describe 'post' do
   it 'should allow testing on post requests' do
     mock_post('simple_post')
     post '/simple_post', {}
-    expect_json_types({status: :string, someNumber: :int})
+    expect_json_types(status: :string, someNumber: :int)
   end
 
   it 'should allow testing on post requests' do
     url = 'http://www.example.com/simple_post'
     stub_request(:post, url)
-    post '/simple_post', 'hello', {content_type: "text/plain"}
-    expect(WebMock).to have_requested(:post, url).with(:body => "hello", :headers => {'Content-Type' => 'text/plain'})
+    post '/simple_post', 'hello', content_type: 'text/plain'
+    expect(WebMock).to have_requested(:post, url).with(body: 'hello', headers: { 'Content-Type' => 'text/plain' })
   end
 end

data/spec/airborne/put_spec.rb

@@ -4,6 +4,6 @@ describe 'put' do
   it 'should allow testing on put requests' do
     mock_put('simple_put')
     put '/simple_put', {}
-    expect_json_types({status: :string, someNumber: :int})
+    expect_json_types(status: :string, someNumber: :int)
   end
-end
+end

data/spec/airborne/rack/rack_sinatra_spec.rb

@@ -3,10 +3,11 @@ require 'sinatra'
 
 class SampleApp < Sinatra::Application
   before do
-      content_type 'application/json'
-    end
+    content_type 'application/json'
+  end
+
   get '/' do
-    {foo: "bar"}.to_json
+    { foo: 'bar' }.to_json
   end
 end
 
@@ -17,11 +18,17 @@ end
 describe 'rack app' do
   it 'should allow requests against a sinatra app' do
     get '/'
-    expect_json_types({foo: :string})
+    expect_json_types(foo: :string)
   end
 
   it 'should ensure correct values from sinatra app' do
     get '/'
-    expect{expect_json_types({foo: :int})}.to raise_error
-  end 
-end
+    expect { expect_json_types(foo: :int) }.to raise_error
+  end
+
+  it 'Should set json_body even when not using the airborne http requests' do
+    Response = Struct.new(:body, :headers)
+    @response = Response.new({ foo: 'bar' }.to_json)
+    expect(json_body).to eq(foo: 'bar')
+  end
+end

data/spec/spec_helper.rb

@@ -7,4 +7,3 @@ Airborne.configure do |config|
   config.base_url = 'http://www.example.com'
   config.include StubHelper
 end
-

data/spec/stub_helper.rb

@@ -1,7 +1,6 @@
 require 'webmock/rspec'
 
 module StubHelper
-
   def initialize(*args)
     @base_url = 'http://www.example.com/'
   end
@@ -39,7 +38,7 @@ module StubHelper
 
   private
 
-    def get_json_response_file(name)
-      IO.read(File.join('spec/test_responses', name + ".json"))
-    end
+  def get_json_response_file(name)
+    IO.read(File.join('spec/test_responses', name + '.json'))
+  end
 end