squall 1.2.1beta1 → 1.3.0

data/spec/squall/network_zone_spec.rb

@@ -8,7 +8,7 @@ describe Squall::NetworkZone do
 
   describe "#list" do
     use_vcr_cassette "network_zones/list"
-    
+
     it "returns all network zones" do
       network_zoness = @network_zone.list
       network_zoness.should be_an(Array)
@@ -19,30 +19,26 @@ describe Squall::NetworkZone do
       network_zoness.all? {|w| w.is_a?(Hash) }.should be_true
     end
   end
-  
+
   describe "#show" do
     use_vcr_cassette "network_zones/show"
     it "requires an id" do
       expect { @network_zone.show }.to raise_error(ArgumentError)
     end
 
-    it "returns not found for invalid network zone id" do
-      expect { @network_zone.show(404) }.to raise_error(Squall::NotFoundError)
-    end
-
     it "returns a network zone" do
       network_zones = @network_zone.show(1)
       network_zones.should be_a(Hash)
     end
   end
-  
+
   describe "#create" do
     use_vcr_cassette "network_zones/create"
     it "requires label" do
       invalid = @valid.reject{|k,v| k == :label }
       requires_attr(:label) { @network_zone.create(invalid) }
     end
-    
+
     it "raises error on unknown params" do
       expect { @network_zone.create(@valid.merge(:what => 'what')) }.to raise_error(ArgumentError, 'Unknown params: what')
     end
@@ -52,10 +48,10 @@ describe Squall::NetworkZone do
       @network_zone.success.should be_true
     end
   end
-  
+
   describe "#edit" do
     use_vcr_cassette "network_zones/edit"
-    
+
     it "allows select params" do
       optional = [:label]
       @network_zone.should_receive(:request).exactly(optional.size).times.and_return Hash.new()
@@ -63,7 +59,7 @@ describe Squall::NetworkZone do
         @network_zone.edit(1, param => "test")
       end
     end
-    
+
     it "raises error on unknown params" do
       expect { @network_zone.edit(1, @valid.merge(:what => 'what')) }.to raise_error(ArgumentError, 'Unknown params: what')
     end
@@ -72,12 +68,8 @@ describe Squall::NetworkZone do
       @network_zone.edit(1, :label => "Updated zone")
       @network_zone.success.should be_true
     end
-    
-    it "raises an error for an invalid network zone id" do
-      expect { @network_zone.edit(404, @valid) }.to raise_error(Squall::NotFoundError)
-    end
   end
-  
+
   describe "#delete" do
     use_vcr_cassette "network_zones/delete"
     it "requires an id" do
@@ -88,56 +80,36 @@ describe Squall::NetworkZone do
       @network_zone.delete(1)
       @network_zone.success.should be_true
     end
-
-    it "returns NotFound for invalid network zone id" do
-      expect { @network_zone.delete(404) }.to raise_error(Squall::NotFoundError)
-    end
   end
 
   describe "#attach" do
     use_vcr_cassette "network_zones/attach"
-    
+
     it "requires an id" do
       expect { @network_zone.attach }.to raise_error(ArgumentError)
     end
-    
+
     it "requires a network id" do
       expect { @network_zone.attach(1) }.to raise_error(ArgumentError)
     end
-    
-    it "returns NotFound error for invalid id" do
-      expect { @network_zone.attach(404, 1) }.to raise_error(Squall::NotFoundError)
-    end
-    
-    it "returns NotFound error for invalid network id" do
-      expect { @network_zone.attach(1, 404) }.to raise_error(Squall::NotFoundError)
-    end
-    
+
     it "attaches a network to the network zone" do
       request = @network_zone.attach(1, 2)
       @network_zone.success.should be_true
     end
   end
-  
+
   describe "#detach" do
     use_vcr_cassette "network_zones/detach"
-    
+
     it "requires an id" do
       expect { @network_zone.detach }.to raise_error(ArgumentError)
     end
-    
+
     it "requires a network id" do
       expect { @network_zone.detach(1) }.to raise_error(ArgumentError)
     end
