active_shipping 1.14.2 → 2.0.0

data/test/remote/ups_surepost_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RemoteUPSSurepostTest < Minitest::Test
+class RemoteUPSSurepostTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Credentials
   include ActiveShipping::Test::Fixtures
 

data/test/remote/ups_test.rb

@@ -1,8 +1,9 @@
 require 'test_helper'
 
-class RemoteUPSTest < Minitest::Test
+class RemoteUPSTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Credentials
   include ActiveShipping::Test::Fixtures
+  include HolidayHelpers
 
   def setup
     @options = credentials(:ups).merge(:test => true)
@@ -79,12 +80,12 @@ class RemoteUPSTest < Minitest::Test
     assert_equal 'UPS', rate.carrier
     assert_equal 'CAD', rate.currency
     if @options[:origin_account]
-      assert_instance_of Fixnum, rate.negotiated_rate
+      assert_kind_of Integer, rate.negotiated_rate
     else
       assert_equal rate.negotiated_rate, 0
     end
-    assert_instance_of Fixnum, rate.total_price
-    assert_instance_of Fixnum, rate.price
+    assert_kind_of Integer, rate.total_price
+    assert_kind_of Integer, rate.price
     assert_instance_of String, rate.service_name
     assert_instance_of String, rate.service_code
     assert_instance_of Array, rate.package_rates
@@ -312,7 +313,7 @@ class RemoteUPSTest < Minitest::Test
     assert response.success?
     refute_empty response.delivery_estimates
     ground_delivery_estimate = response.delivery_estimates.select {|de| de.service_name == "UPS Ground"}.first
-    assert_equal 1.business_days.after(today), ground_delivery_estimate.date
+    with_holidays(:ups) { assert_equal 1.business_days.after(today), ground_delivery_estimate.date }
   end
 
   def test_delivery_date_estimates_within_zip_with_no_value
@@ -331,7 +332,7 @@ class RemoteUPSTest < Minitest::Test
     assert response.success?
     refute_empty response.delivery_estimates
     ground_delivery_estimate = response.delivery_estimates.select {|de| de.service_name == "UPS Ground"}.first
-    assert_equal 1.business_days.after(today), ground_delivery_estimate.date
+    with_holidays(:ups) { assert_equal 1.business_days.after(today), ground_delivery_estimate.date }
   end
 
   def test_delivery_date_estimates_across_zips
@@ -350,9 +351,11 @@ class RemoteUPSTest < Minitest::Test
     assert response.success?
     refute_empty response.delivery_estimates
     ground_delivery_estimate = response.delivery_estimates.select {|de| de.service_name == "UPS Ground"}.first
-    assert_equal 3.business_days.after(today), ground_delivery_estimate.date
-    next_day_delivery_estimate = response.delivery_estimates.select {|de| de.service_name == "UPS Next Day Air"}.first
-    assert_equal 1.business_days.after(today), next_day_delivery_estimate.date
+    with_holidays(:ups) do
+      assert_equal 3.business_days.after(today), ground_delivery_estimate.date
+      next_day_delivery_estimate = response.delivery_estimates.select {|de| de.service_name == "UPS Next Day Air"}.first
+      assert_equal 1.business_days.after(today), next_day_delivery_estimate.date
+    end
   end
 
   def test_rate_with_single_service
@@ -387,8 +390,7 @@ class RemoteUPSTest < Minitest::Test
     assert response.success?
     refute_empty response.delivery_estimates
     ww_express_estimate = response.delivery_estimates.select {|de| de.service_name == "UPS Worldwide Express"}.first
-    expected_estimate = today.friday? ? today + 1 : 1.business_days.after(today)
-    assert_equal expected_estimate, ww_express_estimate.date
+    with_holidays(:ups) { assert_equal 1.business_days.after(today), ww_express_estimate.date }
   end
 
   def test_void_shipment

data/test/remote/usps_returns_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RemoteUSPSReturnsTest < Minitest::Test
+class RemoteUSPSReturnsTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Credentials
   include ActiveShipping::Test::Fixtures
 

