active_shipping 1.14.2 → 2.0.0

data/test/unit/carriers/canada_post_pws_tracking_test.rb

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

data/test/unit/carriers/canada_post_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class CanadaPostTest < Minitest::Test
+class CanadaPostTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Fixtures
 
   def setup
@@ -25,10 +25,10 @@ class CanadaPostTest < Minitest::Test
 
     rate_estimates.rates.each do |rate|
       assert_instance_of RateEstimate, rate
-      assert_instance_of DateTime, rate.delivery_date
-      assert_instance_of DateTime, rate.shipping_date
+      assert_instance_of Date, rate.delivery_date
+      assert_instance_of Date, rate.shipping_date
       assert_instance_of String, rate.service_name
-      assert_instance_of Fixnum, rate.total_price
+      assert_kind_of Integer, rate.total_price
     end
 
     rate_estimates.boxes.each do |box|
@@ -41,7 +41,7 @@ class CanadaPostTest < Minitest::Test
       assert_instance_of Float, box.width
 
       box.packedItems.each do |p|
-        assert_instance_of Fixnum, p.quantity
+        assert_kind_of Integer, p.quantity
         assert_instance_of String, p.description
       end
     end
@@ -58,10 +58,10 @@ class CanadaPostTest < Minitest::Test
 
     rate_estimates.rates.each do |rate|
       assert_instance_of RateEstimate, rate
-      assert_instance_of DateTime, rate.delivery_date
-      assert_instance_of DateTime, rate.shipping_date
+      assert_instance_of Date, rate.delivery_date
+      assert_instance_of Date, rate.shipping_date
       assert_instance_of String, rate.service_name
-      assert_instance_of Fixnum, rate.total_price
+      assert_kind_of Integer, rate.total_price
     end
 
     rate_estimates.boxes.each do |box|
@@ -74,7 +74,7 @@ class CanadaPostTest < Minitest::Test
       assert_instance_of Float, box.width
 
       box.packedItems.each do |p|
-        assert_instance_of Fixnum, p.quantity
+        assert_kind_of Integer, p.quantity
         assert_instance_of String, p.description
       end
     end

data/test/unit/carriers/correios_test.rb

@@ -1,7 +1,6 @@
-# -*- coding: utf-8 -*-
 require "test_helper"
 
-class CorreiosTest < Minitest::Test
+class CorreiosTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Fixtures
 
   def setup

data/test/unit/carriers/fedex_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class FedExTest < Minitest::Test
+class FedExTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Fixtures
 
   def setup
@@ -156,8 +156,8 @@ class FedExTest < Minitest::Test
     rate = response.rates.first
     assert_equal 'FedEx', 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
@@ -189,8 +189,8 @@ class FedExTest < Minitest::Test
     rate = response.rates.first
     assert_equal 'FedEx', rate.carrier
     assert_equal 'CAD', 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/unit/carriers/kunaki_test.rb

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

data/test/unit/carriers/new_zealand_post_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class NewZealandPostTest < Minitest::Test
+class NewZealandPostTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Fixtures
 
   def setup
@@ -11,20 +11,20 @@ class NewZealandPostTest < Minitest::Test
   end
 
   def test_domestic_book_request
-    url = "http://api.nzpost.co.nz/ratefinder/domestic?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&carrier=all&format=json&height=20&length=190&postcode_dest=1010&postcode_src=6011&thickness=140&weight=0.25"
+    url = "http://api.nzpost.co.nz/ratefinder/domestic?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&carrier=all&format=json&height=20.0&length=190.0&postcode_dest=1010&postcode_src=6011&thickness=140.0&weight=0.25"
     @carrier.expects(:commit).with([url]).returns([json_fixture("newzealandpost/domestic_book")])
     @carrier.find_rates(@wellington, @auckland, package_fixtures[:book])
   end
 
   def test_domestic_poster_request