-    
-    it "returns NotFound error for invalid id" do
-      expect { @network_zone.detach(404, 1) }.to raise_error(Squall::NotFoundError)
-    end
-    
-    it "returns NotFound error for invalid network id" do
-      expect { @network_zone.detach(1, 404) }.to raise_error(Squall::NotFoundError)
-    end
-    
+
     it "detaches a network to the network zone" do
       request = @network_zone.detach(1, 2)
       @network_zone.success.should be_true

data/spec/squall/payment_spec.rb

@@ -9,11 +9,11 @@ describe Squall::Payment do
 
   describe "#list" do
     use_vcr_cassette "payment/list"
-    
+
     it "requires user id" do
       expect { @payment.list }.to raise_error(ArgumentError)
     end
-    
+
     it "returns a user list" do
       payments = @payment.list(1)
       payments.should be_an(Array)
@@ -24,14 +24,14 @@ describe Squall::Payment do
       payment.should be_a(Hash)
     end
   end
-  
+
   describe "#create" do
     use_vcr_cassette "payment/create"
     it "requires amount" do
       invalid = @valid.reject{|k,v| k == :amount }
       requires_attr(:amount) { @payment.create(1, invalid) }
     end
-    
+
     it "allows all optional params" do
       optional = [:invoice_number]
       @payment.should_receive(:request).exactly(optional.size).times.and_return Hash.new("payment" => {})
@@ -39,24 +39,20 @@ describe Squall::Payment do
         @payment.create(1, @valid.merge(param => "test"))
       end
     end
-    
+
     it "raises error on unknown params" do
       expect { @payment.create(1, @valid.merge(:what => 'what')) }.to raise_error(ArgumentError, 'Unknown params: what')
     end
-    
-    it "raises an error for an invalid user id" do
-      expect { @payment.create(404, @valid) }.to raise_error(Squall::NotFoundError)
-    end
 
     it "creates a payment for a user" do
       user = @payment.create(1, @valid)
       @payment.success.should be_true
     end
   end
-  
+
   describe "#edit" do
     use_vcr_cassette "payment/edit"
-    
+
     it "allows select params" do
       optional = [:amount, :invoice_number]
       @payment.should_receive(:request).exactly(optional.size).times.and_return Hash.new()
@@ -64,7 +60,7 @@ describe Squall::Payment do
         @payment.edit(1, 1, param => "test")
       end
     end
-    
+
     it "raises error on unknown params" do
       expect { @payment.edit(1, 1, :what => 'what') }.to raise_error(ArgumentError, 'Unknown params: what')
     end
@@ -73,12 +69,8 @@ describe Squall::Payment do
       user = @payment.edit(1, 1, :amount => 100)
       @payment.success.should be_true
     end
-    
-    it "raises an error for an invalid payment id" do
-      expect { @payment.edit(1, 404, @valid) }.to raise_error(Squall::NotFoundError)
-    end
   end
-  
+
   describe "#delete" do
     use_vcr_cassette "payment/delete"
     it "requires an id" do
@@ -89,10 +81,5 @@ describe Squall::Payment do
       @payment.delete(1, 1)
       @payment.success.should be_true
     end
-
-    it "returns NotFound for missing user" do
-      expect { @payment.delete(1, 404) }.to raise_error(Squall::NotFoundError)
-    end
   end
-
 end

data/spec/squall/role_spec.rb

@@ -19,10 +19,6 @@ describe Squall::Role do
       expect { @role.show }.to raise_error(ArgumentError)
     end
 
-    it "returns 404 for invalid id" do
-      expect { @role.show(404) }.to raise_error(Squall::NotFoundError)
-    end
-
     it "returns a role" do
       role = @role.show(1)
       role.should be_a(Hash)
@@ -35,10 +31,6 @@ describe Squall::Role do
       expect { @role.edit }.to raise_error(ArgumentError)
     end
 
-    it "returns 404 for invalid id" do
-      expect { @role.edit(404) }.to raise_error(Squall::NotFoundError)
-    end
-
     it "allows all optional params" do
       optional = [:label, :permission_ids]
       optional.each do |param|
@@ -62,10 +54,6 @@ describe Squall::Role do
       expect { @role.delete }.to raise_error(ArgumentError)
     end
 
-    it "returns not found for invalid user" do
-      expect { @role.delete(5) }.to raise_error(Squall::NotFoundError)
-    end
-
     it "returns a role" do
       role = @role.delete(3)
       @role.success.should be_true