data/test/remote/usps_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RemoteUSPSTest < Minitest::Test
+class RemoteUSPSTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Credentials
   include ActiveShipping::Test::Fixtures
 
@@ -76,8 +76,8 @@ class RemoteUSPSTest < Minitest::Test
     rate = response.rates.first
     assert_equal 'USPS', rate.carrier
     assert_equal 'USD', rate.currency
-    assert_instance_of Fixnum, rate.total_price
-    assert_instance_of Fixnum, rate.price
+    assert_kind_of Integer, rate.total_price
+    assert_kind_of Integer, rate.price
     assert_instance_of String, rate.service_name
     assert_instance_of String, rate.service_code
     assert_instance_of Array, rate.package_rates
@@ -109,8 +109,8 @@ class RemoteUSPSTest < Minitest::Test
     rate = response.rates.first
     assert_equal 'USPS', rate.carrier
     assert_equal 'USD', rate.currency
-    assert_instance_of Fixnum, rate.total_price
-    assert_instance_of Fixnum, rate.price
+    assert_kind_of Integer, rate.total_price
+    assert_kind_of Integer, rate.price
     assert_instance_of String, rate.service_name
     assert_instance_of String, rate.service_code
     assert_instance_of Array, rate.package_rates

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require 'bundler/setup'
 
 require 'minitest/autorun'
+require "minitest/reporters"
 require 'mocha/mini_test'
 require 'timecop'
 require 'business_time'
@@ -9,16 +10,25 @@ require 'active_shipping'
 require 'logger'
 require 'erb'
 require 'pry'
+require 'vcr'
+require 'webmock/minitest'
 
-# 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
+require_relative 'helpers/holiday_helpers.rb'
+
+Minitest::Reporters.use! Minitest::Reporters::ProgressReporter.new(detailed_skip: !!ENV["CI"])
 
+VCR.configure do |config|
+  config.cassette_library_dir = 'test/remote/vcr_cassettes'
+  config.allow_http_connections_when_no_cassette = true
+  config.hook_into :webmock
+end
 
-class Minitest::Test
+class ActiveSupport::TestCase
   include ActiveShipping
+
+  def logger
+    @logger ||= Logger.new(STDERR)
+  end
 end
 
 module ActiveShipping::Test

data/test/unit/carrier_test.rb

@@ -1,63 +1,69 @@
 require 'test_helper'
 
-class CarrierTest < Minitest::Test
+class CarrierTest < ActiveSupport::TestCase
   class ExampleCarrier < Carrier
     cattr_reader :name
     @@name = "Example Carrier"
   end
 
-  def setup
+  setup do
     @carrier = ExampleCarrier.new
   end
 
-  def test_find_rates_not_implemented
+  test "#find_rates is not implemented" do
     assert_raises NotImplementedError do
       @carrier.find_rates(nil, nil, nil)
     end
   end
 
-  def test_create_shipment_not_implemented
+  test "#create_shipment is not implemented" do
     assert_raises NotImplementedError do
       @carrier.create_shipment(nil, nil, nil)
     end
   end
 
-  def test_cancel_shipment_not_implemented
+  test "#cancel_shipment is not implemented" do
     assert_raises NotImplementedError do
       @carrier.cancel_shipment(nil)
     end
   end
 
-  def test_find_tracking_info_not_implemented
+  test "#find_tracking_info is not implemented" do
     assert_raises NotImplementedError do
       @carrier.find_tracking_info(nil)
     end
   end
 
-  def test_maximum_weight
-    assert_equal Quantified::Mass.new(150, :pounds), @carrier.maximum_weight
+  test "#available_services is not implemented" do
+    assert_raises NotImplementedError do
+      @carrier.available_services(nil, nil)
+    end
+  end
+
+  test "#maximum_weight returns a Measured::Weight" do
+    assert_equal Measured::Weight.new(150, :pounds), @carrier.maximum_weight
   end
 
