active_fulfillment 2.0.2 → 2.1.0

data/test/remote/webgistix_test.rb

@@ -5,12 +5,12 @@ class RemoteWebgistixTest < Test::Unit::TestCase
     Base.mode = :test
 
     @service = WebgistixService.new( fixtures(:webgistix) )
-    
-    @options = { 
+
+    @options = {
       :shipping_method => 'Ground',
       :email    => 'buyer@jadedpallet.com'
     }
-    
+
     @address = { :name => 'Fred Brooks',
                  :address1 => '1234 Penny Lane',
                  :city => 'Jonsetown',
@@ -18,13 +18,13 @@ class RemoteWebgistixTest < Test::Unit::TestCase
                  :country => 'US',
                  :zip => '23456'
                }
-    
+
     @line_items = [
       { :sku => 'WX-01-4001',
         :quantity => 2
       }
     ]
-    
+
   end
 
   def test_successful_order_submission
@@ -33,20 +33,20 @@ class RemoteWebgistixTest < Test::Unit::TestCase
     assert response.test?
     assert_equal WebgistixService::SUCCESS_MESSAGE, response.message
   end
-  
+
   def test_order_multiple_line_items
     @line_items.push(
       { :sku => 'WX-01-1020',
         :quantity => 3
        }
     )
-    
+
     response = @service.fulfill('123456', @address, @line_items, @options)
     assert response.success?
     assert response.test?
     assert_equal 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)
@@ -54,18 +54,18 @@ class RemoteWebgistixTest < Test::Unit::TestCase
     assert response.test?
     assert_equal WebgistixService::FAILURE_MESSAGE, response.message
   end
-  
+
   def test_invalid_credentials_during_fulfillment
     service = WebgistixService.new(
       :login => 'your@email.com',
       :password => 'password')
-    
+
     response = service.fulfill('123456', @address, @line_items, @options)
     assert !response.success?
     assert response.test?
     assert_equal "Invalid Credentials", response.message
   end
-  
+
   def test_get_inventory
     response = @service.fetch_stock_levels
     assert response.success?
@@ -73,7 +73,16 @@ class RemoteWebgistixTest < Test::Unit::TestCase
     assert_equal 90,  response.stock_levels['WX-01-3022']
     assert_equal 140, response.stock_levels['WX-04-1080']
   end
