@@ -12,8 +12,8 @@ begin gem.authors = ["Jon Larkowski", "Sandro Turriate", "Wolfram Arnold", "Corey Grusden"] gem.add_dependency 'httparty', '>= 0.4.2' gem.add_development_dependency "activesupport", '>= 2.3.3' - gem.add_development_dependency "rspec", '>= 1.2.8' - gem.add_development_dependency 'thoughtbot-factory_girl', '>= 1.2.2' + gem.add_development_dependency "rspec", '>= 1.2.9' + gem.add_development_dependency 'factory_girl', '>= 1.2.3' end rescue LoadError puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler" Rakefile @@ -138,10 +138,12 @@ module Mousetrap def update if subscription - self.class.put_resource 'customers', 'edit', code, attributes_for_api_with_subscription + response = self.class.put_resource 'customers', 'edit', code, attributes_for_api_with_subscription else - self.class.put_resource 'customers', 'edit-customer', code, attributes_for_api + response = self.class.put_resource 'customers', 'edit-customer', code, attributes_for_api end + + raise response['error'] if response['error'] end end end lib/mousetrap/customer.rb @@ -188,8 +188,7 @@ describe Mousetrap::Customer do # We don't send code for existing API resources. attributes_for_api.delete(:code) - @customer.class.should_receive(:put_resource).with( - 'customers', 'edit', @customer.code, attributes_for_api) + @customer.class.should_receive(:put_resource).with('customers', 'edit', @customer.code, attributes_for_api).and_return({:id => 'some_id'}) @customer.save end end @@ -204,8 +203,7 @@ describe Mousetrap::Customer do attributes_for_api.delete(:subscription) @customer.subscription = nil - @customer.class.should_receive(:put_resource).with( - 'customers', 'edit-customer', @customer.code, attributes_for_api) + @customer.class.should_receive(:put_resource).with('customers', 'edit-customer', @customer.code, attributes_for_api).and_return({:id => 'some_id'}) @customer.save end end @@ -251,7 +249,7 @@ describe Mousetrap::Customer do @customer.send :create end - it "raises error is CheddarGetter reports one" do + it "raises error if CheddarGetter reports one" do @customer.class.stub :post_resource => {'error' => 'some error message'} expect { @customer.send(:create) }.to raise_error('some error message') end @@ -275,6 +273,31 @@ describe Mousetrap::Customer do @customer.send(:create).should == { :some => :response } end end + + describe "#update" do + context "when there's a subscription instance" do + let(:customer) { Mousetrap::Customer.new :code => 'some code' } + + it "puts the customer with subscription when there's a subscription instance" do + customer.stub :subscription => stub + customer.stub :attributes_for_api_with_subscription => 'some attributes with subscription' + customer.class.should_receive(:put_resource).with('customers', 'edit', 'some code', 'some attributes with subscription').and_return({:id => 'some_id'}) + customer.send :update + end + + it "puts just the customer when no subscription instance" do + customer.stub :subscription => nil + customer.stub :attributes_for_api => 'some attributes' + customer.class.should_receive(:put_resource).with('customers', 'edit-customer', 'some code', 'some attributes').and_return({:id => 'some_id'}) + customer.send :update + end + + it "raises error if CheddarGetter reports one" do + customer.class.stub :put_resource => {'error' => 'some error message'} + expect { customer.send(:update) }.to raise_error('some error message') + end + end + end end end spec/mousetrap/customer_spec.rb 9852e6adea3b82c6ec471455e295bdaf1a045582 Jon Larkowski jonlarkowski@gmail.com http://github.com/hashrocket/mousetrap/commit/237de86ac4a04e31b3d63d1c2e7bca139d32394c 237de86ac4a04e31b3d63d1c2e7bca139d32394c 2009-10-18T18:06:15-07:00 2009-10-18T18:06:15-07:00 Add error handling to Customer update Also, started using newest RSpec and Factory Girl. bcdfdc4fc9f4d414b44470275fbef640369a13cb Jon Larkowski jonlarkowski@gmail.com