-  def test_maximum_address_field_length
+  test "#maximum_address_field_length default value" do
     assert_equal 255, @carrier.maximum_address_field_length
   end
 
-  def test_requirements_empty_array
+  test "#requirements is an empty array" do
     assert_equal [], @carrier.send(:requirements)
   end
 
-  def test_timestamp_from_business_day_returns_nil_without_a_day
+  test "#timestamp_from_business_day returns nil without a day" do
     assert_nil @carrier.send(:timestamp_from_business_day, nil)
   end
 
-  def test_save_request
+  test "#save_request caches the last request on the object" do
     request = Object.new
     assert_nil @carrier.last_request
     @carrier.send(:save_request, request)
     assert_equal request, @carrier.last_request
   end
 
-  def test_timestamp_from_business_day_returns_two_days_in_the_future
+  test "#timestamp_from_business_day returns two days in the future" do
     current = DateTime.parse("Tue 19 Jul 2016")
     expected = DateTime.parse("Thu 21 Jul 2016")
 
@@ -66,7 +72,7 @@ class CarrierTest < Minitest::Test
     end
   end
 
-  def test_timestamp_from_business_day_returns_two_days_in_the_future_over_a_weekend
+  test "#timestamp_from_business_day returns two days in the future over a weekend" do
     current = DateTime.parse("Fri 22 Jul 2016")
     expected = DateTime.parse("Tue 26 Jul 2016")
 
@@ -75,7 +81,7 @@ class CarrierTest < Minitest::Test
     end
   end
 
-  def test_timestamp_from_business_day_returns_fifteen_days_in_the_future
+  test "#timestamp_from_business_day returns fifteen days in the future" do
     current = DateTime.parse("Wed 06 Jul 2016")
     expected = DateTime.parse("Wed 27 Jul 2016") # includes 3 weekends
 
@@ -84,7 +90,7 @@ class CarrierTest < Minitest::Test
     end
   end
 
-  def test_timestamp_from_business_day_handles_saturday
+  test "#timestamp_from_business_day handles saturday" do
     current = DateTime.parse("Sat 09 Jul 2016")
     expected = DateTime.parse("Mon 11 Jul 2016")
 
@@ -93,7 +99,7 @@ class CarrierTest < Minitest::Test
     end
   end
 
-  def test_timestamp_from_business_day_handles_sunday
+  test "#timestamp_from_business_day handles sunday" do
     current = DateTime.parse("Sun 10 Jul 2016")
     expected = DateTime.parse("Mon 11 Jul 2016")
 
@@ -102,13 +108,13 @@ class CarrierTest < Minitest::Test
     end
   end
 
-  def test_timestamp_from_business_day_returns_datetime
+  test "#timestamp_from_business_day returns a DateTime" do
     Timecop.freeze(DateTime.parse("Tue 19 Jul 2016")) do
       assert_equal DateTime, @carrier.send(:timestamp_from_business_day, 1).class
     end
   end
 
-  def test_default_location
+  test ".default_location is a valid address with defaults" do
     result = Carrier.default_location
 
     assert_equal Location, result.class
@@ -121,10 +127,4 @@ class CarrierTest < Minitest::Test
     assert_equal "1-310-285-1013", result.phone
     assert_equal "1-310-275-8159", result.fax
   end
-
-  def test_available_services_is_not_implemented
-    assert_raises NotImplementedError do
-      @carrier.available_services(nil, nil)
-    end
-  end
 end

data/test/unit/carriers/australia_post_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class AustraliaPostTest < Minitest::Test
+class AustraliaPostTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Fixtures
 
   def setup
@@ -11,13 +11,13 @@ class AustraliaPostTest < Minitest::Test
   end
 
   def test_service_domestic_simple_request
