active_shipping 1.0.0.pre4 → 1.0.0

data/test/fixtures/xml/usps/delivered_extended_tracking_response.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<TrackResponse>
+  <TrackInfo ID="9361289949034102283511">
+    <TrackSummary>Your item was delivered to the front desk or reception area at 2:16 pm on October 12, 2013 in BROOKLYN, NY 11201.</TrackSummary>
+    <TrackDetail>Out for Delivery, October 12, 2013, 10:16 am, BROOKLYN, NY 11201</TrackDetail>
+    <TrackDetail>Sorting Complete, October 12, 2013, 10:06 am, BROOKLYN, NY 11201</TrackDetail>
+    <TrackDetail>Arrival at Post Office, October 12, 2013, 6:32 am, BROOKLYN, NY 11201</TrackDetail>
+    <TrackDetail>Acceptance, October 12, 2013, 6:26 am, BROOKLYN, NY 11201</TrackDetail>
+    <TrackDetail>Electronic Shipping Info Received, October 12, 2013</TrackDetail>
+  </TrackInfo>
+</TrackResponse>

data/test/remote/canada_post_pws_platform_test.rb

@@ -8,7 +8,7 @@ class RemoteCanadaPostPWSPlatformTest < Minitest::Test
   include ActiveShipping::Test::Fixtures
 
   def setup
-    @login = credentials(:canada_post_pws)
+    @login = credentials(:canada_post_pws_platform).merge(endpoint: "https://ct.soa-gw.canadapost.ca/")
 
     # 100 grams, 93 cm long, 10 cm diameter, cylinders have different volume calculations
     # @pkg1 = Package.new(1000, [93,10], :value => 10.00)
@@ -92,31 +92,24 @@ class RemoteCanadaPostPWSPlatformTest < Minitest::Test
     @cp = CanadaPostPWS.new(@login)
     @cp.logger = Logger.new(StringIO.new)
 
-    @customer_number  = @login[:customer_number]
-    @customer_api_key = @login[:customer_api_key]
-    @customer_secret  = @login[:customer_secret]
   rescue NoCredentialsFound => e
     skip(e.message)
   end
 
   def build_options
-    {
-      :customer_number => @customer_number,
-      :customer_api_key => @customer_api_key,
-      :customer_secret => @customer_secret
-    }
+    { :customer_number => @login[:customer_number] }
   end
 
   def test_rates
-    rates = @cp.find_rates(@home_params, @dom_params, [@pkg1], build_options)
-    assert_equal RateResponse, rates.class
-    assert_equal RateEstimate, rates.rates.first.class
+    rate_response = @cp.find_rates(@home_params, @dom_params, [@pkg1], build_options)
+    assert_kind_of ActiveShipping::RateResponse, rate_response
+    assert_kind_of ActiveShipping::RateEstimate, rate_response.rates.first
   end
 
   def test_rates_with_insurance_changes_price
     rates = @cp.find_rates(@home_params, @dom_params, [@pkg1], build_options)
     insured_rates = @cp.find_rates(@home_params, @dom_params, [@pkg1], build_options.merge(@shipping_opts1))
-    assert_not_equal rates.rates.first.price, insured_rates.rates.first.price
+    refute_equal rates.rates.first.price, insured_rates.rates.first.price
   end
 
   def test_rates_with_invalid_customer_raises_exception
@@ -139,7 +132,7 @@ class RemoteCanadaPostPWSPlatformTest < Minitest::Test
     assert_equal 'Xpresspost', response.service_name
     assert response.expected_date.is_a?(Date)
     assert response.customer_number
-    assert_equal 10, response.shipment_events.count
+    assert_equal 13, response.shipment_events.count
   end
 
   def test_tracking_invalid_pin_raises_exception
@@ -147,7 +140,7 @@ class RemoteCanadaPostPWSPlatformTest < Minitest::Test
     exception = assert_raises(ResponseError) do
       @cp.find_tracking_info(pin, build_options)
     end
-    assert_equal "No Pin History", exception.message
+    assert_equal "No Tracking", exception.message
   end
 
   def test_create_shipment_with_invalid_customer_raises_exception
@@ -164,11 +157,14 @@ class RemoteCanadaPostPWSPlatformTest < Minitest::Test
   end
 
   def test_merchant_details_empty_details
