airborne 0.1.15 → 0.1.16

data/spec/airborne/delete_spec.rb

@@ -4,6 +4,6 @@ describe 'delete' do
   it 'should allow testing on delete requests' do
     mock_delete 'simple_delete'
     delete '/simple_delete'
-    expect_status(200)
+    expect_status 200
   end
-end
+end

data/spec/airborne/expectations/expect_header_contains_spec.rb

@@ -1,23 +1,21 @@
 require 'spec_helper'
 
 describe 'expect header contains' do
-
   it 'should ensure partial header match exists' do
-    mock_get('simple_get', {'Content-Type' => 'application/json'})
+    mock_get('simple_get', 'Content-Type' => 'application/json')
     get '/simple_get'
     expect_header_contains(:content_type, 'json')
   end
 
   it 'should ensure header is present' do
-    mock_get('simple_get', {'Content-Type' => 'application/json'})
+    mock_get('simple_get', 'Content-Type' => 'application/json')
     get '/simple_get'
-    expect{expect_header_contains(:foo, 'bar')}.to raise_error
+    expect { expect_header_contains(:foo, 'bar') }.to raise_error
   end
 
   it 'should ensure partial header is present' do
-    mock_get('simple_get', {'Content-Type' => 'application/json'})
+    mock_get('simple_get', 'Content-Type' => 'application/json')
     get '/simple_get'
-    expect{expect_header_contains(:content_type, 'bar')}.to raise_error
+    expect { expect_header_contains(:content_type, 'bar') }.to raise_error
   end
-  
-end
+end

data/spec/airborne/expectations/expect_header_spec.rb

@@ -1,24 +1,21 @@
 require 'spec_helper'
 
 describe 'expect header' do
-
   it 'should find exact match for header content' do
-    mock_get('simple_get', {'Content-Type' => 'application/json'})
+    mock_get('simple_get', 'Content-Type' => 'application/json')
     get '/simple_get'
     expect_header(:content_type, 'application/json')
   end
 
   it 'should find exact match for header content' do
-    mock_get('simple_get', {'Content-Type' => 'json'})
+    mock_get('simple_get', 'Content-Type' => 'json')
     get '/simple_get'
-    expect{expect_header(:content_type, 'application/json')}.to raise_error
+    expect { expect_header(:content_type, 'application/json') }.to raise_error
   end
 
   it 'should ensure correct headers are present' do
-    mock_get('simple_get', {'Content-Type' => 'application/json'})
+    mock_get('simple_get', 'Content-Type' => 'application/json')
     get '/simple_get'
-    expect{expect_header(:foo, 'bar')}.to raise_error
+    expect { expect_header(:foo, 'bar') }.to raise_error
   end
-
 end
-

data/spec/airborne/expectations/expect_json_keys_path_spec.rb

@@ -1,17 +1,15 @@
 require 'spec_helper'
 
 describe 'expect_json_keys with path' do
-
   it 'should ensure json keys with path' do
     mock_get('simple_nested_path')
     get '/simple_nested_path', {}
     expect_json_keys('address', [:street, :city])
-  end 
+  end
 
   it 'should fail when keys are missing with path' do
     mock_get('simple_nested_path')
     get '/simple_nested_path', {}
-    expect{expect_json_keys('address', [:bad])}.to raise_error
-  end   
-     
-end
+    expect { expect_json_keys('address', [:bad]) }.to raise_error
+  end
+end

data/spec/airborne/expectations/expect_json_keys_spec.rb

@@ -1,23 +1,21 @@
 require 'spec_helper'
 
 describe 'expect_json_keys' do
-  
   it 'should fail when json keys are missing' do
     mock_get('simple_json')
     get '/simple_json', {}
-    expect{expect_json_keys([:foo, :bar, :baz, :bax])}.to raise_error
+    expect { expect_json_keys([:foo, :bar, :baz, :bax]) }.to raise_error
   end
 
   it 'should ensure correct json keys' do
     mock_get('simple_json')
     get '/simple_json', {}
     expect_json_keys([:foo, :bar, :baz])
-  end 
+  end
 
   it 'should ensure correct partial json keys' do
     mock_get('simple_json')
     get '/simple_json', {}
     expect_json_keys([:foo, :bar])
   end
-   
-end
+end