@@ -74,17 +62,17 @@ describe Squall::Role do
 
   describe "#permissions" do
     use_vcr_cassette "role/permissions"
-    
+
     it "returns permissions" do
       permissions = @role.permissions
       permissions.should be_an(Array)
     end
-    
+
     it "contains role data" do
       permissions = @role.permissions
       permissions.all?.should be_true
     end
-    
+
   end
 
   describe "#create" do
@@ -93,7 +81,7 @@ describe Squall::Role do
     it "requires label" do
       requires_attr(:label) { @role.create }
     end
-    
+
     it "allows permission_ids" do
       @role.should_receive(:request).once.and_return Hash.new('role' => [])
       @role.create(:label => "test", :permission_ids => 1)

data/spec/squall/support/base_spec.rb

@@ -23,21 +23,27 @@ describe Squall::Base do
     end
 
     it "raises NotFound for 404s" do
-      mock_request(:get, '/404', :status => [404, "NotFound"])
-      expect { @base.request(:get, '/404') }.to raise_error(Squall::NotFoundError)
+      mock_request(:get, '/404', :status => [404, "NotFound"], :body => "{\"errors\":[\"Resource not found\"]}")
+      @base.request(:get, '/404')
+
       @base.success.should be_false
+      @base.result.should == { "errors" => ["Resource not found"] }
     end
 
     it "raises ServerError on errors" do
-      mock_request(:get, '/500', :status => [500, "Internal Server Error"])
-      expect { @base.request(:get, '/500') }.to raise_error(Squall::ServerError)
+      mock_request(:get, '/500', :status => [500, "Internal Server Error"], :body => "{\"errors\":[\"Internal Server Error\"]}")
+      @base.request(:get, '/500')
+
       @base.success.should be_false
+      @base.result.should == { "errors" => ["Internal Server Error"] }
     end
 
     it "raises RequestError on errors" do
-      mock_request(:get, '/422', :status => [422, "Unprocessable"])
-      expect { @base.request(:get, '/422') }.to raise_error(Squall::ClientError)
+      mock_request(:get, '/422', :status => [422, "Unprocessable"], :body => "{\"errors\":[\"Unprocessable\"]}")
+      @base.request(:get, '/422')
+
       @base.success.should be_false
+      @base.result.should == { "errors" => ["Unprocessable"] }
     end
 
     it "is a sad panda when the config hasn't been specified" do