-    url = "http://api.nzpost.co.nz/ratefinder/domestic?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&carrier=all&diameter=100&format=json&length=930&postcode_dest=1010&postcode_src=6011&weight=0.1"
+    url = "http://api.nzpost.co.nz/ratefinder/domestic?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&carrier=all&diameter=100.0&format=json&length=930.0&postcode_dest=1010&postcode_src=6011&weight=0.1"
     @carrier.expects(:commit).with([url]).returns([json_fixture("newzealandpost/domestic_poster")])
     @carrier.find_rates(@wellington, @auckland, package_fixtures[:poster])
   end
 
   def test_domestic_combined_request
     urls = [
-      "http://api.nzpost.co.nz/ratefinder/domestic?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&carrier=all&format=json&height=20&length=190&postcode_dest=1010&postcode_src=6011&thickness=140&weight=0.25",
+      "http://api.nzpost.co.nz/ratefinder/domestic?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&carrier=all&format=json&height=20.0&length=190.0&postcode_dest=1010&postcode_src=6011&thickness=140.0&weight=0.25",
       "http://api.nzpost.co.nz/ratefinder/domestic?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&carrier=all&format=json&height=25.4&length=25.4&postcode_dest=1010&postcode_src=6011&thickness=25.4&weight=0.226796185"
     ]
     @carrier.expects(:commit).with(urls).returns([json_fixture("newzealandpost/domestic_book"), json_fixture("newzealandpost/domestic_small_half_pound")])
@@ -75,14 +75,14 @@ class NewZealandPostTest < Minitest::Test
   end
 
   def test_domestic_blank_package_response
-    url = "http://api.nzpost.co.nz/ratefinder/domestic?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&carrier=all&format=json&height=0&length=0&postcode_dest=1010&postcode_src=6011&thickness=0&weight=0.0"
+    url = "http://api.nzpost.co.nz/ratefinder/domestic?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&carrier=all&format=json&height=0.0&length=0.0&postcode_dest=1010&postcode_src=6011&thickness=0.0&weight=0.0"
     @carrier.expects(:commit).with([url]).returns([json_fixture("newzealandpost/domestic_default")])
     response = @carrier.find_rates(@wellington, @auckland, package_fixtures[:just_zero_grams])
     assert_equal [240, 300, 400, 420, 450, 450, 450, 500, 550, 589, 715, 830, 890], response.rates.map(&:price)
   end
 
   def test_domestic_book_response_params
-    url = "http://api.nzpost.co.nz/ratefinder/domestic?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&carrier=all&format=json&height=20&length=190&postcode_dest=1010&postcode_src=6011&thickness=140&weight=0.25"
+    url = "http://api.nzpost.co.nz/ratefinder/domestic?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&carrier=all&format=json&height=20.0&length=190.0&postcode_dest=1010&postcode_src=6011&thickness=140.0&weight=0.25"
     @carrier.expects(:commit).with([url]).returns([json_fixture("newzealandpost/domestic_book")])
     response = @carrier.find_rates(@wellington, @auckland, package_fixtures[:book])
     assert_equal [url], response.request
@@ -91,7 +91,7 @@ class NewZealandPostTest < Minitest::Test
   end
 
   def test_international_book_request
-    url = "http://api.nzpost.co.nz/ratefinder/international?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&country_code=CA&format=json&height=20&length=190&thickness=140&value=0&weight=0.25"
+    url = "http://api.nzpost.co.nz/ratefinder/international?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&country_code=CA&format=json&height=20.0&length=190.0&thickness=140.0&value=0&weight=0.25"
     @carrier.expects(:commit).with([url]).returns([json_fixture("newzealandpost/international_book")])
     @carrier.find_rates(@wellington, @ottawa, package_fixtures[:book])
   end
@@ -109,7 +109,7 @@ class NewZealandPostTest < Minitest::Test
   end
 
   def test_international_book_response_params