data/spec/airborne/expectations/expect_json_lambda_spec.rb

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

data/spec/airborne/expectations/expect_json_path_spec.rb

@@ -1,109 +1,108 @@
 require 'spec_helper'
 
 describe 'expect_json with path' do
+  it 'should allow simple path and verify only that path' do
+    mock_get('simple_path_get')
+    get '/simple_path_get'
+    expect_json('address', street: 'Area 51', city: 'Roswell', state: 'NM')
+  end
+
+  it 'should allow nested paths' do
+    mock_get('simple_nested_path')
+    get '/simple_nested_path'
+    expect_json('address.coordinates', lattitude: 33.3872, longitutde: 104.5281)
+  end
 
-	it 'should allow simple path and verify only that path' do
-		mock_get('simple_path_get')
-		get '/simple_path_get'
-		expect_json('address', {street: "Area 51", city: "Roswell", state: "NM"})
-	end
-
-	it 'should allow nested paths' do
-		mock_get('simple_nested_path')
-		get '/simple_nested_path'
-		expect_json('address.coordinates', {lattitude: 33.3872, longitutde: 104.5281} )
-	end
-
-	it 'should index into array and test against specific element' do
-		mock_get('array_with_index')
-		get '/array_with_index'
-		expect_json('cars.0', {make: "Tesla", model: "Model S"})
-	end
-
-	it 'should test against all elements in the array' do
-		mock_get('array_with_index')
-		get '/array_with_index'
-		expect_json('cars.?', {make: "Tesla", model: "Model S"})
-		expect_json('cars.?', {make: "Lamborghini", model: "Aventador"})
-	end
-
-	it 'should test against properties in the array' do
-		mock_get('array_with_index')
-		get '/array_with_index'
-		expect_json('cars.?.make', "Tesla")
-	end
-
-	it 'should ensure at least one match' do
-		mock_get('array_with_index')
-		get '/array_with_index'
-		expect{expect_json('cars.?.make', "Teslas")}.to raise_error
-	end
-
-	it 'should check for at least one match' do
+  it 'should index into array and test against specific element' do
+    mock_get('array_with_index')
+    get '/array_with_index'
+    expect_json('cars.0', make: 'Tesla', model: 'Model S')
+  end
+
+  it 'should test against all elements in the array' do
+    mock_get('array_with_index')
+    get '/array_with_index'
+    expect_json('cars.?', make: 'Tesla', model: 'Model S')
+    expect_json('cars.?', make: 'Lamborghini', model: 'Aventador')
+  end
+
+  it 'should test against properties in the array' do
+    mock_get('array_with_index')
+    get '/array_with_index'
+    expect_json('cars.?.make', 'Tesla')
+  end
+
+  it 'should ensure at least one match' do
+    mock_get('array_with_index')
+    get '/array_with_index'
+    expect { expect_json('cars.?.make', 'Teslas') }.to raise_error
+  end
+
+  it 'should check for at least one match' do
     mock_get('array_with_nested')
     get '/array_with_nested'
-    expect_json('cars.?.owners.?', {name: "Bart Simpson"})
+    expect_json('cars.?.owners.?', name: 'Bart Simpson')
   end
 
   it 'should ensure at least one match' do
     mock_get('array_with_nested')
     get '/array_with_nested'
-    expect{expect_json('cars.?.owners.?', {name: "Bart Simpsons"})}.to raise_error
+    expect { expect_json('cars.?.owners.?', name: 'Bart Simpsons') }.to raise_error
   end
 
   it 'should check for one match that matches all ' do
     mock_get('array_with_nested')
     get '/array_with_nested'
-    expect_json('cars.?.owners.*', {name: "Bart Simpson"})
+    expect_json('cars.?.owners.*', name: 'Bart Simpson')
   end
 
   it 'should check for one match that matches all with lambda' do
     mock_get('array_with_nested')
     get '/array_with_nested'
-    expect_json('cars.?.owners.*', {name: ->(name){expect(name).to eq("Bart Simpson")}})
+    expect_json('cars.?.owners.*', name: ->(name) { expect(name).to eq('Bart Simpson') })
   end
 
   it 'should ensure one match that matches all with lambda' do
     mock_get('array_with_nested')
     get '/array_with_nested'