-    url = 'https://digitalapi.auspost.com.au/postage/parcel/domestic/service.json?from_postcode=2000&height=2&length=19&to_postcode=3108&weight=0.25&width=14'
+    url = 'https://digitalapi.auspost.com.au/postage/parcel/domestic/service.json?from_postcode=2000&height=2.0&length=19.0&to_postcode=3108&weight=0.25&width=14.0'
     @carrier.expects(:commit).with(url).returns(json_fixture('australia_post/service_domestic'))
     @carrier.find_rates(@sydney, @melbourne, package_fixtures[:book])
   end
 
   def test_service_domestic_combined_request
-    url_1 = 'https://digitalapi.auspost.com.au/postage/parcel/domestic/service.json?from_postcode=2000&height=2&length=19&to_postcode=3108&weight=0.25&width=14'
+    url_1 = 'https://digitalapi.auspost.com.au/postage/parcel/domestic/service.json?from_postcode=2000&height=2.0&length=19.0&to_postcode=3108&weight=0.25&width=14.0'
     url_2 = 'https://digitalapi.auspost.com.au/postage/parcel/domestic/service.json?from_postcode=2000&height=2.54&length=2.54&to_postcode=3108&weight=0.23&width=2.54'
     @carrier.expects(:commit).with(url_1).returns(json_fixture('australia_post/service_domestic'))
     @carrier.expects(:commit).with(url_2).returns(json_fixture('australia_post/service_domestic_2'))
@@ -95,13 +95,13 @@ class AustraliaPostTest < Minitest::Test
   end
 
   def test_calculate_domestic_simple_request
-    url = 'https://digitalapi.auspost.com.au/postage/parcel/domestic/calculate.json?from_postcode=2000&height=2&length=19&service_code=AUS_PARCEL_EXPRESS&to_postcode=3108&weight=0.25&width=14'
+    url = 'https://digitalapi.auspost.com.au/postage/parcel/domestic/calculate.json?from_postcode=2000&height=2.0&length=19.0&service_code=AUS_PARCEL_EXPRESS&to_postcode=3108&weight=0.25&width=14.0'
     @carrier.expects(:commit).with(url).returns(json_fixture('australia_post/calculate_domestic'))
     @carrier.calculate_rates(@sydney, @melbourne, package_fixtures[:book], 'AUS_PARCEL_EXPRESS')
   end
 
   def test_calculate_domestic_combined_request
-    url_1 = 'https://digitalapi.auspost.com.au/postage/parcel/domestic/calculate.json?from_postcode=2000&height=2&length=19&service_code=AUS_PARCEL_EXPRESS&to_postcode=3108&weight=0.25&width=14'
+    url_1 = 'https://digitalapi.auspost.com.au/postage/parcel/domestic/calculate.json?from_postcode=2000&height=2.0&length=19.0&service_code=AUS_PARCEL_EXPRESS&to_postcode=3108&weight=0.25&width=14.0'
     url_2 = 'https://digitalapi.auspost.com.au/postage/parcel/domestic/calculate.json?from_postcode=2000&height=2.54&length=2.54&service_code=AUS_PARCEL_EXPRESS&to_postcode=3108&weight=0.23&width=2.54'
     @carrier.expects(:commit).with(url_1).returns(json_fixture('australia_post/calculate_domestic'))
     @carrier.expects(:commit).with(url_2).returns(json_fixture('australia_post/calculate_domestic_2'))

data/test/unit/carriers/benchmark_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class BenchmarkTest < Minitest::Test
+class BenchmarkTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Fixtures
 
   def setup

data/test/unit/carriers/canada_post_pws_rating_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class CanadaPostPwsRatingTest < Minitest::Test
+class CanadaPostPwsRatingTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Fixtures
 
   def setup
@@ -343,20 +343,6 @@ class CanadaPostPwsRatingTest < Minitest::Test
     assert_equal 150, response[:restrictions][:max_width]
   end
 