-  
+
+  def test_fetch_tracking_data
+    response = @service.fetch_tracking_numbers([
+      '1254658', 'FAItest123', 'Flat Rate Test Order 4'
+    ])
+    assert response.success?
+    assert_equal ['4209073191018052136352154'], response.tracking_numbers['1254658']
+    assert_equal ['UPS'], response.tracking_companies['1254658']
+  end
+
   def test_fetch_tracking_numbers
     response = @service.fetch_tracking_numbers([
       '1254658', 'FAItest123', 'Flat Rate Test Order 4'
@@ -83,16 +92,16 @@ class RemoteWebgistixTest < Test::Unit::TestCase
     assert_equal ['9101805213907472080032'],    response.tracking_numbers['Flat Rate Test Order 4']
     assert_nil response.tracking_numbers['FAItest123'] # 'Not Shipped'
   end
-  
+
   def test_valid_credentials
     assert @service.valid_credentials?
   end
-  
+
   def test_invalid_credentials
     service = WebgistixService.new(
       :login => 'your@email.com',
       :password => 'password')
-    
+
     assert !service.valid_credentials?
   end
-end
+end

data/test/unit/services/amazon_mws_test.rb

@@ -6,14 +6,14 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
                                                :login => 'l',
                                                :password => 'p'
                                                )
-    
-    @options = { 
+
+    @options = {
       :shipping_method => 'Standard',
       :order_date => Time.now.utc.yesterday,
       :comment => "Delayed due to tornados"
     }
-    
-    @address = { 
+
+    @address = {
       :name => 'Johnny Chase',
       :address1 => '100 Information Super Highway',
       :address2 => 'Suite 66',
@@ -23,7 +23,18 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
       :zip => '90210',
       :phone => "(555)555-5555"
     }
-    
+
+    @canadian_address = {
+      :name => 'Johnny Bouchard',
+      :address1 => '100 Canuck St',
+      :address2 => 'Room 56',
+      :city => 'Ottawa',
+      :state => 'ON',
+      :country => 'CA',
+      :zip => 'h0h0h0',
+      :phone => "(555)555-5555"
+    }
+
     @line_items = [
                    { :sku => 'SETTLERS1',
                      :quantity => 1,
@@ -77,7 +88,7 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
       "Action" => "SubmitFeed",
       "FeedType" => "_POST_INVENTORY_AVAILABILITY_DATA_",
       "Marketplace" => "ATExampleER",
-      "Merchant" => "A1ExampleE6", 
+      "Merchant" => "A1ExampleE6",
       "SignatureMethod" => "HmacSHA256",
       "SignatureVersion" => "2",
       "Timestamp" => "2009-08-20T01:10:27.607Z",
@@ -85,7 +96,7 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
     }
 
     uri = URI.parse("https://#{AmazonMarketplaceWebService::ENDPOINTS[:us]}")
-    
+
     assert_equal expected_signature, service.sign(:POST, uri, options)
   end
 
@@ -110,6 +121,11 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
     assert_equal expected_items, @service.build_address(@address)
   end
 
+  def test_build_address_upcases_postal_code
+    address = @service.build_address(@canadian_address)
+    assert_equal address["DestinationAddress.PostalCode"], "H0H0H0"
+  end
+
   def test_build_address_with_missing_fields
     expected_items = {
       "DestinationAddress.Name" => @address[:name],
@@ -143,7 +159,7 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
     }
 
     actual_items = @service.build_items(@line_items)
-                        
+
     assert_equal expected_items, @service.build_items(@line_items)
   end
 
@@ -191,14 +207,14 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
     @service.expects(:ssl_post).with() { |uri, query, headers|
       query.include?('ListInventorySupply') && !query.include?('ListInventorySupplyByNextToken')
     }.returns(xml_fixture('amazon_mws/inventory_list_inventory_supply_by_next_token'))
-    
+
     @service.expects(:ssl_post).with() { |uri, query, headers|
       query.include?('ListInventorySupplyByNextToken') && query.include?('NextToken')
     }.returns(xml_fixture('amazon_mws/inventory_list_inventory_supply'))
 
     response = @service.fetch_stock_levels
     assert response.success?
-    
+
     assert_equal 202, response.stock_levels['GN-00-01A']
     assert_equal 199, response.stock_levels['GN-00-02A']
     assert_equal 0, response.stock_levels['GN-01-01A']
@@ -221,7 +237,6 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
     assert_nil response.tracking_numbers['extern_id_1154539615777']
   end
 
-
   def test_fetch_multiple_tracking_numbers
     @service.expects(:ssl_post).returns(xml_fixture('amazon_mws/fulfillment_get_fullfillment_order_with_multiple_tracking_numbers'))
 
@@ -230,6 +245,16 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
     assert_equal %w{93YY00 93ZZ00}, response.tracking_numbers['extern_id_1154539615776']
   end
 
+  def test_fetch_tracking_data
+    @service.expects(:ssl_post).returns(xml_fixture('amazon_mws/fulfillment_get_fulfillment_order'))
+
+    response = @service.fetch_tracking_data(['extern_id_1154539615776'])
+    assert response.success?
+    assert_equal %w{93ZZ00}, response.tracking_numbers['extern_id_1154539615776']
+    assert_equal %w{UPS}, response.tracking_companies['extern_id_1154539615776']
+    assert_equal({}, response.tracking_urls)
+  end
+
   def test_that_generated_requests_do_not_double_escape_spaces
     fulfillment_request = @service.send(:build_fulfillment_request, "12345", @address, @line_items, @options)
     result = @service.build_full_query(:post, URI.parse("http://example.com/someservice/2011"), fulfillment_request)

data/test/unit/services/amazon_test.rb

@@ -6,13 +6,13 @@ class AmazonTest < Test::Unit::TestCase
                   :login => 'l',
                   :password => 'p'
                 )
-     
-     @options = { 
+
+     @options = {
        :shipping_method => 'Standard',
        :order_date => Time.now.utc.yesterday,
        :comment => "Delayed due to tornados"
      }
-     
+
      @address = { :name => 'Johnny Chase',
                   :address1 => '100 Information Super Highway',
                   :address2 => 'Suite 66',
@@ -21,39 +21,39 @@ class AmazonTest < Test::Unit::TestCase
                   :country => 'US',
                   :zip => '90210'
                  }
-     
+
      @line_items = [
        { :sku => 'SETTLERS1',
          :quantity => 1,
          :comment => 'Awesome'
        }
      ]
-  end 
-  
+  end
+
   def test_successful_fulfillment
     @service.expects(:ssl_post).returns(successful_fulfillment_response)
     response = @service.fulfill('12345678', @address, @line_items, @options)
     assert response.success?
   end
-  
-  def test_invalid_arguments    
+
+  def test_invalid_arguments
     http_response = build_mock_response(invalid_create_response, "", "500")
     @service.expects(:ssl_post).raises(ActiveMerchant::ResponseError.new(http_response))
     response = @service.fulfill('12345678', @address, @line_items, @options)
     assert !response.success?
     assert_equal "aws:Client.MissingParameter The request must contain the parameter Item.", response.params['response_comment']
   end
-  
+
   def test_missing_order_comment
     @options.delete(:comment)
     assert_raise(ArgumentError) { @service.fulfill('12345678', @address, @line_items, @options) }
   end
-  
+
   def test_missing_order_date
     @options.delete(:order_date)
     assert_raise(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) }
@@ -69,7 +69,7 @@ class AmazonTest < Test::Unit::TestCase
 
   def test_list_inventory
     @service.expects(:ssl_post).returns(xml_fixture('amazon/inventory_list_response'))
-    
+
     response = @service.fetch_stock_levels
     assert response.success?
     assert_equal 202, response.stock_levels['GN-00-01A']
@@ -89,13 +89,13 @@ class AmazonTest < Test::Unit::TestCase
     assert_equal 123, response.stock_levels['GN-02-01A']
     assert_equal 555, response.stock_levels['GN-02-02A']
   end
-  
+
   def test_fetch_tracking_numbers
     @service.expects(:ssl_post).twice.returns(
       xml_fixture('amazon/tracking_response_1'),
       xml_fixture('amazon/tracking_response_2')
     )
-      
+
     response = @service.fetch_tracking_numbers(['TEST-00000001', 'TEST-00000002'])
     assert response.success?
     assert_equal %w{UPS00000001}, response.tracking_numbers['TEST-00000001']
@@ -107,12 +107,12 @@ class AmazonTest < Test::Unit::TestCase
     response.stubs(:code).returns(500)
     response.stubs(:message).returns('Internal Server Error')
     response.stubs(:body).returns(xml_fixture('amazon/tracking_response_not_found'))
-    
+
     @service.expects(:ssl_post).times(3).
       returns(xml_fixture('amazon/tracking_response_1')).
       raises(ActiveMerchant::ResponseError.new(response)).
       returns(xml_fixture('amazon/tracking_response_2'))
-      
+
     response = @service.fetch_tracking_numbers(['TEST-00000001', '#1337-1', 'TEST-00000002'])
     assert response.success?
     assert_equal %w{UPS00000001}, response.tracking_numbers['TEST-00000001']
@@ -123,20 +123,30 @@ class AmazonTest < Test::Unit::TestCase
     response.stubs(:code).returns(500)
     response.stubs(:message).returns('Internal Server Error')
     response.stubs(:body).returns(xml_fixture('amazon/tracking_response_error'))
-    
+
     @service.expects(:ssl_post).twice.
       returns(xml_fixture('amazon/tracking_response_1')).
       raises(ActiveMerchant::ResponseError.new(response))
-      
+
     response = @service.fetch_tracking_numbers(['TEST-00000001', 'ERROR', 'TEST-00000002'])
     assert !response.success?
     assert_equal 'Something bad happened!', response.faultstring
   end
 
+  def test_fetch_tracking_data
+    @service.expects(:ssl_post).returns(xml_fixture('amazon/tracking_response_1'))
+
+    response = @service.fetch_tracking_data(['TEST-00000001'])
+    assert response.success?
+    assert_equal %w{UPS00000001}, response.tracking_numbers['TEST-00000001']
+    assert_equal %W{UPS}, response.tracking_companies['TEST-00000001']
+    assert_equal({}, response.tracking_urls)
+  end
+
   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))
-    
+
     response = @service.fulfill('12345678', @address, @line_items, @options)
     assert !response.success?
     assert_equal "404: Not Found", response.message
@@ -144,49 +154,49 @@ class AmazonTest < Test::Unit::TestCase
     assert_equal "Not Found", response.params["http_message"]
     assert_equal response_from_404, response.params["http_body"]
   end
-  
+
   def test_soap_fault
     http_response = build_mock_response(invalid_create_response, "500", "")
     @service.expects(:ssl_post).raises(ActiveMerchant::ResponseError.new(http_response))
-    
+
     response = @service.fulfill('12345678', @address, @line_items, @options)
     assert !response.success?
     assert_equal 'aws:Client.MissingParameter', response.params['faultcode']
     assert_equal 'The request must contain the parameter Item.', response.params['faultstring']
     assert_equal 'aws:Client.MissingParameter The request must contain the parameter Item.', response.message
   end
-  
+
   def test_valid_credentials
     @service.expects(:ssl_post).returns(successful_status_response)
     assert @service.valid_credentials?
   end
-  
+
   def test_invalid_credentials
     http_response = build_mock_response(invalid_login_response, "500", "")
     @service.expects(:ssl_post).raises(ActiveMerchant::ResponseError.new(http_response))
     assert !@service.valid_credentials?
   end
-  
+
   def test_successful_service_status
     @service.expects(:ssl_request).returns(successful_status_response)
-    
+
     response = @service.status
     assert response.success?
   end
-  
+
   private
-  
+
   def build_mock_response(response, message, code = "200")
     http_response = mock(:code => code, :message => message)
     http_response.stubs(:body).returns(response)
     http_response
   end
-  
+
   def response_for_empty_request
     '<ns:GetErrorResponse xmlns:ns="http://xino.amazonaws.com/doc/"><ns:Error><ns:Code>MissingDateHeader</ns:Code><ns:Message>Authorized request must have a "date" or "x-amz-date" header.</ns:Message></ns:Error><ns:RequestID>79ceaffe-e5a3-46a5-b36a-9ce958d68939</ns:RequestID></ns:GetErrorResponse>'
   end
 
-  
+
   def invalid_login_response
     <<-XML
     <?xml version="1.0"?>
@@ -200,10 +210,10 @@ class AmazonTest < Test::Unit::TestCase
           </detail>
         </env:Fault>
       </env:Body>
-    </env:Envelope>      
+    </env:Envelope>
     XML
   end
-  
+
   def invalid_create_response
     <<-XML
 <?xml version="1.0"?>
@@ -220,11 +230,11 @@ class AmazonTest < Test::Unit::TestCase
 </env:Envelope>
     XML
   end
-  
+
   def response_from_404
     '<html><head><title>Apache Tomcat/5.5.9 - Error report</title><style><!--H1 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;} H2 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:16px;} H3 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:14px;} BODY {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;} B {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;} P {font-family:Tahoma,Arial,sans-serif;background:white;color:black;font-size:12px;}A {color : black;}A.name {color : black;}HR {color : #525D76;}--></style> </head><body><h1>HTTP Status 404 - Servlet XinoServlet is not available</h1><HR size="1" noshade="noshade"><p><b>type</b> Status report</p><p><b>message</b> <u>Servlet XinoServlet is not available</u></p><p><b>description</b> <u>The requested resource (Servlet XinoServlet is not available) is not available.</u></p><HR size="1" noshade="noshade"><h3>Apache Tomcat/5.5.9</h3></body></html>'
   end
-  
+
   def successful_fulfillment_response
     <<-XML
 <?xml version="1.0"?>
@@ -239,8 +249,8 @@ class AmazonTest < Test::Unit::TestCase
 </env:Envelope>
     XML
   end
-  
-  
+
+
   def successful_status_response
     <<-XML
 <?xml version="1.0"?>
@@ -255,7 +265,7 @@ class AmazonTest < Test::Unit::TestCase
       </ns1:ResponseMetadata>
     </ns1:GetServiceStatusResponse>
   </env:Body>
-</env:Envelope>    
+</env:Envelope>
     XML
   end
 end

data/test/unit/services/shipwire_test.rb

@@ -3,18 +3,18 @@ require 'test_helper'
 class ShipwireTest < Test::Unit::TestCase
   def setup
     Base.mode = :test
-    
+
     @shipwire = ShipwireService.new(
                   :login => 'cody@example.com',
                   :password => 'test'
                 )
-    
-    @options = { 
+
+    @options = {
       :warehouse => '01',
       :shipping_method => 'UPS Ground'
     }
-    
-    @address = { 
+
+    @address = {
       :name => 'Fred Brooks',
       :address1 => '1234 Penny Lane',
       :city => 'Jonsetown',
@@ -24,28 +24,28 @@ class ShipwireTest < Test::Unit::TestCase
       :company => 'MyCorp',
       :email    => 'buyer@jadedpallet.com'
     }
-    
+
     @line_items = [ { :sku => '9999', :quantity => 25 } ]
-  end 
-  
+  end
+
   def test_missing_login
     assert_raise(ArgumentError) do
       ShipwireService.new(:password => 'test')
     end
   end
-  
+
   def test_missing_password
     assert_raise(ArgumentError) do
       ShipwireService.new(:login => 'cody')
     end
   end
-  
+
   def test_missing_credentials
     assert_raise(ArgumentError) do
       ShipwireService.new(:password => 'test')
     end
   end
-  
+
   def test_credentials_present
     assert_nothing_raised do
       ShipwireService.new(
@@ -54,7 +54,7 @@ class ShipwireTest < Test::Unit::TestCase
       )
     end
   end
-  
+
   def test_country_format
     xml = REXML::Document.new(@shipwire.send(:build_fulfillment_request, '123456', @address, @line_items, @options))
     country_node = REXML::XPath.first(xml, "//Country")
@@ -104,11 +104,11 @@ class ShipwireTest < Test::Unit::TestCase
     assert response.success?
     assert_equal Hash.new, response.tracking_numbers
   end
-  
+
   def test_successful_tracking
     expected = { "2986" => ["1ZW682E90326614239"],
                  "2987" => ["1ZW682E90326795080"] }
-    
+
     successful_tracking_response = xml_fixture('shipwire/successful_tracking_response')
     @shipwire.expects(:ssl_post).returns(successful_tracking_response)
     response = @shipwire.fetch_tracking_numbers(["2986", "2987"])
@@ -116,10 +116,10 @@ class ShipwireTest < Test::Unit::TestCase
     assert_equal "3", response.params["total_orders"]
     assert_equal "Test", response.params["status"]
     assert_equal "2", response.params["total_shipped_orders"]
-    
+
     assert_equal expected, response.tracking_numbers
   end
-  
+
   def test_successful_tracking_with_live_data
     successful_live_tracking_response = xml_fixture('shipwire/successful_live_tracking_response')
     @shipwire.expects(:ssl_post).returns(successful_live_tracking_response)
@@ -132,21 +132,21 @@ class ShipwireTest < Test::Unit::TestCase
     assert_equal "15", response.params["total_orders"]
     assert_equal "0", response.params["status"]
     assert_equal "13", response.params["total_shipped_orders"]
-    
+
     assert_equal 13, response.tracking_numbers.size
   end
-  
+
   def test_successful_tracking_with_urls
     successful_tracking_response_with_urls = xml_fixture('shipwire/successful_tracking_response_with_tracking_urls')
     @shipwire.expects(:ssl_post).returns(successful_tracking_response_with_urls)
-    response = @shipwire.fetch_tracking_numbers(["40289"])
+    response = @shipwire.fetch_tracking_data(["40289"])
     assert response.success?
     assert_equal "1", response.params["total_orders"]
     assert_equal "Test", response.params["status"]
     assert_equal "1", response.params["total_shipped_orders"]
 
     assert_equal ["9400110200793596422990"], response.tracking_numbers["40298"]
-    assert_equal "USPS", response.tracking_company["40298"]
+    assert_equal "USPS", response.tracking_companies["40298"]
     assert_equal ["http://trkcnfrm1.smi.usps.com/PTSInternetWeb/InterLabelInquiry.do?origTrackNum=9400110200793596422990"], response.tracking_urls["40298"]
   end
 
@@ -155,7 +155,7 @@ class ShipwireTest < Test::Unit::TestCase
     @shipwire.expects(:ssl_post).returns(successful_empty_tracing_response)
     assert @shipwire.valid_credentials?
   end
-  
+
   def test_invalid_credentials
     invalid_login_response = xml_fixture('shipwire/invalid_login_response')
     @shipwire.expects(:ssl_post).returns(invalid_login_response)
@@ -173,7 +173,7 @@ class ShipwireTest < Test::Unit::TestCase
   def test_company_name_in_request
     xml = REXML::Document.new(@shipwire.send(:build_fulfillment_request, '123456', @address, @line_items, @options))
     company_node = REXML::XPath.first(xml, "//Company")
-    assert_equal 'MyCorp', company_node.text 
+    assert_equal 'MyCorp', company_node.text
   end
 
   def test_order_excludes_note_by_default