active_fulfillment 2.1.9 → 3.0.0.pre2

data/test/remote/shipwire_test.rb

@@ -1,10 +1,12 @@
 require 'test_helper'
 
-class RemoteShipwireTest < Test::Unit::TestCase
+class RemoteShipwireTest < Minitest::Test
+  include ActiveFulfillment::Test::Fixtures
+
   def setup
-    Base.mode = :test
+    ActiveFulfillment::Base.mode = :test
 
-    @shipwire = ShipwireService.new( fixtures(:shipwire) )
+    @shipwire = ActiveFulfillment::ShipwireService.new(fixtures(:shipwire))
 
     @options = {
       :warehouse => 'LAX',
@@ -37,19 +39,17 @@ class RemoteShipwireTest < Test::Unit::TestCase
   end
 
   def test_invalid_credentials_during_fulfillment
-    shipwire = ShipwireService.new(
+    shipwire = ActiveFulfillment::ShipwireService.new(
       :login => 'your@email.com',
       :password => 'password')
 
-    response = shipwire.fulfill('123456', @us_address, @line_items, @options)
-    assert !response.success?
-    assert response.test?
-    assert_equal 'Error', response.params['status']
-    assert_equal "Could not verify Username/EmailAddress and Password combination", response.message
+    assert_raises(ActiveUtils::ResponseError, 'Failed with 401 Authorization Required') do
+      shipwire.fulfill(SecureRandom.uuid, @us_address, @line_items, @options)
+    end
   end
 
   def test_successful_order_submission_to_us
-    response = @shipwire.fulfill('123456', @us_address, @line_items, @options)
+    response = @shipwire.fulfill(SecureRandom.uuid, @us_address, @line_items, @options)
     assert response.success?
     assert response.test?
     assert response.params['transaction_id']
@@ -60,7 +60,7 @@ class RemoteShipwireTest < Test::Unit::TestCase
   end
 
   def test_successful_order_submission_to_uk
-    response = @shipwire.fulfill('123456', @uk_address, @line_items, @options)
+    response = @shipwire.fulfill(SecureRandom.uuid, @uk_address, @line_items, @options)
     assert response.success?
     assert response.test?
     assert response.params['transaction_id']
@@ -73,7 +73,7 @@ class RemoteShipwireTest < Test::Unit::TestCase
   def test_order_multiple_line_items
     @line_items.push({ :sku => 'AF0002', :quantity => 25 })
 
-    response = @shipwire.fulfill('123456', @us_address, @line_items, @options)
+    response = @shipwire.fulfill(SecureRandom.uuid, @us_address, @line_items, @options)
     assert response.success?
     assert response.test?
     assert response.params['transaction_id']
@@ -84,32 +84,32 @@ class RemoteShipwireTest < Test::Unit::TestCase
   end
 
   def test_no_sku_is_sent_with_fulfillment
-      options = {
-        :shipping_method => 'UPS Ground'
-      }
+    options = {
+      :shipping_method => 'UPS Ground'
+    }
 
     line_items = [ { :quantity => 1, :description => 'Libtech Snowboard' } ]
 
-    response = @shipwire.fulfill('123456', @us_address, line_items, options)
+    response = @shipwire.fulfill(SecureRandom.uuid, @us_address, line_items, options)
 
     assert response.success?
     assert response.test?
-    assert_not_nil response.params['transaction_id']
+    refute response.params['transaction_id'].blank?
     assert_equal "1", response.params['total_orders']
-    assert_equal "0", response.params['total_items']
+    assert_equal "1", response.params['total_items']
     assert_equal "0", response.params['status']
     assert_equal 'Successfully submitted the order', response.message
   end
 
   def test_invalid_credentials_during_inventory
-    shipwire = ShipwireService.new(
+    shipwire = ActiveFulfillment::ShipwireService.new(
                  :login => 'your@email.com',
                  :password => 'password'
                )
 
     response = shipwire.fetch_stock_levels
 
-    assert !response.success?
+    refute response.success?
     assert response.test?
     assert_equal 'Error', response.params['status']
     assert_equal "Error with Valid Username/EmailAddress and Password Required. There is an error in XML document.", response.message
@@ -128,15 +128,15 @@ class RemoteShipwireTest < Test::Unit::TestCase
     response = @shipwire.fetch_tracking_data(['123456'])
     assert response.success?
     assert response.test?
-    assert_equal Hash.new, response.tracking_numbers # no tracking numbers in testing
-    assert_equal Hash.new, response.tracking_companies
+    assert_instance_of Hash, response.tracking_numbers # {"40298"=>["9400110200793596422990"]}
+    assert_instance_of Hash, response.tracking_companies # {"40298"=>["USPS"]}
   end
 
   def test_fetch_tracking_numbers
     response = @shipwire.fetch_tracking_numbers(['123456'])
     assert response.success?
     assert response.test?
-    assert_equal Hash.new, response.tracking_numbers # no tracking numbers in testing
+    assert_instance_of Hash, response.tracking_numbers # {"40298"=>["9400110200793596422990"]}
   end
 
   def test_valid_credentials
@@ -144,10 +144,10 @@ class RemoteShipwireTest < Test::Unit::TestCase
   end
 
   def test_invalid_credentials
-    service = ShipwireService.new(
+    service = ActiveFulfillment::ShipwireService.new(
                 :login => 'your@email.com',
                 :password => 'password'
               )
-    assert !service.valid_credentials?
+    refute service.valid_credentials?
   end
 end

data/test/remote/webgistix_test.rb

@@ -1,10 +1,12 @@
 require 'test_helper'
 
-class RemoteWebgistixTest < Test::Unit::TestCase
+class RemoteWebgistixTest < Minitest::Test
+  include ActiveFulfillment::Test::Fixtures
+
   def setup
-    Base.mode = :test
+    ActiveFulfillment::Base.mode = :test
 
-    @service = WebgistixService.new( fixtures(:webgistix) )
+    @service = ActiveFulfillment::WebgistixService.new(fixtures(:webgistix))
 
     @options = {
       :shipping_method => 'Ground',
@@ -28,40 +30,37 @@ class RemoteWebgistixTest < Test::Unit::TestCase
   end
 
   def test_successful_order_submission
-    response = @service.fulfill('123456', @address, @line_items, @options)
+    response = @service.fulfill(SecureRandom.uuid, @address, @line_items, @options)
     assert response.success?
     assert response.test?
-    assert_equal WebgistixService::SUCCESS_MESSAGE, response.message
+    assert_equal ActiveFulfillment::WebgistixService::SUCCESS_MESSAGE, response.message
   end
 
   def test_order_multiple_line_items
-    @line_items.push(
-      { :sku => 'WX-01-1020',
-        :quantity => 3
-       }
-    )
+    @line_items.push(:sku => 'WX-01-1020', :quantity => 3)
 
-    response = @service.fulfill('123456', @address, @line_items, @options)
+    response = @service.fulfill(SecureRandom.uuid, @address, @line_items, @options)
     assert response.success?
     assert response.test?
-    assert_equal WebgistixService::SUCCESS_MESSAGE, response.message
+    assert_equal ActiveFulfillment::WebgistixService::SUCCESS_MESSAGE, response.message
   end
 
   def test_invalid_sku_during_fulfillment
     line_items = [ { :sku => 'invalid', :quantity => 1 } ]
-    response = @service.fulfill('123456', @address, line_items, @options)
-    assert !response.success?
+    response = @service.fulfill(SecureRandom.uuid, @address, line_items, @options)
+    refute response.success?
     assert response.test?
-    assert_equal WebgistixService::FAILURE_MESSAGE, response.message
+    assert_equal ActiveFulfillment::WebgistixService::FAILURE_MESSAGE, response.message
   end
 
   def test_invalid_credentials_during_fulfillment
-    service = WebgistixService.new(
+    service = ActiveFulfillment::WebgistixService.new(
       :login => 'your@email.com',
-      :password => 'password')
+      :password => 'password'
+    )
 
-    response = service.fulfill('123456', @address, @line_items, @options)
-    assert !response.success?
+    response = service.fulfill(SecureRandom.uuid, @address, @line_items, @options)
+    refute response.success?
     assert response.test?
     assert_equal "Invalid Credentials", response.message
   end
@@ -88,6 +87,7 @@ class RemoteWebgistixTest < Test::Unit::TestCase
       '1254658', 'FAItest123', 'Flat Rate Test Order 4'
     ])
     assert response.success?
+    p response
     assert_equal ['4209073191018052136352154'], response.tracking_numbers['1254658']
     assert_equal ['9101805213907472080032'],    response.tracking_numbers['Flat Rate Test Order 4']
     assert_nil response.tracking_numbers['FAItest123'] # 'Not Shipped'
@@ -98,10 +98,10 @@ class RemoteWebgistixTest < Test::Unit::TestCase
   end
 
   def test_invalid_credentials
-    service = WebgistixService.new(
+    service = ActiveFulfillment::WebgistixService.new(
       :login => 'your@email.com',
       :password => 'password')
 
-    assert !service.valid_credentials?
+    refute service.valid_credentials?
   end
 end

data/test/test_helper.rb

@@ -1,69 +1,44 @@
-#!/usr/bin/env ruby
-$:.unshift(File.dirname(__FILE__) + '/../lib')
+require 'bundler/setup'
 
-require 'rubygems'
-require 'bundler'
-Bundler.setup
-
-require 'minitest/autorun'
-require 'digest/md5'
 require 'active_fulfillment'
-require 'active_utils'
-require 'timecop'
 
+require 'minitest/autorun'
 require 'mocha/setup'
+require 'timecop'
 
 require 'logger'
-ActiveMerchant::Fulfillment::Service.logger = Logger.new(nil)
-
-module Test
-  module Unit
-    class TestCase < MiniTest::Unit::TestCase
-      include ActiveMerchant::Fulfillment
-
-      LOCAL_CREDENTIALS = ENV['HOME'] + '/.active_merchant/fixtures.yml' unless defined?(LOCAL_CREDENTIALS)
-      DEFAULT_CREDENTIALS = File.dirname(__FILE__) + '/fixtures.yml' unless defined?(DEFAULT_CREDENTIALS)
+ActiveFulfillment::Service.logger = Logger.new(nil)
 
-      def all_fixtures
-        @@fixtures ||= load_fixtures
-      end
-
-      def fixtures(key)
-        data = all_fixtures[key] || raise(StandardError, "No fixture data was found for '#{key}'")
-
-        data.dup
-      end
+# This makes sure that Minitest::Test exists when an older version of Minitest
+# (i.e. 4.x) is required by ActiveSupport.
+unless defined?(Minitest::Test)
+  Minitest::Test = MiniTest::Unit::TestCase
+end
 
-      def load_fixtures
-        file = File.exists?(LOCAL_CREDENTIALS) ? LOCAL_CREDENTIALS : DEFAULT_CREDENTIALS
-        yaml_data = YAML.load(File.read(file))
-        symbolize_keys(yaml_data)
+module ActiveFulfillment::Test
+  module Fixtures
+    LOCAL_CREDENTIALS = ENV['HOME'] + '/.active_fulfillment/fixtures.yml' unless defined?(LOCAL_CREDENTIALS)
+    DEFAULT_CREDENTIALS = File.dirname(__FILE__) + '/fixtures.yml' unless defined?(DEFAULT_CREDENTIALS)
 
-        yaml_data
-      end
+    def fixtures(key)
+      data = all_fixtures[key] || raise(StandardError, "No fixture data was found for '#{key}'")
 
-      def xml_fixture(path) # where path is like 'usps/beverly_hills_to_ottawa_response'
-        open(File.join(File.dirname(__FILE__),'fixtures','xml',"#{path}.xml")) {|f| f.read}
-      end
+      data.dup
+    end
 
-      def symbolize_keys(hash)
-        return unless hash.is_a?(Hash)
+    def xml_fixture(path) # where path is like 'usps/beverly_hills_to_ottawa_response'
+      File.read(File.join(File.dirname(__FILE__),'fixtures','xml',"#{path}.xml"))
+    end
 
-        hash.symbolize_keys!
-        hash.each{|k,v| symbolize_keys(v)}
-      end
+    private
 
-      def assert_raise(error)
-        begin
-          yield
-        rescue => e
-          flunk "Expected #{error} but nothing raised" if e.class != error
-        end
-      end
+    def all_fixtures
+      @@fixtures ||= load_fixtures
+    end
 
-      def assert_nothing_raised
-        yield
-      end
+    def load_fixtures
+      file = File.exists?(LOCAL_CREDENTIALS) ? LOCAL_CREDENTIALS : DEFAULT_CREDENTIALS
+      YAML.load(File.read(file)).deep_symbolize_keys
     end
   end
 end

data/test/unit/base_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
-class BaseTest < Test::Unit::TestCase
-  include ActiveMerchant::Fulfillment
+class BaseTest < Minitest::Test
+  include ActiveFulfillment
 
   def test_get_shipwire_by_string
     assert_equal ShipwireService, Base.service('shipwire')
@@ -10,8 +10,8 @@ class BaseTest < Test::Unit::TestCase
   def test_get_shipwire_by_name
     assert_equal ShipwireService, Base.service(:shipwire)
   end
-  
+
   def test_get_unknown_service
-    assert_raise(NameError){ Base.service(:polar_north) }
+    assert_raises(NameError){ Base.service(:polar_north) }
   end
 end

data/test/unit/services/amazon_mws_test.rb

@@ -1,8 +1,10 @@
 require 'test_helper'
 
-class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
+class AmazonMarketplaceWebServiceTest < Minitest::Test
+  include ActiveFulfillment::Test::Fixtures
+
   def setup
-    @service = AmazonMarketplaceWebService.new(
+    @service = ActiveFulfillment::AmazonMarketplaceWebService.new(
                                                :login => 'l',
                                                :password => 'p'
                                                )
@@ -36,6 +38,18 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
       :phone => "(555)555-5555"
     }
 
+    @long_address = {
+      :name => 'Mister Long Name The Third',
+      :company => 'Company Overflow Name Incorporated LLC',
+      :address1 => '100 Information Super Highway',
+      :address2 => 'Suite 66',
+      :city => 'Beverly Hills',
+      :state => 'CA',
+      :country => 'US',
+      :zip => '90210',
+      :phone => "(555)555-5555"
+    }
+
     @canadian_address = {
       :name => 'Johnny Bouchard',
       :address1 => '100 Canuck St',
@@ -56,12 +70,12 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
   end
 
   def test_get_default_fulfillment_gateway
-    assert_equal AmazonMarketplaceWebService::ENDPOINTS[:us], @service.endpoint
+    assert_equal ActiveFulfillment::AmazonMarketplaceWebService::ENDPOINTS[:us], @service.endpoint
   end
 
   def test_create_service_with_different_fulfillment_gateway
-    service = AmazonMarketplaceWebService.new(:login => 'l', :password => 'p', :endpoint => :jp)
-    assert_equal AmazonMarketplaceWebService::ENDPOINTS[:jp], service.endpoint
+    service = ActiveFulfillment::AmazonMarketplaceWebService.new(:login => 'l', :password => 'p', :endpoint => :jp)
+    assert_equal ActiveFulfillment::AmazonMarketplaceWebService::ENDPOINTS[:jp], service.endpoint
   end
 
   def test_build_basic_api_query
@@ -74,9 +88,9 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
     opts = @service.build_basic_api_query(options)
     assert_equal expected_keys.sort, opts.keys.map(&:to_s).sort
     assert_equal "l", opts["AWSAccessKeyId"]
-    assert_equal AmazonMarketplaceWebService::SIGNATURE_VERSION, opts["SignatureVersion"]
-    assert_equal "Hmac#{AmazonMarketplaceWebService::SIGNATURE_METHOD}", opts["SignatureMethod"]
-    assert_equal AmazonMarketplaceWebService::VERSION, opts["Version"]
+    assert_equal ActiveFulfillment::AmazonMarketplaceWebService::SIGNATURE_VERSION, opts["SignatureVersion"]
+    assert_equal "Hmac#{ActiveFulfillment::AmazonMarketplaceWebService::SIGNATURE_METHOD}", opts["SignatureMethod"]
+    assert_equal ActiveFulfillment::AmazonMarketplaceWebService::VERSION, opts["Version"]
   end
 
   def test_build_inventory_list_request
@@ -93,7 +107,7 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
   end
 
   def test_create_signature
-    service = AmazonMarketplaceWebService.new(:login => "0PExampleR2", :password => "sekrets")
+    service = ActiveFulfillment::AmazonMarketplaceWebService.new(:login => "0PExampleR2", :password => "sekrets")
     expected_signature = "39XxH6iKLysjjDmWZSkyr2z8iSxfECHBYE1Pd0Qqpwo%3D"
     options = {
       "AWSAccessKeyId" => "0PExampleR2",
@@ -107,16 +121,23 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
       "Version" => "2009-01-01"
     }
 
-    uri = URI.parse("https://#{AmazonMarketplaceWebService::ENDPOINTS[:us]}")
+    uri = URI.parse("https://#{ActiveFulfillment::AmazonMarketplaceWebService::ENDPOINTS[:us]}")
 
     assert_equal expected_signature, service.sign(:POST, uri, options)
   end
 
   def test_verify_amazon_response
-    service = AmazonMarketplaceWebService.new(:login => "AKIAFJPPO5KLY6G4XO7Q", :password => "aaa")
-    string_signed_by_amazon = "POST\nhttps://www.vendor.com/mwsApp1\n/orders/listRecentOrders.jsp?sessionId=123"
-    string_signed_by_amazon += "\nAWSAccessKeyId=AKIAFJPPO5KLY6G4XO7Q&Marketplace=ATVPDKIKX0DER&Merchant=A047950713KM6AGKQCBRD&SignatureMethod=HmacSHA256&SignatureVersion=2"
-    assert service.amazon_request?(string_signed_by_amazon, "b0hxWov1RfBOqNk77UDfNRRZmf3tkdM7vuNa%2FolfnWg%3D")
+    service = ActiveFulfillment::AmazonMarketplaceWebService.new(:login => "AKIAFJPPO5KLY6G4XO7Q", :password => "aaa")
+    post_params = {
+      AWSAccessKeyId: "AKIAFJPPO5KLY6G4XO7Q",
+      Marketplace: "ATVPDKIKX0DER",
+      Merchant: "A047950713KM6AGKQCBRD",
+      SignatureMethod: "HmacSHA256",
+      SignatureVersion: "2",
+      Signature: "b0hxWov1RfBOqNk77UDfNRRZmf3tkdM7vuNa/olfnWg=",
+      SignedString: "This should be ignored."
+    }
+    assert service.amazon_request?("POST", "https://www.vendor.com/mwsApp1", "/orders/listRecentOrders.jsp?sessionId=123", post_params)
   end
 
   def test_build_address
@@ -147,6 +168,10 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
     assert_equal expected_items, @service.build_address(@commercial_address)
   end
 
+  def test_build_address_truncates_name_to_length
+    assert_equal "Company Overflow Name Incorporated LLC - Mister Lo", @service.build_address(@long_address)["DestinationAddress.Name"]
+  end
+
   def test_build_address_upcases_postal_code
     address = @service.build_address(@canadian_address)
     assert_equal address["DestinationAddress.PostalCode"], "H0H0H0"
@@ -184,11 +209,11 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
   end
 
   def test_integrated_registration_url_creation
-    service = AmazonMarketplaceWebService.new(:login => "AKIAFJPPO5KLY6G4XO7Q", :password => "aaa", :app_id => "1014f5ad-c359-4e86-8e50-bb8f8e431a9")
+    service = ActiveFulfillment::AmazonMarketplaceWebService.new(:login => "AKIAFJPPO5KLY6G4XO7Q", :password => "aaa", :app_id => "1014f5ad-c359-4e86-8e50-bb8f8e431a9")
     options = {
       "returnPathAndParameters" => "/orders/listRecentOrders.jsp?sessionId=123"
     }
-    expected_registration_url = "#{AmazonMarketplaceWebService::REGISTRATION_URI.to_s}?AWSAccessKeyId=AKIAFJPPO5KLY6G4XO7Q&SignatureMethod=HmacSHA256&SignatureVersion=2&id=1014f5ad-c359-4e86-8e50-bb8f8e431a9&returnPathAndParameters=%2Forders%2FlistRecentOrders.jsp%3FsessionId%3D123&Signature=zpZyHd8rMf5gg5rpO5ri5RGUi0kks03ZkhAtPm4npVk%3D"
+    expected_registration_url = "#{ActiveFulfillment::AmazonMarketplaceWebService::REGISTRATION_URI.to_s}?AWSAccessKeyId=AKIAFJPPO5KLY6G4XO7Q&SignatureMethod=HmacSHA256&SignatureVersion=2&id=1014f5ad-c359-4e86-8e50-bb8f8e431a9&returnPathAndParameters=%2Forders%2FlistRecentOrders.jsp%3FsessionId%3D123&Signature=zpZyHd8rMf5gg5rpO5ri5RGUi0kks03ZkhAtPm4npVk%3D"
     assert_equal expected_registration_url, service.registration_url(options)
   end
 
@@ -213,7 +238,7 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
 
   def test_invalid_arguments
     http_response = build_mock_response(invalid_params_response, "", 500)
-    @service.expects(:ssl_post).raises(ActiveMerchant::ResponseError.new(http_response))
+    @service.expects(:ssl_post).raises(ActiveUtils::ResponseError.new(http_response))
     response = @service.fulfill('12345678', @address, @line_items, @options)
     assert !response.success?
     assert_equal "MalformedInput: timestamp must follow ISO8601", response.params['response_comment']
@@ -221,12 +246,12 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
 
   def test_missing_order_date
     @options.delete(:order_date)
-    assert_raise(ArgumentError) { @service.fulfill('12345678', @address, @line_items, @options) }
+    assert_raises(ArgumentError) { @service.fulfill('12345678', @address, @line_items, @options) }
   end
 
   def test_missing_shipping_method
     @options.delete(:shipping_method)
-    assert_raise(ArgumentError) { @service.fulfill('12345678', @address, @line_items, @options) }
+    assert_raises(ArgumentError) { @service.fulfill('12345678', @address, @line_items, @options) }
   end
 
   def test_get_service_status
@@ -239,6 +264,12 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
   def test_get_inventory
     @service.expects(:ssl_post).returns(xml_fixture('amazon_mws/inventory_list_inventory_supply'))
 
+    @service.class.logger.expects(:info).with do |message|
+      assert_match /ListInventorySupplyResult/, message
+      assert /MWSAuthToken/ !~ message
+      assert /AWSAccessKeyId/ !~ message
+    end
+
     response = @service.fetch_stock_levels
     assert response.success?
     assert_equal 202, response.stock_levels['GN-00-01A']
@@ -273,7 +304,7 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
     http_response = build_mock_response(response_from_503, "", 503)
     @service.expects(:ssl_post).with() { |uri, query, headers|
       query.include?('ListInventorySupplyByNextToken') && query.include?('NextToken')
-    }.raises(ActiveMerchant::ResponseError.new(http_response))
+    }.raises(ActiveUtils::ResponseError.new(http_response))
 
     response = @service.fetch_stock_levels
     assert !response.success?
@@ -328,7 +359,7 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
 
     @service.expects(:ssl_post).times(3).
       returns(xml_fixture('amazon_mws/fulfillment_get_fulfillment_order')).
-      raises(ActiveMerchant::ResponseError.new(response)).
+      raises(ActiveUtils::ResponseError.new(response)).
       returns(xml_fixture('amazon_mws/fulfillment_get_fulfillment_order_2'))
 
     response = @service.fetch_tracking_numbers(['extern_id_1154539615776', 'dafdfafsdafdafasdfa', 'extern_id_1154539615777'])
@@ -344,7 +375,7 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
 
     @service.expects(:ssl_post).twice.
       returns(xml_fixture('amazon_mws/fulfillment_get_fulfillment_order')).
-      raises(ActiveMerchant::ResponseError.new(response))
+      raises(ActiveUtils::ResponseError.new(response))
 
     response = @service.fetch_tracking_numbers(['extern_id_1154539615776', 'ERROR', 'extern_id_1154539615777'])
     assert !response.success?
@@ -353,7 +384,7 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
 
   def test_404_error
     http_response = build_mock_response(response_from_404, "Not Found", "404")
-    @service.expects(:ssl_post).raises(ActiveMerchant::ResponseError.new(http_response))
+    @service.expects(:ssl_post).raises(ActiveUtils::ResponseError.new(http_response))
 
     response = @service.fulfill('987654321', @address, @line_items, @options)
     assert !response.success?
@@ -366,9 +397,8 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
 
   def test_building_address_skips_nil_values
     @address[:address2] = nil
-    assert_nothing_raised do
-      @service.send(:build_address, @address)
-    end
+    hash = @service.send(:build_address, @address)
+    refute hash.key?("DestinationAddress.Line2")
   end
 
   def test_building_a_full_query_does_not_cause_query_to_fail