-    expect{expect_json('cars.?.owners.*', {name: ->(name){expect(name).to eq("Bart Simpsons")}})}.to raise_error
+    expect { expect_json('cars.?.owners.*', name: ->(name) { expect(name).to eq('Bart Simpsons') }) }.to raise_error
   end
 
   it 'should ensure one match that matches all' do
     mock_get('array_with_nested')
     get '/array_with_nested'
-    expect{expect_json('cars.?.owners.*', {name: "Bart Simpsons"})}.to raise_error
+    expect { expect_json('cars.?.owners.*', name: 'Bart Simpsons') }.to raise_error
   end
 
-	it 'should allow indexing' do
+  it 'should allow indexing' do
     mock_get('array_with_nested')
     get '/array_with_nested'
-    expect_json('cars.0.owners.0', {name: "Bart Simpson"})
-  end
-
-	it 'should allow strings (String) to be tested against a path' do
-		mock_get('simple_nested_path')
-		get '/simple_nested_path'
-		expect_json('address.city', "Roswell" )
-	end
-
-	it 'should allow floats (Float) to be tested against a path' do
-		mock_get('simple_nested_path')
-		get '/simple_nested_path'
-		expect_json('address.coordinates.lattitude', 33.3872 )
-	end
-
-	it 'should allow integers (Fixnum, Bignum) to be tested against a path' do
-		mock_get('simple_get')
-		get '/simple_get'
-		expect_json('age', 32 )
-	end
-
-	it "should raise ExpectationError when expectation expects an object instead of value" do 
-		mock_get('array_with_index')
-		get '/array_with_index'
-		expect do
-			expect_json('cars.0.make', {make: "Tesla"})
-		end.to raise_error(Airborne::ExpectationError, "Expected String Tesla\nto be an object with property make")
-	end
+    expect_json('cars.0.owners.0', name: 'Bart Simpson')
+  end
+
+  it 'should allow strings (String) to be tested against a path' do
+    mock_get('simple_nested_path')
+    get '/simple_nested_path'
+    expect_json('address.city', 'Roswell')
+  end
+
+  it 'should allow floats (Float) to be tested against a path' do
+    mock_get('simple_nested_path')
+    get '/simple_nested_path'
+    expect_json('address.coordinates.lattitude', 33.3872)
+  end
+
+  it 'should allow integers (Fixnum, Bignum) to be tested against a path' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect_json('age', 32)
+  end
+
+  it 'should raise ExpectationError when expectation expects an object instead of value' do
+    mock_get('array_with_index')
+    get '/array_with_index'
+    expect do
+      expect_json('cars.0.make', make: 'Tesla')
+    end.to raise_error(Airborne::ExpectationError, "Expected String Tesla\nto be an object with property make")
+  end
 end

data/spec/airborne/expectations/expect_json_regex_spec.rb

@@ -1,35 +1,33 @@
 require 'spec_helper'
 
 describe 'expect_json regex' do
+  it 'should test against regex' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect_json(name: regex('^A'))
+  end
 
-	it 'should test against regex' do
-		mock_get('simple_get')
-		get '/simple_get'
-		expect_json({name: regex("^A")})
-	end
+  it 'should raise an error if regex does not match' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect { expect_json(name: regex('^B')) }.to raise_error
+  end
 
-	it 'should raise an error if regex does not match' do
-		mock_get('simple_get')
-		get '/simple_get'
-		expect{expect_json({name: regex("^B")})}.to raise_error
-	end
+  it 'should allow regex(Regexp) to be tested against a path' do
+    mock_get('simple_nested_path')
+    get '/simple_nested_path'
+    expect_json('address.city', regex('^R'))
+  end
 
-	it 'should allow regex(Regexp) to be tested against a path' do
-		mock_get('simple_nested_path')
-		get '/simple_nested_path'
-		expect_json('address.city', regex("^R") )
-	end
+  it 'should allow testing regex against numbers directly' do
+    mock_get('simple_nested_path')
+    get '/simple_nested_path'
+    expect_json('address.coordinates.lattitude', regex('^3'))
+  end
 