-    response = @cp.register_merchant
-    exception = assert_raises(ResponseError) do
-      response = @cp.retrieve_merchant_details(:token_id => response.token_id)
-    end
-    assert_equal "No Merchant Info", exception.message
+    register_response = @cp.register_merchant
+    details_response = @cp.retrieve_merchant_details(:token_id => register_response.token_id)
+    assert_kind_of ActiveShipping::CPPWSMerchantDetailsResponse, details_response
+
+    assert_equal '0000000000', details_response.customer_number
+    assert_equal '1234567890', details_response.contract_number
+    assert_equal '0000000000000000', details_response.username
+    assert_equal '1a2b3c4d5e6f7a8b9c0d12', details_response.password
   end
 
   def test_find_services_no_country
@@ -192,7 +188,7 @@ class RemoteCanadaPostPWSPlatformTest < Minitest::Test
     assert response = @cp.find_service_options("INT.XP", nil, build_options)
     assert_equal "INT.XP", response[:service_code]
     assert_equal "Xpresspost International", response[:service_name]
-    assert_equal 4, response[:options].size
+    assert_equal 5, response[:options].size
     assert_equal "COV", response[:options][0][:code]
     assert_equal false, response[:options][0][:required]
     assert_equal true, response[:options][0][:qualifier_required]
@@ -211,7 +207,7 @@ class RemoteCanadaPostPWSPlatformTest < Minitest::Test
     assert response = @cp.find_service_options("INT.XP", "JP", build_options)
     assert_equal "INT.XP", response[:service_code]
     assert_equal "Xpresspost International", response[:service_name]
-    assert_equal 3, response[:options].size
+    assert_equal 4, response[:options].size
     assert_equal "COV", response[:options][0][:code]
     assert_equal false, response[:options][0][:required]
     assert_equal true, response[:options][0][:qualifier_required]
@@ -245,4 +241,21 @@ class RemoteCanadaPostPWSPlatformTest < Minitest::Test
     assert_equal "LAD", response[:code]
     assert_equal "Laisser à la porte (pas d'avis)", response[:name]
   end
+
+  def test_register_merchant
+    response = @cp.register_merchant
+    assert response.is_a?(CPPWSRegisterResponse)
+    assert_equal "1111111111111111111111", response.token_id
+  end
+
+  def test_merchant_details
+    token_id = "1111111111111111111111"
+    response = @cp.retrieve_merchant_details(:token_id => token_id)
+    assert response.is_a?(CPPWSMerchantDetailsResponse)
+    assert_equal "0000000000", response.customer_number
+    assert_equal "1234567890", response.contract_number
+    assert_equal "0000000000000000", response.username
+    assert_equal "1a2b3c4d5e6f7a8b9c0d12", response.password
+    assert_equal true, response.has_default_credit_card
+  end
 end

data/test/remote/canada_post_pws_test.rb

@@ -7,15 +7,14 @@ class RemoteCanadaPostPWSTest < Minitest::Test
 
   def setup
     @login = credentials(:canada_post_pws)
+    refute @login.key?(:platform_id), "The 'canada_post_pws' credentials should NOT include a platform ID"
 
-    # 100 grams, 93 cm long, 10 cm diameter, cylinders have different volume calculations
-    # @pkg1 = Package.new(1000, [93,10], :value => 10.00)
-    @pkg1 = Package.new(1000, nil, :value => 10.00)
+    # 1000 grams, 93 cm long, 10 cm diameter, cylinders have different volume calculations
+    @pkg1 = Package.new(1000, [93, 10, 10], :value => 10.00)
 
     @line_item1 = line_item_fixture
 