-  def test_parse_find_service_options_response
-    body = xml_fixture('canadapost_pws/service_options_response_priority_worldwide')
-    response = @cp.parse_service_options_response(body)
-    assert_equal 3, response[:options].size
-    assert_equal 0, response[:restrictions][:min_weight]
-    assert_equal 0, response[:restrictions][:max_weight]
-    assert_equal 0, response[:restrictions][:min_length]
-    assert_equal 0, response[:restrictions][:min_height]
-    assert_equal 0, response[:restrictions][:min_width]
-    assert_equal 0, response[:restrictions][:max_length]
-    assert_equal 0, response[:restrictions][:max_height]
-    assert_equal 0, response[:restrictions][:max_width]
-  end
-
   def test_parse_find_option_response
     body = xml_fixture('canadapost_pws/option_response')
     response = @cp.parse_option_response(body)

data/test/unit/carriers/canada_post_pws_register_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class CanadaPostPwsRegisterTest < Minitest::Test
+class CanadaPostPwsRegisterTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Fixtures
 
   def setup
@@ -58,20 +58,6 @@ class CanadaPostPwsRegisterTest < Minitest::Test
     assert_equal false, response.has_default_credit_card
   end
 
-  def test_retrieve_merchant_details_without_contract_number
-    endpoint = @cp.endpoint + "ot/token/1234567890"
-    response = xml_fixture('canadapost_pws/merchant_details_response_no_contract_number')
-    @cp.expects(:ssl_get).with(endpoint, anything).returns(response)
-
-    response = @cp.retrieve_merchant_details(:token_id => '1234567890')
-    assert response.is_a?(CPPWSMerchantDetailsResponse)
-    assert_equal "1234567890", response.customer_number
-    assert_nil response.contract_number
-    assert_equal "1234567890123456", response.username
-    assert_equal "12343567890123456789012", response.password
-    assert_equal true, response.has_default_credit_card
-  end
-
   def test_retrieve_merchant_with_error
     endpoint = @cp.endpoint + "ot/token/1234567890"
     response = xml_fixture('canadapost_pws/merchant_details_error')

data/test/unit/carriers/canada_post_pws_shipping_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-class CanadaPostPwsShippingTest < Minitest::Test
+class CanadaPostPwsShippingTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Fixtures
 
   def setup
@@ -120,18 +120,6 @@ class CanadaPostPwsShippingTest < Minitest::Test
     refute request.blank?
   end
 
-  def test_create_shipment_request_with_incomplete_options_hash
-    bad_shipping_opts = { :cod_amount => 50.00, :cov_amount => 100.00 }
-    options = @default_options.merge(bad_shipping_opts)
-    request = @cp.build_shipment_request(@home_params, @paris_params, @pkg1, @line_item1, options)
-    refute request.blank?
-
-    doc = Nokogiri.XML(request)
-    doc.remove_namespaces!
-
-    assert_nil doc.at('non-contract-shipment').at('delivery-spec').at('options')
-  end
-
   def test_create_shipment_request_with_options
     options = @default_options.merge(@shipping_opts1)
     request = @cp.build_shipment_request(@home_params, @paris_params, @pkg1, @line_item1, options)

data/test/unit/carriers/canada_post_pws_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class CanadaPostPwsTest < Minitest::Test
+class CanadaPostPwsTest < ActiveSupport::TestCase
 
   def setup
     credentials = { platform_id: 123, api_key: '456', secret: '789' }
@@ -10,17 +10,17 @@ class CanadaPostPwsTest < Minitest::Test
   def test_get_sanitized_postal_code_location_nil
     postal_code = @cp.send(:get_sanitized_postal_code, nil)
 
-    assert_nil postal_code
+    assert_equal nil, postal_code
   end
 
   def test_get_sanitized_postal_code_postal_code_nil
     location = Location.new(name: 'Test test')
 
-    assert_nil location.postal_code
+    assert_equal nil, location.postal_code
 
     postal_code = @cp.send(:get_sanitized_postal_code, location)
 
-    assert_nil postal_code
+    assert_equal nil, postal_code
   end
 
   def test_get_sanitized_postal_code_spaces