-    url = "http://api.nzpost.co.nz/ratefinder/international?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&country_code=CA&format=json&height=20&length=190&thickness=140&value=0&weight=0.25"
+    url = "http://api.nzpost.co.nz/ratefinder/international?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&country_code=CA&format=json&height=20.0&length=190.0&thickness=140.0&value=0&weight=0.25"
     @carrier.expects(:commit).with([url]).returns([json_fixture("newzealandpost/international_book")])
     response = @carrier.find_rates(@wellington, @ottawa, package_fixtures[:book])
     assert_equal [url], response.request
@@ -119,7 +119,7 @@ class NewZealandPostTest < Minitest::Test
 
   def test_international_combined_request
     urls = [
-      "http://api.nzpost.co.nz/ratefinder/international?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&country_code=CA&format=json&height=20&length=190&thickness=140&value=0&weight=0.25",
+      "http://api.nzpost.co.nz/ratefinder/international?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&country_code=CA&format=json&height=20.0&length=190.0&thickness=140.0&value=0&weight=0.25",
       "http://api.nzpost.co.nz/ratefinder/international?api_key=4d9dc0f0-dda0-012e-066f-000c29b44ac0&country_code=CA&format=json&height=25.4&length=25.4&thickness=25.4&value=0&weight=0.226796185"
     ]
     @carrier.expects(:commit).with(urls).returns([json_fixture("newzealandpost/international_book"), json_fixture("newzealandpost/international_wii")])
@@ -145,7 +145,6 @@ class NewZealandPostTest < Minitest::Test
     @carrier.expects(:commit).returns([""])
     error = @carrier.find_rates(@wellington, @ottawa, package_fixtures[:book]) rescue $!
     assert_equal ActiveShipping::ResponseError, error.class
-    assert_equal "A JSON text must at least contain two octets!", error.message
     assert_equal [""], error.response.raw_responses
     response_params = { "responses" => [] }
     assert_equal response_params, error.response.params

data/test/unit/carriers/shipwire_test.rb

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

data/test/unit/carriers/stamps_test.rb

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

data/test/unit/carriers/ups_test.rb

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

data/test/unit/carriers/usps_returns_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class USPSReturnsTest < Minitest::Test
+class USPSReturnsTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Fixtures
 
   attr_reader :carrier

data/test/unit/carriers/usps_test.rb

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

data/test/unit/carriers_test.rb

@@ -1,17 +1,16 @@
 require 'test_helper'
 
-class CarriersTest < Minitest::Test
-
-  def test_get_usps_by_string
+class CarriersTest < ActiveSupport::TestCase
+  test ".find searches by string for a carrier and finds USPS" do
     assert_equal ActiveShipping::USPS, ActiveShipping::Carriers.find('usps')
     assert_equal ActiveShipping::USPS, ActiveShipping::Carriers.find('USPS')
   end
 
-  def test_get_usps_by_name
+  test ".find searches by symbol for a carrier and finds USPS" do
     assert_equal ActiveShipping::USPS, ActiveShipping::Carriers.find(:usps)
   end
 
-  def test_get_unknown_carrier
+  test ".find raises with an unknown carrier" do
     assert_raises(NameError) { ActiveShipping::Carriers.find(:polar_north) }
   end
 end

data/test/unit/external_return_label_request_test.rb

@@ -1,123 +1,167 @@
 require 'test_helper'
 
-class ExternalReturnLabelRequestTest < Minitest::Test
+class ExternalReturnLabelRequestTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Fixtures
 
-  def setup
+  setup do
     @external_request_label_req =