-    @shipping_opts1 = {:dc => true, :cod => true, :cod_amount => 500.00, :cov => true, :cov_amount => 100.00,
-                       :so => true, :pa18 => true}
+    @shipping_opts1 = { :dc => true, :cov => true, :cov_amount => 100.00, :aban => true }
 
     @home_params = {
       :name        => "John Smith",
@@ -81,7 +80,7 @@ class RemoteCanadaPostPWSTest < Minitest::Test
 
     @DEFAULT_RESPONSE = {
       :shipping_id => "406951321983787352",
-      :tracking_number => "11111118901234",
+      :tracking_number => "123456789012",
       :label_url => "https://ct.soa-gw.canadapost.ca/ers/artifact/#{@login[:api_key]}/20238/0"
     }
   rescue NoCredentialsFound => e
@@ -90,9 +89,9 @@ class RemoteCanadaPostPWSTest < Minitest::Test
 
   def test_rates
     opts = {:customer_number => @customer_number}
-    rates = @cp.find_rates(@home_params, @dom_params, [@pkg1], opts)
-    assert_equal RateResponse, rates.class
-    assert_equal RateEstimate, rates.rates.first.class
+    rate_response = @cp.find_rates(@home_params, @dom_params, [@pkg1], opts)
+    assert_kind_of ActiveShipping::RateResponse, rate_response
+    assert_kind_of ActiveShipping::RateEstimate, rate_response.rates.first
   end
 
   def test_rates_with_invalid_customer_raises_exception
@@ -108,7 +107,7 @@ class RemoteCanadaPostPWSTest < Minitest::Test
     assert_equal 'Xpresspost', response.service_name
     assert response.expected_date.is_a?(Date)
     assert response.customer_number
-    assert_equal 10, response.shipment_events.count
+    assert_equal 13, response.shipment_events.count
   end
 
   def test_tracking_when_no_tracking_info_raises_exception
@@ -124,26 +123,36 @@ class RemoteCanadaPostPWSTest < Minitest::Test
   def test_create_shipment
     opts = {:customer_number => @customer_number, :service => "DOM.XP"}
     response = @cp.create_shipment(@home_params, @dom_params, @pkg1, @line_item1, opts)
-    assert response.is_a?(CPPWSShippingResponse)
-    assert_equal @DEFAULT_RESPONSE[:shipping_id], response.shipping_id
-    assert_equal @DEFAULT_RESPONSE[:tracking_number], response.tracking_number
-    assert_equal @DEFAULT_RESPONSE[:label_url], response.label_url
+    assert_kind_of CPPWSShippingResponse, response
+    assert_match /\A\d{17}\z/, response.shipping_id
+    assert_equal "123456789012", response.tracking_number
+    assert_match "https://ct.soa-gw.canadapost.ca/ers/artifact/", response.label_url
+    assert_match @login[:api_key], response.label_url
   end
 
   def test_create_shipment_with_options
-    opts = {:customer_number => @customer_number, :service => "USA.EP"}
-    opts.merge! @shipping_opts1
+    opts = {:customer_number => @customer_number, :service => "USA.EP"}.merge(@shipping_opts1)
     response = @cp.create_shipment(@home_params, @dest_params, @pkg1, @line_item1, opts)
-    assert response.is_a?(CPPWSShippingResponse)
-    assert_equal @DEFAULT_RESPONSE[:shipping_id], response.shipping_id
-    assert_equal @DEFAULT_RESPONSE[:tracking_number], response.tracking_number
-    assert_equal @DEFAULT_RESPONSE[:label_url], response.label_url
+
+    assert_kind_of CPPWSShippingResponse, response
+    assert_match /\A\d{17}\z/, response.shipping_id
+    assert_equal "123456789012", response.tracking_number
+    assert_match "https://ct.soa-gw.canadapost.ca/ers/artifact/", response.label_url
+    assert_match @login[:api_key], response.label_url
   end
 
   def test_retrieve_shipping_label
-    shipping_response = CPPWSShippingResponse.new(true, '', {}, @DEFAULT_RESPONSE)
-    response = @cp.retrieve_shipping_label(shipping_response)
-    assert_not_nil response
+    opts = {:customer_number => @customer_number, :service => "DOM.XP"}
+    shipping_response = @cp.create_shipment(@home_params, @dom_params, @pkg1, @line_item1, opts)
+
+    # Looks like it takes Canada Post some time to actually generate the PDF.
+    response = nil
+    10.times do
+      response = @cp.retrieve_shipping_label(shipping_response)
+      break unless response == ""
+      sleep(0.5)
+    end
+
     assert_equal "%PDF", response[0...4]
   end
 
@@ -153,21 +162,4 @@ class RemoteCanadaPostPWSTest < Minitest::Test
       @cp.create_shipment(@home_params, @dom_params, @pkg1, @line_item1, opts)
     end
   end
-
-  def test_register_merchant
-    response = @cp.register_merchant
-    assert response.is_a?(CPPWSRegisterResponse)
-    assert_equal "1111111111111111111111", response.token_id
-  end
-
-  def test_merchant_details
-    token_id = "1111111111111111111111"
-    response = @cp.retrieve_merchant_details(:token_id => token_id)
-    assert response.is_a?(CPPWSMerchantDetailsResponse)
-    assert_equal "0000000000", response.customer_number
-    assert_equal "1234567890", response.contract_number
-    assert_equal "0000000000000000", response.username
-    assert_equal "1a2b3c4d5e6f7a8b9c0d12", response.password
-    assert_equal true, response.has_default_credit_card
-  end
 end

data/test/remote/correios_test.rb

@@ -0,0 +1,83 @@
+require 'test_helper'
+
+class RemoteCorreiosTest < Minitest::Test
+
+  def setup
+    @carrier = Correios.new
+
+    @saopaulo = Location.new(:zip => "01415000")
+    @riodejaneiro = Location.new(:zip => "22210030")
+    @invalid_city = Location.new(:zip => "invalid")
+
+    @book = Package.new(250, [14, 19, 2])
+    @invalid_book = Package.new(9999999999999, [14, 19, 2])
+    @poster = Package.new(100, [93, 15], :cylinder => true)
+  end
+
+  def test_book_request
+    response = @carrier.find_rates(@saopaulo, @riodejaneiro, [@book])
+
+    assert response.is_a?(RateResponse)
+    assert response.rates.first.is_a?(RateEstimate)
+    assert response.success?
+    assert_equal 1, response.params["responses"].size
+    assert_equal 2, response.rates.size
+    assert_equal 1, response.raw_responses.size
+  end
+
+  def test_poster_and_book_request
+    response = @carrier.find_rates(@saopaulo, @riodejaneiro, [@book, @poster])
+
+    assert response.is_a?(RateResponse)
+    assert response.rates.first.is_a?(RateEstimate)
+    assert response.success?
+    assert_equal 2, response.params["responses"].size
+    assert_equal 2, response.rates.size
+    assert_equal 2, response.raw_responses.size
+  end
+
+  def test_book_request_with_specific_services
+    response = @carrier.find_rates(@saopaulo, @riodejaneiro, [@book], :services => [41106, 40010, 40215])
+
+    assert response.is_a?(RateResponse)
+    assert response.rates.first.is_a?(RateEstimate)
+    assert response.success?
+    assert_equal 1, response.params["responses"].size
+    assert_equal 3, response.rates.size
+    assert_equal 1, response.raw_responses.size
+  end
+
+  def test_response_prices
+    response = @carrier.find_rates(@saopaulo, @riodejaneiro, [@book, @poster])
+    response_book= @carrier.find_rates(@saopaulo, @riodejaneiro, [@book])
+    response_poster = @carrier.find_rates(@saopaulo, @riodejaneiro, [@poster])
+
+    book_price = response_book.rates.sum(&:price)
+    poster_price = response_poster.rates.sum(&:price)
+    total_price = response.rates.sum(&:price)
+
+    assert total_price == book_price + poster_price
+  end
+
+  def test_invalid_zip
+    error = assert_raises(ActiveShipping::ResponseError) do
+      @carrier.find_rates(@saopaulo, @invalid_city, [@book])
+    end
+
+    assert_kind_of RateResponse, error.response
+    refute error.message.empty?
+    assert error.response.raw_responses.any?
+    assert_equal Hash.new, error.response.params
+  end
+
+  def test_valid_book_and_invalid_book
+    error = assert_raises(ActiveShipping::ResponseError) do
+      @carrier.find_rates(@saopaulo, @riodejaneiro, [@book, @invalid_book])
+    end
+
+    assert_kind_of RateResponse, error.response
+    refute error.message.empty?
+    assert error.response.raw_responses.any?
+    assert_equal Hash.new, error.response.params
+  end
+end

data/test/remote/fedex_test.rb

@@ -10,10 +10,18 @@ class RemoteFedExTest < Minitest::Test
     skip(e.message)
   end
 
+  ### valid_credentials?
+
   def test_valid_credentials
-    assert @carrier.valid_credentials?
+    valid_carrier = FedEx.new(credentials(:fedex))
+    assert valid_carrier.valid_credentials?
+
+    invalid_carrier = FedEx.new(credentials(:fedex).merge(password: 'invalid'))
+    refute invalid_carrier.valid_credentials?
   end
 
+  ### find_rates
+
   def test_us_to_canada
     response = @carrier.find_rates(
       location_fixtures[:beverly_hills],
@@ -190,17 +198,6 @@ class RemoteFedExTest < Minitest::Test
     end
   end
 
-  def test_tracking
-    p response = @carrier.find_tracking_info('123456789012', :test => true)
-    assert response
-  end
-
-  def test_tracking_with_bad_number
-    assert_raises(ResponseError) do
-      @carrier.find_tracking_info('12345')
-    end
-  end
-
   def test_different_rates_for_commercial
     residential_response = @carrier.find_rates(
                              location_fixtures[:beverly_hills],
@@ -213,6 +210,91 @@ class RemoteFedExTest < Minitest::Test
                              package_fixtures.values_at(:chocolate_stuff)
                            )
 
-    assert_not_equal residential_response.rates.map(&:price), commercial_response.rates.map(&:price)
+    refute_equal residential_response.rates.map(&:price), commercial_response.rates.map(&:price)
+  end
+
+  ### find_tracking_info
+
+  def test_find_tracking_info_for_delivered_shipment
+    # unfortunately, we have to use Fedex unique identifiers, because the test tracking numbers are overloaded.
+    response = @carrier.find_tracking_info('123456789012', unique_identifier: '2456987000~123456789012~FX')
+    assert response.success?
+    assert response.delivered?
+    assert_equal '123456789012', response.tracking_number
+    assert_equal :delivered, response.status
+    assert_equal 'DL', response.status_code
+    assert_equal "Delivered", response.status_description
+
+    assert_equal Time.parse('2014-11-14T03:49:00Z'), response.ship_time
+    assert_equal nil, response.scheduled_delivery_date
+    assert_equal Time.parse('2014-12-05T00:28:00Z'), response.actual_delivery_date
+
+    assert_equal nil, response.origin
+
+    destination_address = ActiveShipping::Location.new(
+      city: 'COLLIERVILLE',
+      country: 'US',
+      state: 'TN'
+    )
+    assert_equal destination_address.to_hash, response.destination.to_hash
+    assert_equal 1, response.shipment_events.length
+  end
+
+  def test_find_tracking_info_for_in_transit_shipment_1
+    # unfortunately, we have to use Fedex unique identifiers, because the test tracking numbers are overloaded.
+    response = @carrier.find_tracking_info('123456789012', unique_identifier: '2456979001~123456789012~FX')
+    assert response.success?
+    refute response.delivered?
+    assert_equal '123456789012', response.tracking_number
+    assert_equal :in_transit, response.status
+    assert_equal 'IT', response.status_code
+    assert_equal "Package available for clearance", response.status_description
+    assert_equal 1, response.shipment_events.length
+    assert_nil response.actual_delivery_date
+    assert_equal nil, response.scheduled_delivery_date
+  end
+
+  def test_find_tracking_info_for_in_transit_shipment_2
+    # unfortunately, we have to use Fedex unique identifiers, because the test tracking numbers are overloaded.
+    response = @carrier.find_tracking_info('123456789012', unique_identifier: '2456979000~123456789012~FX')
+    assert response.success?
+    refute response.delivered?
+    assert_equal '123456789012', response.tracking_number
+    assert_equal :in_transit, response.status
+    assert_equal 'IT', response.status_code
+    assert_equal "In transit", response.status_description
+
+    assert_equal Time.parse('2014-11-25T20:04:00Z'), response.ship_time
+    assert_equal nil, response.scheduled_delivery_date
+    assert_equal nil, response.actual_delivery_date
+
+    assert_equal nil, response.origin
+
+    destination_address = ActiveShipping::Location.new(
+      city: 'TONNESSEE',
+      country: 'US',
+      state: 'TN'
+    )
+    assert_equal destination_address.to_hash, response.destination.to_hash
+    assert_equal 9, response.shipment_events.length
+  end
+
+  def test_find_tracking_info_with_multiple_matches
+    exception = assert_raises(ActiveShipping::Error) do
+      response = @carrier.find_tracking_info('123456789012')
+    end
+    assert_match 'Multiple matches were found.', exception.message
+  end
+
+  def test_find_tracking_info_not_found
+    assert_raises(ActiveShipping::ShipmentNotFound) do
+      @carrier.find_tracking_info('123456789013')
+    end
+  end
+
+  def test_find_tracking_info_with_invalid_tracking_number
+    assert_raises(ActiveShipping::ResponseError) do
+      @carrier.find_tracking_info('abc')
+    end
   end
 end