@@ -59,7 +65,7 @@ describe Squall::Base do
 
     it "merges the query in" do
       expected = {
-        :query => { 
+        :query => {
           :base => {:one => 1, :two => 2}
         }
       }
@@ -70,7 +76,7 @@ describe Squall::Base do
       base_test = CamelTest.new
       base_test.default_params.should == {}
       expected = {
-        :query => { 
+        :query => {
           :camel_test => {:one => 1, :two => 2}
         }
       }
@@ -92,11 +98,11 @@ describe Squall::Base do
     it "converts Subclass::Test to :test" do
       sub_class = Subclass::Test.new
       sub_class.key_for_class.should == :test
-    end 
+    end
 
     it "converts Subclass::CamelTest to :camel_test" do
       camel_test = Subclass::CamelTest.new
       camel_test.key_for_class.should == :camel_test
-    end 
+    end
   end
 end

data/spec/squall/template_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 describe Squall::Template do
   before(:each) do
     @template = Squall::Template.new
-    @keys = ["label", "operating_system_distro", "operating_system_arch", "created_at", 
-      "operating_system_tail", "operating_system", "updated_at", "operating_system_edition", 
-      "allowed_swap", "allow_resize_without_reboot", "virtualization", "id", "file_name", 
+    @keys = ["label", "operating_system_distro", "operating_system_arch", "created_at",
+      "operating_system_tail", "operating_system", "updated_at", "operating_system_edition",
+      "allowed_swap", "allow_resize_without_reboot", "virtualization", "id", "file_name",
       "checksum", "version", "user_id", "template_size", "allowed_hot_migrate", "min_disk_size", "state"]
   end
 
@@ -29,11 +29,6 @@ describe Squall::Template do
       @template.success.should be_false
     end
 
-    it "404s on not found" do
-      expect { @template.make_public(404) }.to raise_error(Squall::NotFoundError)
-      @template.success.should be_false
-    end
-
     it "makes the template public" do
       pub = @template.make_public(1)
       @template.success.should be_true

data/spec/squall/transaction_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe Squall::Transaction do
   before(:each) do
     @transaction = Squall::Transaction.new
-    @keys = ["pid", "created_at", "updated_at", "actor", "priority", 
-      "parent_type", "action", "id", "user_id", "dependent_transaction_id", 
+    @keys = ["pid", "created_at", "updated_at", "actor", "priority",
+      "parent_type", "action", "id", "user_id", "dependent_transaction_id",
       "allowed_cancel", "parent_id", "params", "log_output", "status", "identifier"
     ]
   end
@@ -26,10 +26,6 @@ describe Squall::Transaction do
       expect { @transaction.show }.to raise_error(ArgumentError)
     end
 
-    it "returns not found for invalid" do
-      expect { @transaction.show(5) }.to raise_error(Squall::NotFoundError)
-    end
-
     it "returns a transaction" do
       transaction = @transaction.show(1)
       transaction.keys.should include(*@keys)

data/spec/squall/user_group_spec.rb

@@ -9,7 +9,7 @@ describe Squall::UserGroup do
 
   describe "#list" do
     use_vcr_cassette "user_group/list"
-    
+
     it "returns a list of user groups" do
       user_groups = @user_group.list
       user_groups.should be_an(Array)
@@ -20,14 +20,14 @@ describe Squall::UserGroup do
       user_group.should be_a(Hash)
     end
   end
-  
+
   describe "#create" do
     use_vcr_cassette "user_group/create"
     it "requires label" do
       invalid = @valid.reject{|k,v| k == :label }
       requires_attr(:label) { @user_group.create(invalid) }
     end
-    
+
     it "raises error on unknown params" do
       expect { @user_group.create(@valid.merge(:what => 'what')) }.to raise_error(ArgumentError, 'Unknown params: what')
     end
@@ -37,10 +37,10 @@ describe Squall::UserGroup do
       @user_group.success.should be_true
     end
   end
-  
+
   describe "#edit" do
     use_vcr_cassette "user_group/edit"
-    
+
     it "raises error on unknown params" do
       expect { @user_group.edit(1, :what => 'what') }.to raise_error(ArgumentError, 'Unknown params: what')
     end
@@ -49,12 +49,8 @@ describe Squall::UserGroup do
       @user_group.edit(1, @valid)
       @user_group.success.should be_true
     end
-    
-    it "raises an error for an invalid user group id" do
-      expect { @user_group.edit(404, @valid) }.to raise_error(Squall::NotFoundError)
-    end
   end
-  
+
   describe "#delete" do
     use_vcr_cassette "user_group/delete"
     it "requires an id" do
@@ -65,10 +61,6 @@ describe Squall::UserGroup do
       @user_group.delete(1)
       @user_group.success.should be_true
     end
-
-    it "returns NotFound for missing user" do
-      expect { @user_group.delete(404) }.to raise_error(Squall::NotFoundError)
-    end
   end
 
 end

data/spec/squall/user_spec.rb

@@ -27,22 +27,22 @@ describe Squall::User do
       invalid = @valid.reject{|k,v| k == :password }
       requires_attr(:password) { @user.create(invalid) }
     end
-    
+
     it "requires password confirmation" do
       invalid = @valid.reject{|k,v| k == :password_confirmation }
       requires_attr(:password_confirmation) { @user.create(invalid) }
     end
-    
+
     it "requires first name" do
       invalid = @valid.reject{|k,v| k == :first_name }
       requires_attr(:first_name) { @user.create(invalid) }
     end
-    
+
     it "requires last name" do
       invalid = @valid.reject{|k,v| k == :last_name }
       requires_attr(:last_name) { @user.create(invalid) }
     end
-    
+
     it "allows all optional params" do
       optional = [:role, :time_zone, :locale, :status, :billing_plan_id, :role_ids, :suspend_after_hours, :suspend_at]
       @user.should_receive(:request).exactly(optional.size).times.and_return Hash.new("user" => {})
@@ -50,7 +50,7 @@ describe Squall::User do
         @user.create(@valid.merge(param => "test"))
       end
     end
-    
+
     it "raises error on unknown params" do
       expect { @user.create(@valid.merge(:what => 'what')) }.to raise_error(ArgumentError, 'Unknown params: what')
     end
@@ -60,10 +60,10 @@ describe Squall::User do
       @user.success.should be_true
     end
   end
-  
+
   describe "#edit" do
     use_vcr_cassette "user/edit"
-    
+
     it "allows select params" do
       optional = [:email, :password, :password_confirmation, :first_name, :last_name, :user_group_id, :billing_plan_id, :role_ids, :suspend_at]
       @user.should_receive(:request).exactly(optional.size).times.and_return Hash.new()
@@ -71,7 +71,7 @@ describe Squall::User do
         @user.edit(1, param => "test")
       end
     end
-    
+
     it "raises error on unknown params" do
       expect { @user.edit(1, :what => 'what') }.to raise_error(ArgumentError, 'Unknown params: what')
     end
@@ -101,10 +101,6 @@ describe Squall::User do
       expect { @user.show }.to raise_error(ArgumentError)
     end
 
-    it "returns not found for invalid users" do
-      expect { @user.show(404) }.to raise_error(Squall::NotFoundError)
-    end
-
     it "returns a user" do
       user = @user.show(1)
       user.should be_a(Hash)
@@ -161,10 +157,6 @@ describe Squall::User do
       @user.delete(1)
       @user.success.should be_true
     end
-
-    it "returns NotFound for missing user" do
-      expect { @user.delete(404) }.to raise_error(Squall::NotFoundError)
-    end
   end
 
   describe "#stats" do
@@ -178,7 +170,7 @@ describe Squall::User do
       stats.should be_an(Array)
     end
   end
-  
+
   describe "#monthly_bills" do
     use_vcr_cassette "user/monthly_bills"
     it "requires an id" do
@@ -197,44 +189,30 @@ describe Squall::User do
       expect { @user.virtual_machines }.to raise_error(ArgumentError)
     end
 
-    it "404s on not found" do
-      expect { @user.virtual_machines(404) }.to raise_error(Squall::NotFoundError)
-    end
-
     it "returns the virtual_machines" do
       virtual_machines = @user.virtual_machines(1)
       virtual_machines.should be_an(Array)
     end
   end
-  
+
   describe "#hypervisors" do
     use_vcr_cassette "user/hypervisors"
     it "requires an id" do
       expect { @user.hypervisors }.to raise_error(ArgumentError)
     end
 
-    it "404s on not found" do
-      expect { @user.hypervisors(404) }.to raise_error(Squall::NotFoundError)
-    end
-
     it "returns the virtual_machines" do
       hypervisors = @user.hypervisors(1)
       hypervisors.should be_an(Array)
     end
   end
-  
+
   describe "#data_store_zones" do
     use_vcr_cassette "user/data_store_zones"
     it "requires an id" do
       expect { @user.data_store_zones }.to raise_error(ArgumentError)
     end
 
-    it "404s on not found" do
-      pending "Broken on OnApp: returns success despite non-existent user" do
-        expect { @user.data_store_zones(2532564353245) }.to raise_error(Squall::NotFoundError)
-      end
-    end
-
     it "returns the virtual_machines" do
       data_store_zones = @user.data_store_zones(1)
       data_store_zones.should be_an(Array)
@@ -247,12 +225,6 @@ describe Squall::User do
       expect { @user.network_zones }.to raise_error(ArgumentError)
     end
 
-    it "404s on not found" do
-      pending "Broken on OnApp: returns success despite non-existent user" do
-        expect { @user.network_zones(2532564353245) }.to raise_error(Squall::NotFoundError)
-      end
-    end
-
     it "returns the network_zones" do
       network_zones = @user.network_zones(1)
       network_zones.should be_an(Array)
@@ -265,14 +237,10 @@ describe Squall::User do
       expect { @user.limits }.to raise_error(ArgumentError)
     end
 
-    it "404s on not found" do
-      expect { @user.limits(438768534623) }.to raise_error(Squall::NotFoundError)
-    end
-
     it "returns the limits" do
       limits = @user.limits(1)
       limits.should be_a(Hash)
     end
   end
-  
+
 end