-	it 'should allow testing regex against numbers directly' do
-		mock_get('simple_nested_path')
-		get '/simple_nested_path'
-		expect_json('address.coordinates.lattitude', regex("^3") )
-	end
-
-	it 'should allow testing regex against numbers in the hash' do
-		mock_get('simple_nested_path')
-		get '/simple_nested_path'
-		expect_json('address.coordinates', {lattitude: regex("^3")} )
-	end
-	
+  it 'should allow testing regex against numbers in the hash' do
+    mock_get('simple_nested_path')
+    get '/simple_nested_path'
+    expect_json('address.coordinates', lattitude: regex('^3'))
+  end
 end

data/spec/airborne/expectations/expect_json_sizes_spec.rb

@@ -1,17 +1,16 @@
 require 'spec_helper'
 
 describe 'expect_json_sizes' do
-
   it 'should detect sizes' do
     mock_get('array_of_values')
     get '/array_of_values'
-    expect_json_sizes({grades: 4, bad: 3, emptyArray: 0})
+    expect_json_sizes(grades: 4, bad: 3, emptyArray: 0)
   end
 
   it 'should allow full object graph' do
     mock_get('array_with_nested')
     get '/array_with_nested'
-    expect_json_sizes({cars: {0 => {owners: 1}, 1 => {owners: 1}}})
+    expect_json_sizes(cars: { 0 => { owners: 1 }, 1 => { owners: 1 } })
   end
 
   it 'should allow properties to be tested against a path' do
@@ -29,7 +28,6 @@ describe 'expect_json_sizes' do
   it 'should test against all elements in the array when path contains * AND expectation is a Hash' do
     mock_get('array_with_nested')
     get '/array_with_nested'
-    expect_json_sizes('cars.*', {owners: 1})
+    expect_json_sizes('cars.*', owners: 1)
   end
-
 end

data/spec/airborne/expectations/expect_json_spec.rb

@@ -1,23 +1,27 @@
 require 'spec_helper'
 
 describe 'expect_json' do
-
   it 'should ensure correct json values' do
     mock_get('simple_get')
     get '/simple_get'
-    expect_json({name: "Alex", age: 32 })
+    expect_json(name: 'Alex', age: 32)
   end
 
   it 'should fail when incorrect json is tested' do
     mock_get('simple_get')
     get '/simple_get'
-    expect{expect_json({bad: "data"})}.to raise_error   
+    expect { expect_json(bad: 'data') }.to raise_error
   end
-  
+
   it 'should allow full object graph' do
     mock_get('simple_path_get')
     get '/simple_path_get'
-    expect_json({name: "Alex", address: {street: "Area 51", city: "Roswell", state: "NM"}})
+    expect_json(name: 'Alex', address: { street: 'Area 51', city: 'Roswell', state: 'NM' })
   end
 
-end
+  it 'should ensure keys in hashes do match' do
+    mock_get('hash_property')
+    get '/hash_property'
+    expect { expect_json(person: { name: 'Alex', something: nil }) }.to raise_error
+  end
+end

data/spec/airborne/expectations/expect_json_types_date_spec.rb

@@ -2,28 +2,25 @@ require 'spec_helper'
 require 'date'
 
 describe 'expect_json_types with date' do
-	it 'should verify correct date types' do
-		mock_get('date_response')
-		get '/date_response'
+  it 'should verify correct date types' do
+    mock_get('date_response')
+    get '/date_response'
+    expect_json_types(createdAt: :date)
+  end
 
-		expect_json_types({createdAt: :date})
-	end
-
-	it 'should verify correct date types with path' do
-		mock_get('date_response')
-		get '/date_response'
-
-		expect_json_types("createdAt", :date)
-	end
+  it 'should verify correct date types with path' do
+    mock_get('date_response')
+    get '/date_response'
+    expect_json_types('createdAt', :date)
+  end
 end
 
 describe 'expect_json with date' do
-	it 'should verify correct date value' do
-		mock_get('date_response')
-		get '/date_response'
-
-		prev_day = DateTime.new(2014,10,19)
-		next_day = DateTime.new(2014,10,21)
-		expect_json({createdAt: date {|value| expect(value).to be_between(prev_day, next_day)}})		
-	end
-end
+  it 'should verify correct date value' do
+    mock_get('date_response')
+    get '/date_response'
+    prev_day = DateTime.new(2014, 10, 19)
+    next_day = DateTime.new(2014, 10, 21)
+    expect_json(createdAt: date { |value| expect(value).to be_between(prev_day, next_day) })
+  end
+end