-      ExternalReturnLabelRequest.from_hash ({
-        :customer_name => "Test Customer",
-        :customer_address1 => "122 Hudson St.",
-        :customer_city => "New York",
-        :customer_state => "NY",
-        :customer_zipcode => "10013",
-        :label_format => "No Instructions",
-        :label_definition => "4X6",
-        :service_type_code => "044",
-        :merchant_account_id => "12345",
-        :mid => "12345678",
-        :call_center_or_self_service => "Customer",
-        :address_override_notification => "true"
-      })
-
+      ExternalReturnLabelRequest.from_hash(
+        customer_name: "Test Customer",
+        customer_address1: "122 Hudson St.",
+        customer_city: "New York",
+        customer_state: "NY",
+        customer_zipcode: "10013",
+        label_format: "No Instructions",
+        label_definition: "4X6",
+        service_type_code: "044",
+        merchant_account_id: "12345",
+        mid: "12345678",
+        call_center_or_self_service: "Customer",
+        address_override_notification: "true",
+      )
+    @email = "no-reply@example.com"
+    @invalid_email = "not_a_valid_email"
+    @anything = "Any string"
+    @blank_values = ["", "    "]
   end
 
-  def test_recipient_bcc
+  test "#recipient_bcc raises on an invalid email" do
     assert_raises(USPSValidationError) do
-      @external_request_label_req.recipient_bcc = "not_a_valid_email"
-    end
-    assert_silent do
-      @external_request_label_req.recipient_bcc = "no-reply@example.com"
+      @external_request_label_req.recipient_bcc = @invalid_email
     end
   end
 
-  def test_recipient_email
+  test "#recipient_bcc assigns the email" do
+    @external_request_label_req.recipient_bcc = @email
+    assert_equal @email, @external_request_label_req.recipient_bcc
+  end
+
+  test "#recipient_email raises if invalid" do
     assert_raises(USPSValidationError) do
-      @external_request_label_req.recipient_email = "not_a_valid_email"
-    end
-    assert_silent do
-      @external_request_label_req.recipient_email = "no-reply@example.com"
+      @external_request_label_req.recipient_email = @invalid_email
     end
   end
 
-  def test_recipient_name
-    assert_silent do
-      @external_request_label_req.recipient_name = "any string"
-    end
+  test "#recipient_email assigns the email" do
+    @external_request_label_req.recipient_email = @email
+    assert_equal @email, @external_request_label_req.recipient_email
   end
 
-  def test_sender_email
+  test "#recipient_name accepts anything" do
+    @external_request_label_req.recipient_name = @anything
+    assert_equal @anything, @external_request_label_req.recipient_name
+  end
+
+  test "#sender_email raises if invalid" do
     assert_raises(USPSValidationError) do
-      @external_request_label_req.sender_email = "not_a_valid_email"
-    end
-    assert_silent do
-      @external_request_label_req.sender_email = "no-reply@example.com"
+      @external_request_label_req.sender_email = @invalid_email
     end
   end
 
-  def test_sender_name
-    assert_silent do
-      @external_request_label_req.sender_name = "any string"
+  test "#sender_email assigns the email" do
+    @external_request_label_req.sender_email = @email
+    assert_equal @email, @external_request_label_req.sender_email
+  end
+
+  test "#sender_name assigns the value" do
+    @external_request_label_req.sender_name = @anything
+    assert_equal @anything, @external_request_label_req.sender_name
+  end
+
+  test "#sender_name raises if blank or nil" do
+    @blank_values.each do |blank|
+      assert_raises(USPSValidationError) do
+        @external_request_label_req.sender_name = blank
+      end
     end
+  end
+
+  test "#sender_name raises if nil" do
     assert_raises(USPSValidationError) do
-      @external_request_label_req.sender_name = ""
+      @external_request_label_req.sender_name = nil
     end
   end
 
-  def test_image_type
-    assert_silent do
-      ExternalReturnLabelRequest::IMAGE_TYPE.each do |img_type|
-        @external_request_label_req.image_type = img_type.downcase
-      end
+  test "#image_type accepts a valid image type" do
+    ExternalReturnLabelRequest::IMAGE_TYPE.each do |type|
+      @external_request_label_req.image_type = type.downcase
+      assert_equal type, @external_request_label_req.image_type
     end
+  end
+
+  test "#image_type raises on jpg" do
     assert_raises(USPSValidationError) do
       @external_request_label_req.image_type = "jpg"
     end
   end
 
