active_shipping 1.0.0.pre4 → 1.0.0

data/test/remote/stamps_test.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 
 class RemoteStampsTest < Minitest::Test
   include ActiveShipping::Test::Credentials
+  include ActiveShipping::Test::Fixtures
 
   def setup
     @carrier = Stamps.new(credentials(:stamps).merge(test: true))

data/test/remote/ups_test.rb

@@ -52,8 +52,6 @@ class RemoteUPSTest < Minitest::Test
   end
 
   def test_just_country_given
-    skip if @options[:origin_account]
-
     response = @carrier.find_rates(
       location_fixtures[:beverly_hills],
       Location.new(:country => 'CA'),
@@ -63,17 +61,6 @@ class RemoteUPSTest < Minitest::Test
     refute response.rates.empty?
   end
 
-  def test_just_country_given_with_origin_account_fails
-    skip unless @options[:origin_account]
-    assert_raises(ResponseError) do
-      @carrier.find_rates(
-        location_fixtures[:beverly_hills],
-        Location.new(:country => 'CA'),
-        Package.new(100, [5, 10, 20])
-      )
-    end
-  end
-
   def test_ottawa_to_beverly_hills
     response = @carrier.find_rates(
       location_fixtures[:ottawa],
@@ -109,19 +96,6 @@ class RemoteUPSTest < Minitest::Test
     assert_nil package_rate[:rate]
   end
 
-  def test_ottawa_to_us_fails_with_only_zip_and_origin_account
-    skip unless @options[:origin_account]
-
-    assert_raises ResponseError do
-      @carrier.find_rates(
-        location_fixtures[:ottawa],
-        Location.new(:country => 'US', :zip => 90210),
-        package_fixtures.values_at(:book, :wii),
-        :test => true
-      )
-    end
-  end
-
   def test_ottawa_to_us_fails_without_zip
     assert_raises(ResponseError) do
       response = @carrier.find_rates(
@@ -134,8 +108,6 @@ class RemoteUPSTest < Minitest::Test
   end
 
   def test_ottawa_to_us_succeeds_with_only_zip
-    skip if @options[:origin_account]
-
     response = @carrier.find_rates(
       location_fixtures[:ottawa],
       Location.new(:country => 'US', :zip => 90210),
@@ -212,19 +184,10 @@ class RemoteUPSTest < Minitest::Test
   end
 
   def test_obtain_shipping_label
-    skip '<#<RuntimeError: Could not obtain shipping label. Invalid Access License number.>>.'
-
-    # I want to provide some helpful information if this test fails.
-    # Perhaps it is better to skip and warn than to make an *assertion*
-    # about configuration?
-    assert @options[:origin_name].present?, "test/fixtures.yml must have a valid ups/origin_name for this test to run"
-    assert @options[:origin_account].present?, "test/fixtures.yml must have a valid ups/origin_account for this test to run"
-
-
     response = @carrier.create_shipment(
       location_fixtures[:beverly_hills],
       location_fixtures[:new_york_with_name],
-      package_fixtures.values_at(:chocolate_stuff, :book, :american_wii),
+      package_fixtures.values_at(:chocolate_stuff, :small_half_pound, :american_wii),
       :test => true,
       :reference_number => { :value => "FOO-123", :code => "PO" }
     )
@@ -239,8 +202,6 @@ class RemoteUPSTest < Minitest::Test
   end
 
   def test_obtain_shipping_label_without_dimensions
-    skip '<#<RuntimeError: Could not obtain shipping label. Invalid Access License number.>>.'
-
     response = @carrier.create_shipment(
       location_fixtures[:beverly_hills],
       location_fixtures[:new_york_with_name],
@@ -256,4 +217,80 @@ class RemoteUPSTest < Minitest::Test
     # ought to raise an exception and this test will fail.
     assert_instance_of ActiveShipping::LabelResponse, response
   end
+
+  def test_obtain_international_shipping_label
+    response = @carrier.create_shipment(
+      location_fixtures[:new_york_with_name],
+      location_fixtures[:ottawa_with_name],
+      package_fixtures.values_at(:books),
+      {
+       :service_code => '07',
+       :test => true,
+      }
+    )
+
+    assert response.success?
+
+    # All behavior specific to how a LabelResponse behaves in the
+    # context of UPS label data is a matter for unit tests.  If
+    # the data changes substantially, the create_shipment
+    # ought to raise an exception and this test will fail.
+    assert_instance_of ActiveShipping::LabelResponse, response
+  end
+
+  def test_delivery_date_estimates_within_zip
+    today = Date.current
+
+    response = @carrier.get_delivery_date_estimates(
+      location_fixtures[:new_york_with_name],
+      location_fixtures[:new_york_with_name],
+      package_fixtures.values_at(:books),
+      today,
+      {
+        :test => true
+      }
+    )
+
+    assert response.success?
+    refute_empty response.delivery_estimates
+    ground_delivery_estimate = response.delivery_estimates.select {|de| de.service_name == "UPS Ground"}.first
+    assert_equal Date.parse(1.business_days.from_now.to_s), ground_delivery_estimate.date
+  end
+
+  def test_delivery_date_estimates_across_zips
+    today = Date.current
+
+    response = @carrier.get_delivery_date_estimates(
+      location_fixtures[:new_york_with_name],
+      location_fixtures[:real_home_as_residential],
+      package_fixtures.values_at(:books),
+      today,
+      {
+        :test => true
+      }
+    )
+
+    assert response.success?
+    refute_empty response.delivery_estimates
+    ground_delivery_estimate = response.delivery_estimates.select {|de| de.service_name == "UPS Ground"}.first
+    assert_equal Date.parse(3.business_days.from_now.to_s), ground_delivery_estimate.date
+    next_day_delivery_estimate = response.delivery_estimates.select {|de| de.service_name == "UPS Next Day Air"}.first
+    assert_equal Date.parse(1.business_days.from_now.to_s), next_day_delivery_estimate.date
+  end
+
+  def test_rate_with_single_service
+    response = @carrier.find_rates(
+      location_fixtures[:new_york_with_name],
+      location_fixtures[:real_home_as_residential],
+      package_fixtures.values_at(:books),
+      {
+        :service => UPS::DEFAULT_SERVICE_NAME_TO_CODE["UPS Ground"],
+        :test => true
+      }
+    )
+
+    assert response.success?
+    refute response.rates.empty?
+    assert_equal ["UPS Ground"], response.rates.map(&:service_name)
+  end
 end

data/test/remote/usps_test.rb

@@ -201,10 +201,22 @@ class RemoteUSPSTest < Minitest::Test
     end
   end
 
-  def test_valid_credentials
+  def test_correct_login_passes_valid_credentials?
     assert USPS.new(@usps_credentials.merge(:test => true)).valid_credentials?
   end
 
+  def test_wrong_login_fails_in_valid_credentials?
+    refute USPS.new(:login => 'ABCDEFGHIJKL', :test => true).valid_credentials?
+  end
+
+  def test_blank_login_fails_in_valid_credentials?
+    refute USPS.new(:login => '', :test => true).valid_credentials?
+  end
+
+  def test_nil_login_fails_in_valid_credentials?
+    refute USPS.new(:login => nil, :test => true).valid_credentials?
+  end
+
   def test_must_provide_login_creds_when_instantiating
     assert_raises ArgumentError do
       USPS.new(:test => true)

data/test/test_helper.rb

@@ -3,6 +3,7 @@ require 'bundler/setup'
 require 'minitest/autorun'
 require 'mocha/mini_test'
 require 'timecop'
+require 'business_time'
 
 require 'active_shipping'
 require 'logger'
@@ -32,7 +33,7 @@ module ActiveShipping::Test
 
     def credentials(key)
       data = all_credentials[key]
-      if data.nil? || data.all? { |k,v| v.nil? || v.empty? }
+      if data.nil? || data.all? { |k,v| v.nil? || v.to_s.empty? }
         raise NoCredentialsFound.new(key)
       end
       data.symbolize_keys
@@ -87,7 +88,8 @@ module ActiveShipping::Test
         :declared_value => Package.new(80, [2, 6, 12], :units => :imperial, :currency => 'USD', :value => 999.99),
         :tshirts => Package.new(10 * 16, nil, :units => :imperial),
         :shipping_container => Package.new(2200000, [2440, 2600, 6058], :description => '20 ft Standard Container', :units => :metric),
-        :largest_gold_bar => Package.new(250000, [45.5, 22.5, 17], :value => 15300000)
+        :largest_gold_bar => Package.new(250000, [45.5, 22.5, 17], :value => 15300000),
+        :books => Package.new(64, [4, 8, 6], :units => :imperial, :value => 15300000, :description => 'Books')
       }
     end
 
@@ -102,6 +104,14 @@ module ActiveShipping::Test
                                  :postal_code => 'K1P 1J1',
                                  :phone => '1-613-580-2400',
                                  :fax => '1-613-580-2495'),
+        :ottawa_with_name => Location.new( :country => 'CA',
+                                           :province => 'ON',
+                                           :city => 'Ottawa',
+                                           :name => 'Paul Ottawa',
+                                           :address1 => '110 Laurier Avenue West',
+                                           :postal_code => 'K1P 1J1',
+                                           :phone => '1-613-580-2400',
+                                           :fax => '1-613-580-2495'),
         :beverly_hills => Location.new(
                                       :country => 'US',
                                       :state => 'CA',

data/test/unit/carriers/canada_post_pws_rating_test.rb

@@ -112,46 +112,50 @@ class CanadaPostPwsRatingTest < Minitest::Test
 
   def test_build_rates_request
     xml = @cp.build_rates_request(@home_params, @dest_params, [@pkg1, @pkg2], @default_options)
-    doc = Nokogiri::HTML(xml)
+    doc = Nokogiri.XML(xml)
+    doc.remove_namespaces!
 
-    assert_equal @default_options[:customer_number], doc.xpath('//customer-number').first.content
-    assert_equal 'K1P1J1', doc.xpath('//origin-postal-code').first.content
-    assert_equal 'united-states', doc.xpath('//destination').children.first.name
+    assert_equal @default_options[:customer_number], doc.at('//customer-number').text
+    assert_equal 'K1P1J1', doc.at('//origin-postal-code').text
+    assert_equal 'united-states', doc.at('//destination/*').name
     assert !doc.xpath('//parcel-characteristics').empty?
-    assert_equal "3.427", doc.xpath('//parcel-characteristics//weight').first.content
+    assert_equal "3.427", doc.at('//parcel-characteristics//weight').text
   end
 
   def test_build_rates_request_use_carrier_customer_number
     xml = @cp_customer_number.build_rates_request(@home_params, @dest_params, [@pkg1, @pkg2])
-    doc = Nokogiri::HTML(xml)
+    doc = Nokogiri.XML(xml)
+    doc.remove_namespaces!
 
-    assert_equal @customer_number, doc.xpath('//customer-number').first.content
-    assert_equal 'K1P1J1', doc.xpath('//origin-postal-code').first.content
-    assert_equal 'united-states', doc.xpath('//destination').children.first.name
+    assert_equal @customer_number, doc.at('//customer-number').text
+    assert_equal 'K1P1J1', doc.at('//origin-postal-code').text
+    assert_equal 'united-states', doc.at('//destination/*').name
     assert !doc.xpath('//parcel-characteristics').empty?
-    assert_equal "3.427", doc.xpath('//parcel-characteristics//weight').first.content
+    assert_equal "3.427", doc.at('//parcel-characteristics//weight').text
   end
 
   def test_build_rates_request_override_carrier_customer_number
     xml = @cp_customer_number.build_rates_request(@home_params, @dest_params, [@pkg1, @pkg2], @default_options)
-    doc = Nokogiri::HTML(xml)
-
-    assert_equal @default_options[:customer_number], doc.xpath('//customer-number').first.content
-    assert_equal 'K1P1J1', doc.xpath('//origin-postal-code').first.content
-    assert_equal 'united-states', doc.xpath('//destination').children.first.name
-    assert !doc.xpath('//parcel-characteristics').empty?
-    assert_equal "3.427", doc.xpath('//parcel-characteristics//weight').first.content
+    doc = Nokogiri.XML(xml)
+    doc.remove_namespaces!
+
+    assert_equal @default_options[:customer_number], doc.at('//customer-number').text
+    assert_equal 'K1P1J1', doc.at('//origin-postal-code').text
+    assert_equal 'united-states', doc.at('//destination/*').name
+    assert doc.at('//parcel-characteristics')
+    assert_equal "3.427", doc.at('//parcel-characteristics//weight').text
   end
 
   def test_build_rates_request_location_object
     xml = @cp.build_rates_request(Location.new(@home_params), Location.new(@dest_params), [@pkg1, @pkg2], @default_options)
-    doc = Nokogiri::HTML(xml)
+    doc = Nokogiri.XML(xml)
+    doc.remove_namespaces!
 
-    assert_equal @default_options[:customer_number], doc.xpath('//customer-number').first.content
-    assert_equal 'K1P1J1', doc.xpath('//origin-postal-code').first.content
-    assert_equal 'united-states', doc.xpath('//destination').children.first.name
+    assert_equal @default_options[:customer_number], doc.at('//customer-number').text
+    assert_equal 'K1P1J1', doc.at('//origin-postal-code').text
+    assert_equal 'united-states', doc.at('//destination/*').name
     assert !doc.xpath('//parcel-characteristics').empty?
-    assert_equal "3.427", doc.xpath('//parcel-characteristics//weight').first.content
+    assert_equal "3.427", doc.at('//parcel-characteristics//weight').text
   end
 
   def test_build_rates_request_domestic
@@ -166,11 +170,12 @@ class CanadaPostPwsRatingTest < Minitest::Test
       :postal_code => 'V5J 1J1'
     }
     xml = @cp.build_rates_request(@home_params, @dest_params, [@pkg1, @pkg2], @default_options)
-    doc = Nokogiri::HTML(xml)
+    doc = Nokogiri.XML(xml)
+    doc.remove_namespaces!
 
-    assert_equal 'K1P1J1', doc.xpath('//origin-postal-code').first.content
-    assert_equal 'domestic', doc.xpath('//destination').children.first.name
-    assert_equal 'V5J1J1', doc.xpath('//destination//postal-code').first.content
+    assert_equal 'K1P1J1', doc.at('//origin-postal-code').text
+    assert_equal 'domestic', doc.at('//destination/*').name
+    assert_equal 'V5J1J1', doc.at('//destination//postal-code').text
   end
 
   def test_build_rates_request_international
@@ -183,89 +188,91 @@ class CanadaPostPwsRatingTest < Minitest::Test
       :country     => 'JP'
     }
     xml = @cp.build_rates_request(@home_params, @dest_params, [@pkg1, @pkg2], @default_options)
-    doc = Nokogiri::HTML(xml)
+    doc = Nokogiri.XML(xml)
+    doc.remove_namespaces!
 
-    assert_equal 'K1P1J1', doc.xpath('//origin-postal-code').first.content
-    assert_equal 'international', doc.xpath('//destination').children.first.name
-    assert_equal 'JP', doc.xpath('//destination//country-code').first.content
+    assert_equal 'K1P1J1', doc.xpath('//origin-postal-code').text
+    assert_equal 'international', doc.at('//destination/*').name
+    assert_equal 'JP', doc.at('//destination//country-code').text
   end
 
   def test_build_rates_request_with_cod_option
     opts = @default_options.merge(:cod => true, :cod_amount => 12.05)
     xml = @cp.build_rates_request(@home_params, @dest_params, [@pkg1, @pkg2], opts)
-    doc = Nokogiri::HTML(xml)
-
-    assert_equal 'COD', doc.xpath('//options/option').children.first.content
-    assert_equal '12.05', doc.xpath('//options/option').children.last.content
+    doc = Nokogiri.XML(xml)
+    doc.remove_namespaces!
+    assert_equal 'COD', doc.xpath('//options/option/option-code').text
+    assert_equal '12.05', doc.xpath('//options/option/option-amount').text
   end
 
   def test_build_rates_request_with_signature_option
     opts = @default_options.merge(:so => true)
     xml = @cp.build_rates_request(@home_params, @dest_params, [@pkg1, @pkg2], opts)
-    doc = Nokogiri::HTML(xml)
-
-    assert_equal 'SO', doc.xpath('//options/option').children.first.content
+    doc = Nokogiri.XML(xml)
+    doc.remove_namespaces!
+    assert_equal 'SO', doc.at('//options/option/option-code').text
   end
 
   def test_build_rates_request_with_insurance_option
     opts = @default_options.merge(:cov => true, :cov_amount => 122.05)
     xml = @cp.build_rates_request(@home_params, @dest_params, [@pkg1, @pkg2], opts)
-    doc = Nokogiri::HTML(xml)
-
-    assert_equal 'COV', doc.xpath('//options/option').children.first.content
-    assert_equal '122.05', doc.xpath('//options/option').children.last.content
+    doc = Nokogiri.XML(xml)
+    doc.remove_namespaces!
+    assert_equal 'COV', doc.at('//options/option/option-code').text
+    assert_equal '122.05', doc.at('//options/option/option-amount').text
   end
 
   def test_build_rates_request_with_other_options
     opts = @default_options.merge(:pa18 => true, :pa19 => true, :hfp => true, :dns => true, :lad => true)
     xml = @cp.build_rates_request(@home_params, @dest_params, [@pkg1, @pkg2], opts)
-    doc = Nokogiri::HTML(xml)
-
-    options = doc.xpath('//options/option').map(&:content).sort
+    doc = Nokogiri.XML(xml)
+    doc.remove_namespaces!
+    options = doc.xpath('//options/option/option-code').map(&:text).sort
     assert_equal %w(PA18 PA19 HFP DNS LAD).sort, options
   end
 
   def test_build_rates_request_with_single_item
     opts = @default_options
     xml = @cp.build_rates_request(@home_params, @dest_params, [@pkg1], opts)
-    doc = Nokogiri::HTML(xml)
-
-    assert_equal '0.025', doc.xpath('//parcel-characteristics/weight').first.content
+    doc = Nokogiri.XML(xml)
+    doc.remove_namespaces!
+    assert_equal '0.025', doc.at('//parcel-characteristics/weight').text
   end
 
   def test_build_rates_request_with_mailing_tube
     pkg = Package.new(25, [93, 10], :cylinder => true)
     opts = @default_options
     xml = @cp.build_rates_request(@home_params, @dest_params, [pkg], opts)
-    doc = Nokogiri::HTML(xml)
-
-    assert_equal 'true', doc.xpath('//parcel-characteristics/mailing-tube').first.content
+    doc = Nokogiri.XML(xml)
+    doc.remove_namespaces!
+    assert_equal 'true', doc.at('//parcel-characteristics/mailing-tube').text
   end
 
   def test_build_rates_request_with_oversize
     pkg = Package.new(25, [93, 10], :oversized => true)
     opts = @default_options
     xml = @cp.build_rates_request(@home_params, @dest_params, [pkg], opts)
-    doc = Nokogiri::HTML(xml)
-
-    assert_equal 'true', doc.xpath('//parcel-characteristics/oversized').first.content
+    doc = Nokogiri.XML(xml)
+    doc.remove_namespaces!
+    assert_equal 'true', doc.at('//parcel-characteristics/oversized').text
   end
 
   def test_build_rates_request_with_unpackaged
     pkg = Package.new(25, [93, 10], :unpackaged => true)
     opts = @default_options
     xml = @cp.build_rates_request(@home_params, @dest_params, [pkg], opts)
-    doc = Nokogiri::HTML(xml)
-
-    assert_equal 'true', doc.xpath('//parcel-characteristics/unpackaged').first.content
+    doc = Nokogiri.XML(xml)
+    doc.remove_namespaces!
+    assert_equal 'true', doc.at('//parcel-characteristics/unpackaged').text
   end
 
   def test_build_rates_request_with_zero_weight
     options = @default_options.merge(@shipping_opts1)
     line_items = [Package.new(0, [93, 10]), Package.new(0, [10, 10])]
-    request = @cp.build_rates_request(@home_params, @dest_params, line_items, options)
-    doc = Nokogiri::HTML(request)
-    assert_equal '0.001', doc.xpath('//parcel-characteristics/weight').first.content
+    xml = @cp.build_rates_request(@home_params, @dest_params, line_items, options)
+    doc = Nokogiri.XML(xml)
+    doc.remove_namespaces!
+    assert_equal '0.001', doc.at('//parcel-characteristics/weight').text
   end
 
   # parse response