test/unit/services/shipwire_test.rb in active_fulfillment-2.0.2 vs test/unit/services/shipwire_test.rb in active_fulfillment-2.1.0

@@ -1,62 +1,62 @@
 require 'test_helper'
 
 class ShipwireTest < Test::Unit::TestCase
   def setup
     Base.mode = :test
-    
+
     @shipwire = ShipwireService.new(
                   :login => '[e-mail]',
                   :password => 'test'
                 )
-    
-    @options = { 
+
+    @options = {
       :warehouse => '01',
       :shipping_method => 'UPS Ground'
     }
-    
-    @address = { 
+
+    @address = {
       :name => 'Fred Brooks',
       :address1 => '1234 Penny Lane',
       :city => 'Jonsetown',
       :state => 'NC',
       :country => 'US',
       :zip => '23456',
       :company => 'MyCorp',
       :email    => '[e-mail]'
     }
-    
+
     @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(
         :login    => 'cody',
         :password => 'test'
       )
     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")
     assert_equal 'US', country_node.text
   end
@@ -102,26 +102,26 @@
     @shipwire.expects(:ssl_post).returns(successful_empty_tracking_response)
     response = @shipwire.fetch_tracking_numbers(['1234'])
     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"])
     assert response.success?
     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)
     response = @shipwire.fetch_tracking_numbers([
         '21',   '22',   '23',   '24',   '25',
@@ -130,34 +130,34 @@
     ])
     assert response.success?
     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
 
   def test_valid_credentials
     successful_empty_tracing_response = xml_fixture('shipwire/successful_empty_tracking_response')
     @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)
     assert !@shipwire.valid_credentials?
   end
@@ -171,10 +171,10 @@
   end
 
   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
     xml = REXML::Document.new(@shipwire.send(:build_fulfillment_request, '123456', @address, @line_items, @options))
     note_node = REXML::XPath.first(xml, "//Note").cdatas.first