-  def test_call_center_or_self_service
-    assert_silent do
-      ExternalReturnLabelRequest::CALL_CENTER_OR_SELF_SERVICE.each do |cc_or_cs|
-        @external_request_label_req.call_center_or_self_service = cc_or_cs
-      end
+  test "#call_center_or_self_service accepts the valid values defined" do
+    ExternalReturnLabelRequest::CALL_CENTER_OR_SELF_SERVICE.each do |cc_or_cs|
+      @external_request_label_req.call_center_or_self_service = cc_or_cs
+      assert_equal cc_or_cs, @external_request_label_req.call_center_or_self_service
     end
+  end
+
+  test "#call_center_or_self_service raises on an invalid value" do
     assert_raises(USPSValidationError) do
       @external_request_label_req.call_center_or_self_service = "Invalid"
     end
   end
 
-  def test_packaging_information
-    assert_silent do
-      @external_request_label_req.packaging_information = "Any String"
+  test "#packaging_information accepts a value" do
+    @external_request_label_req.packaging_information = @anything
+    assert_equal @anything, @external_request_label_req.packaging_information
+  end
+
+  test "#packaging_information accepts blank values" do
+    @blank_values.each do |blank|
+      @external_request_label_req.packaging_information = blank
+      assert_equal "", @external_request_label_req.packaging_information
     end
+  end
+
+  test "#packaging_information raises on a value too long" do
     assert_raises(USPSValidationError) do
-      @external_request_label_req.packaging_information = (1..50).to_a.join("_")
+      @external_request_label_req.packaging_information = "a" * 16
     end
   end
 
-  def test_packaging_information2
-    assert_silent do
-      @external_request_label_req.packaging_information2 = "Any String"
-    end
-    assert_silent do
-      @external_request_label_req.packaging_information2 = " "
-      @external_request_label_req.packaging_information2 = ""
+  test "#packaging_information2 accepts a value" do
+    @external_request_label_req.packaging_information2 = @anything
+    assert_equal @anything, @external_request_label_req.packaging_information2
+  end
+
+  test "#packaging_information2 accepts blank values" do
+    @blank_values.each do |blank|
+      @external_request_label_req.packaging_information2 = blank
+      assert_equal "", @external_request_label_req.packaging_information2
     end
+  end
+
+  test "#packaging_information2 raises when a value is too long" do
     assert_raises(USPSValidationError) do
-      @external_request_label_req.packaging_information2 = (1..50).to_a.join("_")
+      @external_request_label_req.packaging_information2 = "a" * 16
     end
   end
 
-  def test_customer_address2
-    assert_silent do
-      @external_request_label_req.customer_address2 = "     "
-    end
-    assert_silent do
-      @external_request_label_req.customer_address2 = nil
+  test "#customer_address2 accepts a value" do
+    @external_request_label_req.customer_address2 = @anything
+    assert_equal @anything, @external_request_label_req.customer_address2
+  end
+
+  test "#customer_address2 accepts blank values" do
+    @blank_values.each do |blank|
+      @external_request_label_req.customer_address2 = blank
+      assert_nil @external_request_label_req.customer_address2
     end
   end
 
-  def test_sanitize
+  test "#customer_address2 accepts nil" do
+    @external_request_label_req.customer_address2 = nil
+    assert_nil @external_request_label_req.customer_address2
+  end
+
+  test "#sanitize scrubs strings" do
     assert_equal "", @external_request_label_req.send(:sanitize,'   ')
     assert_equal 'some string', @external_request_label_req.send(:sanitize, 'some string   ')
     assert_nil @external_request_label_req.send(:sanitize, {})
@@ -127,18 +171,21 @@ class ExternalReturnLabelRequestTest < Minitest::Test
     assert_equal ExternalReturnLabelRequest::CAP_STRING_LEN, @external_request_label_req.send(:sanitize, (1..100).to_a.join("_")).size
   end
 
-  def test_to_bool
+  test "#to_bool coerces true values" do
     assert_equal true, @external_request_label_req.send(:to_bool, 'yes')
     assert_equal true, @external_request_label_req.send(:to_bool, 'true')
     assert_equal true, @external_request_label_req.send(:to_bool, true)
     assert_equal true, @external_request_label_req.send(:to_bool, '1')
+  end
+
+  test "#to_bool coerces false values" do
     assert_equal false, @external_request_label_req.send(:to_bool, '0')
     assert_equal false, @external_request_label_req.send(:to_bool, 'false')
     assert_equal false, @external_request_label_req.send(:to_bool, false)
     assert_equal false, @external_request_label_req.send(:to_bool, nil, false)
   end
 
-  def test_validate_range
+  test "#validate_range" do
     assert_raises(USPSValidationError) do
       @external_request_label_req.send(:validate_range, '1', 5, 10, __method__)
     end
@@ -149,7 +196,7 @@ class ExternalReturnLabelRequestTest < Minitest::Test
     @external_request_label_req.send(:validate_range, '5 char', nil, 10, __method__)
   end
 
-  def test_validate_string_length
+  test "#validate_string_length" do
     assert_raises(USPSValidationError) do
       @external_request_label_req.send(:validate_string_length, '14 char string', 13, __method__)
     end
@@ -159,7 +206,7 @@ class ExternalReturnLabelRequestTest < Minitest::Test
     @external_request_label_req.send(:validate_string_length, '14 char string', 14, __method__)
   end
 
-  def test_validate_set_inclusion
+  test "#validate_set_inclusion" do
     assert_raises(USPSValidationError) do
       @external_request_label_req.send(:validate_set_inclusion, 'not_in_set', ['v1','v2','v3'], __method__)
     end
@@ -169,20 +216,22 @@ class ExternalReturnLabelRequestTest < Minitest::Test
     @external_request_label_req.send(:validate_set_inclusion, 'v1', ['v1','v2','v3'], __method__)
   end
 
-  def test_validate_email
+  test "#validate_email" do
     assert_raises(USPSValidationError) do
-      @external_request_label_req.send(:validate_email, 'not_a_valid_email', __method__)
+      @external_request_label_req.send(:validate_email, @invalid_email, __method__)
     end
     assert_raises(USPSValidationError) do
-      @external_request_label_req.send(:validate_email, '    ', __method__)
+      @external_request_label_req.send(:validate_email, "    ", __method__)
     end
-    assert_equal 'no-reply@example.com', @external_request_label_req.send(:validate_email, 'no-reply@example.com', __method__)
-    assert_equal 'no-reply@example.com', @external_request_label_req.send(:validate_email, '  no-reply@example.com  ', __method__)
+    assert_equal @email, @external_request_label_req.send(:validate_email, @email, __method__)
+    assert_equal @email, @external_request_label_req.send(:validate_email, "    #{@email}    ", __method__)
   end
 
-  def test_tag_required
+  test "#initialize raises with no tag" do
     assert_raises(USPSMissingRequiredTagError) { ExternalReturnLabelRequest.new }
+  end
 
+  test "#initialize passes with valid values and that every key is necessary" do
     sample_hash = {
       :customer_name => "Test Customer",
       :customer_address1 => "122 Hudson St.",
@@ -198,9 +247,7 @@ class ExternalReturnLabelRequestTest < Minitest::Test
       :address_override_notification => "true"
     }
 
-    assert_silent do
-      ExternalReturnLabelRequest.from_hash(sample_hash)
-    end
+    assert ExternalReturnLabelRequest.from_hash(sample_hash)
 
     sample_hash.keys.each do |k|
       assert_raises(USPSMissingRequiredTagError) do
@@ -208,5 +255,4 @@ class ExternalReturnLabelRequestTest < Minitest::Test
       end
     end
   end
-
 end