paytrace 0.1.23 → 1.0.0

data/lib/paytrace/version.rb

@@ -1,4 +1,4 @@
 module PayTrace
   # Version number
-  VERSION = "0.1.23"
+  VERSION = "1.0.0"
 end

data/lib/paytrace.rb

@@ -1,6 +1,5 @@
 require "paytrace/version"
 require "paytrace/configuration"
-require "paytrace/credit_card"
 require "paytrace/customer"
 require "paytrace/transaction"
 require "paytrace/email_receipt_request"
@@ -12,6 +11,3 @@ require 'paytrace/exceptions'
 require 'paytrace/recurring_transaction'
 require 'paytrace/check_transaction'
 require 'paytrace/batch_operations'
-
-module PayTrace
-end

data/paytrace.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard", '~> 0'
   spec.add_development_dependency "guard-minitest", '~> 0'
   spec.add_development_dependency "ruby_gntp", '~> 0'
+  spec.add_development_dependency "simplecov", "~> 0.7.1"
 end

data/run_all_integrations.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+ruby test/scripts/run_adjust_amount.rb
+ruby test/scripts/run_change_password.rb
+ruby test/scripts/run_email_request.rb
+ruby test/scripts/run_export_transactions.rb
+ruby test/scripts/run_settle_transaction.rb
+ruby test/scripts/run_attach_signature.rb
+ruby test/scripts/run_check_transactions.rb
+ruby test/scripts/run_export_batches.rb
+ruby test/scripts/run_level3_data.rb
+ruby test/scripts/run_calculate_shipping_costs.rb
+ruby test/scripts/run_create_customer.rb
+ruby test/scripts/run_export_customers.rb
+ruby test/scripts/run_recur_payments_integration.rb

data/test/paytrace/api/gateway_spec.rb

@@ -83,6 +83,14 @@ describe PayTrace::API::Gateway do
       faraday.verify_stubbed_calls
     end
 
+    it "includes the last response object" do
+      PayTrace::API::Gateway.debug = true
+      request = PayTrace::API::Request.new
+      gateway = PayTrace::API::Gateway.new
+      response = gateway.send_request(request)
+      PayTrace::API::Gateway.last_response_object.must_equal response
+    end
+
     it "raises an ErrorResponse exception for errors" do
       PayTrace::API::Gateway.debug = true # to enable mock response
       PayTrace::API::Gateway.raise_exceptions = true

data/test/paytrace/api/request_spec.rb

@@ -24,40 +24,96 @@ describe PayTrace::API::Request do
     to_url.must_equal "UN~request_test|PSWD~request_password|TERMS~Y|"
   end
 
-  it "can manually set params" do
-    r = PayTrace::API::Request.new
-    r.set_param(:billing_name, "Fred Jones")
-    r.params[:billing_name].must_equal ["Fred Jones"]
-  end
+  describe "#set_param" do
+    it "can manually set params" do
+      r = PayTrace::API::Request.new
+      r.set_param(:billing_name, "Fred Jones")
+      r.params[:billing_name].must_equal ["Fred Jones"]
+    end
 
-  it "can bulk set params" do
-    params = {billing_name: "Fred Jones", billing_postal_code: 98133}
-    r = PayTrace::API::Request.new
-    r.set_params([:billing_name, :billing_postal_code], params)
-    r.params[:billing_name].must_equal ["Fred Jones"]
-    r.params[:billing_postal_code].must_equal [98133]
-  end
+    it "invokes set_request on values sent to set_param" do
+      request = PayTrace::API::Request.new
 
-  it "can alias parameters in set_params" do
-    params = {name: "Ron Jones", postal_code: 98134}
-    r = PayTrace::API::Request.new
-    r.set_params([[:billing_name, :name], [:billing_postal_code, :postal_code]], params)
-    r.params[:billing_name].must_equal ["Ron Jones"]
-    r.params[:billing_postal_code].must_equal [98134]  
-  end
+      mock = MiniTest::Mock.new
+      mock.expect(:nil?, false)
+      mock.expect(:set_request, nil, [request])
 
-  it "raises a validation exception for unknown fields" do
-    r = PayTrace::API::Request.new
+      request.set_param(:billing_name, mock)
+    end
+
+    it "correctly sets a value named :discretionary_data as discretionary data" do
+      r = PayTrace::API::Request.new
+      r.set_param(:discretionary_data, {hair_color: 'red'})
+
+      r.params[:discretionary_data].must_equal nil
+      r.discretionary_data[:hair_color].must_equal 'red'
+    end
+
+    it "properly appends discretionary data" do 
+      r = PayTrace::API::Request.new
+      r.set_param(:billing_name, "Fred Jones")
+      r.set_discretionary(:hair_color, "red")
+
+      r.to_parms_string.must_equal "UN~#{PayTrace.configuration.user_name}|PSWD~#{PayTrace.configuration.password}|TERMS~Y|" +
+        "BNAME~Fred Jones|hair_color~red|"
+    end
+
+    it "raises a validation exception for unknown fields" do
+      r = PayTrace::API::Request.new
 
-    -> { r.set_param(:foo, "bar") }.must_raise PayTrace::Exceptions::ValidationError
+      -> { r.set_param(:foo, "bar") }.must_raise PayTrace::Exceptions::ValidationError
+    end
   end
 
-  it "properly appends discretionary data" do 
-    r = PayTrace::API::Request.new
-    r.set_param(:billing_name, "Fred Jones")
-    r.set_discretionary(:hair_color, "red")
+  describe "#set_params" do
+    it "can bulk set params" do
+      params = {billing_name: "Fred Jones", billing_postal_code: 98133}
+      r = PayTrace::API::Request.new
+      r.set_params(params, [:billing_name, :billing_postal_code])
+      r.params[:billing_name].must_equal ["Fred Jones"]
+      r.params[:billing_postal_code].must_equal [98133]
+    end
+
+    it "can alias parameters in set_params" do
+      params = {name: "Ron Jones", postal_code: 98134}
+      r = PayTrace::API::Request.new
+      r.set_params(params, [[:billing_name, :name], [:billing_postal_code, :postal_code]])
+      r.params[:billing_name].must_equal ["Ron Jones"]
+      r.params[:billing_postal_code].must_equal [98134]  
+    end
+
+    it "attempts to fetch parameter values from an object if supplied" do
+      mock = MiniTest::Mock.new
+
+      mock.expect(:is_a?, false, [Hash])
+      mock.expect(:send, "1234 Fake Ave.", [:send, :billing_address])
+
+      r = PayTrace::API::Request.new
+      r.set_params(mock, [:billing_address])
+      mock.verify
+      r.params[:billing_address].must_equal ["1234 Fake Ave."]
+    end
+
+    it "raises an exception for missing required parameters" do
+      params = {}
+      r = PayTrace::API::Request.new
+
+      -> { r.set_params(params, [:billing_name]) }.must_raise PayTrace::Exceptions::ValidationError
+    end
 
-    r.to_parms_string.must_equal "UN~#{PayTrace.configuration.user_name}|PSWD~#{PayTrace.configuration.password}|TERMS~Y|" +
-      "BNAME~Fred Jones|hair_color~red|"
+    it "raises an exception for extra unrecognized parameters" do
+      params = {billing_name: "1234 Fake Blvd."}
+      r = PayTrace::API::Request.new
+
+      -> { r.set_params(params, []) }.must_raise PayTrace::Exceptions::ValidationError
+    end
+      
+    it "does not raise an exception for optional parameters" do
+      params = {billing_address: "1234 Fake St."}
+      r = PayTrace::API::Request.new
+
+      # MiniTest does not have a "wont_raise" predicate, but an exception is the same as failure...
+      r.set_params(params, [], [:billing_address])
+    end
   end
 end

data/test/paytrace/api/response_spec.rb

@@ -5,7 +5,7 @@ describe PayTrace::API::Response do
   it "parses a successful transaction response" do
     from_server = "RESPONSE~101. Your transaction was successfully approved.|TRANSACTIONID~93|APPCODE~TAS671|APPMSG~APPROVAL TAS671 - Approved and completed|AVSRESPONSE~0|CSCRESPONSE~|"
     response = PayTrace::API::Response.new(from_server)        
-    response.response_code.must_equal "101. Your transaction was successfully approved."
+    response.get_response().must_equal "101. Your transaction was successfully approved."
   end
 
   it "parses multiple error responses" do
@@ -24,7 +24,7 @@ describe PayTrace::API::Response do
     from_server ="ERROR~35. Please provide a valid Credit Card Number.|ERROR~43. Please provide a valid Expiration Month.|"
     response = PayTrace::API::Response.new(from_server)
     actual ="35. Please provide a valid Credit Card Number.,43. Please provide a valid Expiration Month.,"
-    response.response_code.must_equal actual
+    response.get_response().must_equal actual
   end
 
 

data/test/paytrace/batch_operations_spec.rb

@@ -10,16 +10,16 @@ describe PayTrace::BatchOperations do
     PayTrace::API::Gateway.reset_trace()
   end
 
-  describe "exportSingle" do
+  describe "export_single" do
     it "generates the correct request" do
       PayTrace::API::Gateway.next_response = "RESULT~Ok"
-      result = PayTrace::BatchOperations.exportSingle()
+      result = PayTrace::BatchOperations.export_single()
       PayTrace::API::Gateway.last_request.must_equal base_url(PayTrace::BatchOperations::EXPORT_SINGLE_METHOD)
     end
 
     it "accepts an optional batch number" do
       PayTrace::API::Gateway.next_response = "RESULT~Ok"
-      result = PayTrace::BatchOperations.exportSingle(batch_number: 12345)
+      result = PayTrace::BatchOperations.export_single(batch_number: 12345)
       PayTrace::API::Gateway.last_request.must_equal base_url(PayTrace::BatchOperations::EXPORT_SINGLE_METHOD) + "BATCHNUMBER~12345|"
     end
   end
@@ -27,7 +27,7 @@ describe PayTrace::BatchOperations do
   describe "exportMultiple" do
     it "generates the correct request" do
       PayTrace::API::Gateway.next_response = "RESULT~Ok"
-      result = PayTrace::BatchOperations.exportMultiple(start_date: "03/01/2014", end_date: "06/01/2014")
+      result = PayTrace::BatchOperations.export_multiple(start_date: "03/01/2014", end_date: "06/01/2014")
       PayTrace::API::Gateway.last_request.must_equal base_url(PayTrace::BatchOperations::EXPORT_MULTIPLE_METHOD) +
         "SDATE~03/01/2014|EDATE~06/01/2014|"
     end
@@ -36,7 +36,7 @@ describe PayTrace::BatchOperations do
   describe "exportDetails" do
     it "generates the correct request" do
       PayTrace::API::Gateway.next_response = "RESULT~Ok"
-      result = PayTrace::BatchOperations.exportDetails(batch_number: 12346)
+      result = PayTrace::BatchOperations.export_details(batch_number: 12346)
       PayTrace::API::Gateway.last_request.must_equal base_url(PayTrace::BatchOperations::EXPORT_DETAILS_METHOD) + "BATCHNUMBER~12346|"
     end
   end

data/test/paytrace/{check_transactions_spec.rb → check_transaction_spec.rb}

@@ -21,9 +21,8 @@ describe PayTrace::CheckTransaction do
         account_number: 1234567,
         routing_number: 1234568
       }
-      result = PayTrace::CheckTransaction.process_sale(params)
-      PayTrace::API::Gateway.last_request.must_equal base_url(PayTrace::CheckTransaction::PROCESS_SALE_METHOD) +
-        "CHECKTYPE~foo|AMOUNT~17.29|DDA~1234567|TR~1234568|"
+      result = PayTrace::CheckTransaction.sale(params)
+      assert_last_request_equals "METHOD~ProcessCheck|CHECKTYPE~foo|AMOUNT~17.29|DDA~1234567|TR~1234568|"
     end
 
     # UN, PSWD, TERMS, METHOD, CHECKTYPE, AMOUNT, CUSTID
@@ -34,9 +33,8 @@ describe PayTrace::CheckTransaction do
         amount: 17.28,
         customer_id: 'MMouse'
       }
-      result = PayTrace::CheckTransaction.process_sale(params)
-      PayTrace::API::Gateway.last_request.must_equal base_url(PayTrace::CheckTransaction::PROCESS_SALE_METHOD) +
-        "CHECKTYPE~bar|AMOUNT~17.28|CUSTID~MMouse|"
+      result = PayTrace::CheckTransaction.customer_id_sale(params)
+      assert_last_request_equals "METHOD~ProcessCheck|CHECKTYPE~bar|AMOUNT~17.28|CUSTID~MMouse|"
     end
 
 
@@ -73,7 +71,7 @@ describe PayTrace::CheckTransaction do
         shipping_address: sa
       }
 
-      result = PayTrace::CheckTransaction.process_sale(params)
+      result = PayTrace::CheckTransaction.customer_id_sale(params)
       PayTrace::API::Gateway.last_request.must_equal base_url(PayTrace::CheckTransaction::PROCESS_SALE_METHOD) +
         "CHECKTYPE~baz|AMOUNT~17.29|CUSTID~DDuck|BNAME~John Doe|BADDRESS~1234 Main Street|BADDRESS2~Apartment 1B|BCITY~Shoreline|BSTATE~WA|BZIP~98133|BCOUNTRY~US|SNAME~Jane Doe|SADDRESS~1235 Moon Street|SADDRESS2~Apartment 2C|SCITY~Shortline|SSTATE~WA|SZIP~98134|SCOUNTRY~US|"
     end
@@ -83,6 +81,7 @@ describe PayTrace::CheckTransaction do
       PayTrace::API::Gateway.next_response = "RESULT~Ok"
 
       params = {
+        check_type: 'foo',
         email: 'foo@bar.com',
         description: 'You bought something with a check, yo!',
         invoice: '12345',
@@ -91,10 +90,9 @@ describe PayTrace::CheckTransaction do
         tax_amount: 2.11,
         customer_reference_id: '1234AB'
       }
-      result = PayTrace::CheckTransaction.process_sale(params)
+      result = PayTrace::CheckTransaction.customer_id_sale(params)
 
-      PayTrace::API::Gateway.last_request.must_equal base_url(PayTrace::CheckTransaction::PROCESS_SALE_METHOD) +
-        "AMOUNT~17.27|CUSTID~YosemiteSam|EMAIL~foo@bar.com|INVOICE~12345|DESCRIPTION~You bought something with a check, yo!|TAX~2.11|CUSTREF~1234AB|"
+      assert_last_request_equals "METHOD~ProcessCheck|CHECKTYPE~foo|AMOUNT~17.27|CUSTID~YosemiteSam|EMAIL~foo@bar.com|INVOICE~12345|DESCRIPTION~You bought something with a check, yo!|TAX~2.11|CUSTREF~1234AB|"
     end
 
     it "accepts discretionary data" do
@@ -107,10 +105,9 @@ describe PayTrace::CheckTransaction do
         routing_number: 1234568,
         discretionary_data: {hair_color: :red}
       }
-      result = PayTrace::CheckTransaction.process_sale(params)
+      result = PayTrace::CheckTransaction.sale(params)
 
-      PayTrace::API::Gateway.last_request.must_equal base_url(PayTrace::CheckTransaction::PROCESS_SALE_METHOD) +
-        "CHECKTYPE~foo|AMOUNT~17.29|DDA~1234567|TR~1234568|hair_color~red|"
+      assert_last_request_equals "METHOD~ProcessCheck|CHECKTYPE~foo|AMOUNT~17.29|DDA~1234567|TR~1234568|hair_color~red|"
     end
   end
 
@@ -125,10 +122,10 @@ describe PayTrace::CheckTransaction do
         routing_number: 1234568,
         discretionary_data: {hair_color: :red}
       }
-      result = PayTrace::CheckTransaction.process_hold(params)
+      result = PayTrace::CheckTransaction.hold(params)
 
       PayTrace::API::Gateway.last_request.must_equal base_url(PayTrace::CheckTransaction::PROCESS_SALE_METHOD) +
-        "AMOUNT~17.29|DDA~1234567|TR~1234568|CHECKTYPE~Hold|hair_color~red|"
+        "CHECKTYPE~Hold|AMOUNT~17.29|DDA~1234567|TR~1234568|hair_color~red|"
     end
 
     describe "refund transactions" do
@@ -136,12 +133,36 @@ describe PayTrace::CheckTransaction do
         PayTrace::API::Gateway.next_response = "RESULT~Ok"
         params = {
           check_type: 'foo',
-          check_id: 12345678
+          amount: 19.99,
+          routing_number: 325081403,
+          account_number: 1234567890
+        }
+        result = PayTrace::CheckTransaction.refund(params)
+
+        assert_last_request_equals "METHOD~ProcessCheck|CHECKTYPE~Refund|AMOUNT~19.99|DDA~1234567890|TR~325081403|"
+      end
+
+      it "accepts a customer ID" do
+        PayTrace::API::Gateway.next_response = "RESULT~Ok"
+        params = {
+          check_type: 'foo',
+          amount: 19.99,
+          customer_id: 1234
+        }
+        result = PayTrace::CheckTransaction.refund_by_customer_id(params)
+
+        assert_last_request_equals "METHOD~ProcessCheck|CHECKTYPE~Refund|AMOUNT~19.99|CUSTID~1234|"
+      end
+
+      it "accepts a check ID" do
+        PayTrace::API::Gateway.next_response = "RESULT~Ok"
+        params = {
+          check_type: 'foo',
+          check_id: 1235
         }
-        result = PayTrace::CheckTransaction.process_refund(params)
+        result = PayTrace::CheckTransaction.refund_existing_check_id(params)
 
-        PayTrace::API::Gateway.last_request.must_equal base_url(PayTrace::CheckTransaction::PROCESS_SALE_METHOD) +
-          "CHECKID~12345678|CHECKTYPE~Refund|"
+        assert_last_request_equals "METHOD~ProcessCheck|CHECKTYPE~Refund|CHECKID~1235|"
       end
     end
 

data/test/paytrace/customer_spec.rb

@@ -1,10 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '../../test_helper.rb')
 
 describe PayTrace::Customer do
-  def base_url
-    "UN~#{PayTrace.configuration.user_name}|PSWD~#{PayTrace.configuration.password}|TERMS~Y|"
-  end
-
   before do
     PayTrace::API::Gateway.debug = true
     PayTrace::API::Gateway.next_response = "RESPONSE~ok|CUSTOMERID~12345|CUSTID~john_doe"
@@ -15,7 +11,7 @@ describe PayTrace::Customer do
       PayTrace::API::Gateway.next_response = "CUSTOMERRECORD~CUSTID=741356+CUSTOMERID=741356+CC=************5454+EXPMNTH=12+EXPYR=17+SNAME=+SADDRESS=+SADDRESS2=+SCITY=+SCOUNTY=+SSTATE=+SZIP=+SCOUNTRY=US+BNAME=DUMMY1+BADDRESS=+BADDRESS2=+BCITY=+BSTATE=+BZIP=+BCOUNTRY=US+EMAIL=+PHONE=+FAX=+WHEN=2/7/2014 5:02:08 PM+USER=demo123+IP=131.191.89.5+DDA=123412341234+TR=051000017+hair_color=+|"
       records = PayTrace::Customer.export()
 
-      PayTrace::API::Gateway.last_request.must_equal base_url + "METHOD~ExportCustomers|"
+      assert_last_request_equals "METHOD~ExportCustomers|"
       records.count.must_equal 1
       records.must_be_instance_of Array
       records[0].must_be_instance_of Hash
@@ -26,7 +22,7 @@ describe PayTrace::Customer do
       PayTrace::API::Gateway.next_response = "CUSTOMERRECORD~CUSTID=12345+BNAME=John Doe+LASTTRANX=01/01/2014+LASTCHECK=02/01/2014+WHEN=03/01/2014"
       records = PayTrace::Customer.export_inactive({days_inactive: 30})
 
-      PayTrace::API::Gateway.last_request.must_equal base_url + "METHOD~ExportInactiveCustomers|DAYS~30|"
+      assert_last_request_equals "METHOD~ExportInactiveCustomers|DAYS~30|"
       records.count.must_equal 1
       records.must_be_instance_of Array
       records[0].must_be_instance_of Hash
@@ -38,75 +34,63 @@ describe PayTrace::Customer do
   describe "create customer profile" do
     # first call path: create from credit card information
     it "can be created from credit card information" do
-      credit_card = PayTrace::CreditCard.new({card_number: "1234123412341234", expiration_month: 12, expiration_year: 2014})
-      billing_addr = PayTrace::Address.new({name: "Foo Bar", address_type: :billing})
-
-      PayTrace::Customer.from_cc_info({customer_id: "foo_bar", credit_card: credit_card, billing_address: billing_addr})
-      PayTrace::API::Gateway.last_request.must_equal base_url + "METHOD~CreateCustomer|CUSTID~foo_bar|BNAME~Foo Bar|CC~1234123412341234|EXPMNTH~12|EXPYR~2014|"
+      params = {
+        customer_id: "foo_bar",
+        billing_name: "Foo Bar",
+        card_number: "1234123412341234",
+        expiration_month: 12,
+        expiration_year: 2014
+      }
+      PayTrace::Customer.from_cc_info(params)
+      assert_last_request_equals "METHOD~CreateCustomer|CUSTID~foo_bar|BNAME~Foo Bar|CC~1234123412341234|EXPMNTH~12|EXPYR~2014|"
     end
 
     # second call path: create from a transaction ID
     it "can be created from a transaction ID" do
       PayTrace::Customer.from_transaction_id({customer_id: "foo_bar", transaction_id: 12345678})
-      PayTrace::API::Gateway.last_request.must_equal base_url + "METHOD~CreateCustomer|CUSTID~foo_bar|TRANXID~12345678|"
+      assert_last_request_equals "METHOD~CreateCustomer|CUSTID~foo_bar|TRANXID~12345678|"
     end
 
     # all billing address fields are accepted
     it "accepts full billing address information" do
-      credit_card = PayTrace::CreditCard.new({card_number: "1234123412341234", expiration_month: 12, expiration_year: 2014})
-      billing_addr = PayTrace::Address.new({
-        name: "Foo Bar",
-        street: "1234 Main Street",
-        street2: "Apartment 1B",
-        city: "Shoreline",
-        state: "WA",
-        country: "USA",
-        postal_code: 98133,
-        address_type: :billing
-        })
-
-      PayTrace::Customer.from_cc_info({customer_id: "foo_bar", credit_card: credit_card, billing_address: billing_addr})
-      PayTrace::API::Gateway.last_request.must_equal base_url + "METHOD~CreateCustomer|CUSTID~foo_bar|BNAME~Foo Bar|BADDRESS~1234 Main Street|" + 
+      params = {
+        customer_id: "foo_bar",
+        billing_name: "Foo Bar",
+        billing_address: "1234 Main Street",
+        billing_address2: "Apartment 1B",
+        billing_city: "Shoreline",
+        billing_state: "WA",
+        billing_country: "USA",
+        billing_postal_code: 98133,
+        card_number: "1234123412341234",
+        expiration_month: 12,
+        expiration_year: 2014
+      }
+
+      PayTrace::Customer.from_cc_info(params)
+      assert_last_request_equals "METHOD~CreateCustomer|CUSTID~foo_bar|BNAME~Foo Bar|BADDRESS~1234 Main Street|" + 
         "BADDRESS2~Apartment 1B|BCITY~Shoreline|BSTATE~WA|BZIP~98133|BCOUNTRY~USA|" +
         "CC~1234123412341234|EXPMNTH~12|EXPYR~2014|"
     end
 
     # you can include a shipping address, too
     it "accepts a shipping address" do
-      shipping_addr = PayTrace::Address.new({
-        name: "Foo Bar",
-        street: "1234 Main Street",
-        street2: "Apartment 1B",
-        city: "Shoreline",
-        state: "WA",
-        region: "Snohomish",
-        country: "USA",
-        postal_code: 98133,
-        address_type: :shipping
-        })
-
-      PayTrace::Customer.from_transaction_id({customer_id: "foo_bar", transaction_id: 12345678, shipping_address: shipping_addr})
-      PayTrace::API::Gateway.last_request.must_equal base_url + "METHOD~CreateCustomer|CUSTID~foo_bar|TRANXID~12345678|SNAME~Foo Bar|SADDRESS~1234 Main Street|" + 
-        "SADDRESS2~Apartment 1B|SCITY~Shoreline|SCOUNTY~Snohomish|SSTATE~WA|SZIP~98133|SCOUNTRY~USA|"
-    end
+      params = {
+        customer_id: "foo_bar",
+        transaction_id: 12345678, 
+        shipping_name: "Foo Bar",
+        shipping_address: "1234 Main Street",
+        shipping_address2: "Apartment 1B",
+        shipping_city: "Shoreline",
+        shipping_state: "WA",
+        shipping_region: "Snohomish",
+        shipping_country: "USA",
+        shipping_postal_code: 98133
+      }
 
-    # special case: when creating from transaction ID, the billing name is ignored (no clue why, but it's in the API)
-    it "ignores the billing address name if using a transaction id" do
-      billing_addr = PayTrace::Address.new({
-        name: "Foo Bar",
-        street: "1234 Main Street",
-        street2: "Apartment 1B",
-        city: "Shoreline",
-        state: "WA",
-        region: "region",
-        country: "USA",
-        postal_code: 98133,
-        address_type: :billing
-        })
-
-      PayTrace::Customer.from_transaction_id({customer_id: "foo_bar", transaction_id: 12345678, billing_address: billing_addr})
-      PayTrace::API::Gateway.last_request.must_equal base_url + "METHOD~CreateCustomer|CUSTID~foo_bar|TRANXID~12345678|BADDRESS~1234 Main Street|" + 
-        "BADDRESS2~Apartment 1B|BCITY~Shoreline|BSTATE~WA|BZIP~98133|BCOUNTRY~USA|"
+      PayTrace::Customer.from_transaction_id(params)
+      assert_last_request_equals "METHOD~CreateCustomer|CUSTID~foo_bar|TRANXID~12345678|SNAME~Foo Bar|SADDRESS~1234 Main Street|" + 
+        "SADDRESS2~Apartment 1B|SCITY~Shoreline|SCOUNTY~Snohomish|SSTATE~WA|SZIP~98133|SCOUNTRY~USA|"
     end
 
     # there are additional fields (email, phone, discretionary data, etc.) that can be sent
@@ -115,8 +99,8 @@ describe PayTrace::Customer do
         customer_id: "foo_bar",
         transaction_id: 12345678,
         email: "support@paytrace.com",
-        phone: "123-555-1212",
-        fax: "456-555-1212",
+        customer_phone: "123-555-1212",
+        customer_fax: "456-555-1212",
         customer_password: "none_shall_pass",
         account_number: 123456789,
         routing_number: 12345678,
@@ -124,7 +108,7 @@ describe PayTrace::Customer do
       }
 
       PayTrace::Customer.from_transaction_id(params)
-      PayTrace::API::Gateway.last_request.must_equal base_url + "METHOD~CreateCustomer|CUSTID~foo_bar|TRANXID~12345678|EMAIL~support@paytrace.com|" + 
+      assert_last_request_equals "METHOD~CreateCustomer|CUSTID~foo_bar|TRANXID~12345678|EMAIL~support@paytrace.com|" + 
         "PHONE~123-555-1212|FAX~456-555-1212|CUSTPSWD~none_shall_pass|DDA~123456789|TR~12345678|" +
         "hair_color~red|"
     end
@@ -132,80 +116,72 @@ describe PayTrace::Customer do
 
   describe "update customer profile" do
     it "accepts a billing address" do
-      billing_addr = PayTrace::Address.new({
-        name: "Foo Bar",
-        street: "1234 Main Street",
-        street2: "Apartment 1B",
-        city: "Shoreline",
-        state: "WA",
-        region: "region",
-        country: "USA",
-        postal_code: 98133,
-        address_type: :billing
-        })
-
-      c = PayTrace::Customer.new
-      c.update({new_customer_id: "joanie_doe", billing_address: billing_addr})
-
-      PayTrace::API::Gateway.last_request.must_equal base_url + "METHOD~UpdateCustomer|NEWCUSTID~joanie_doe|" +
+      params = {
+        customer_id: "john doe",
+        new_customer_id: "joanie_doe", 
+        billing_name: "Foo Bar",
+        billing_address: "1234 Main Street",
+        billing_address2: "Apartment 1B",
+        billing_city: "Shoreline",
+        billing_state: "WA",
+        billing_country: "USA",
+        billing_postal_code: 98133
+      }
+
+      PayTrace::Customer.update(params)
+
+      assert_last_request_equals "METHOD~UpdateCustomer|CUSTID~john doe|" +
         "BNAME~Foo Bar|BADDRESS~1234 Main Street|" + 
-        "BADDRESS2~Apartment 1B|BCITY~Shoreline|BSTATE~WA|BZIP~98133|BCOUNTRY~USA|" 
+        "BADDRESS2~Apartment 1B|BCITY~Shoreline|BSTATE~WA|BZIP~98133|BCOUNTRY~USA|NEWCUSTID~joanie_doe|" 
     end
 
     it "accepts a shipping address" do
-      shipping_addr = PayTrace::Address.new({
-        name: "Foo Bar",
-        street: "1234 Main Street",
-        street2: "Apartment 1B",
-        city: "Shoreline",
-        state: "WA",
-        region: "Snohomish",
-        country: "USA",
-        postal_code: 98133,
-        address_type: :shipping
-        })
-
-      c = PayTrace::Customer.new
-      c.update({new_customer_id: "joanie_doe", shipping_address: shipping_addr})
-
-      PayTrace::API::Gateway.last_request.must_equal base_url + "METHOD~UpdateCustomer|NEWCUSTID~joanie_doe|" +
+      params = {
+        customer_id: "john doe",
+        new_customer_id: "joanie_doe", 
+        shipping_name: "Foo Bar",
+        shipping_address: "1234 Main Street",
+        shipping_address2: "Apartment 1B",
+        shipping_city: "Shoreline",
+        shipping_state: "WA",
+        shipping_region: "Snohomish",
+        shipping_country: "USA",
+        shipping_postal_code: 98133
+      }
+
+      PayTrace::Customer.update(params)
+
+      assert_last_request_equals "METHOD~UpdateCustomer|CUSTID~john doe|" +
         "SNAME~Foo Bar|SADDRESS~1234 Main Street|SADDRESS2~Apartment 1B|SCITY~Shoreline|SCOUNTY~Snohomish|" +
-        "SSTATE~WA|SZIP~98133|SCOUNTRY~USA|" 
+        "SSTATE~WA|SZIP~98133|SCOUNTRY~USA|NEWCUSTID~joanie_doe|" 
     end
 
     it "accepts extra customer information" do
       params = {
+        customer_id: "bar_foo",
         new_customer_id: "foo_bar",
         email: "support@paytrace.com",
-        phone: "123-555-1212",
-        fax: "456-555-1212",
+        customer_phone: "123-555-1212",
+        customer_fax: "456-555-1212",
         customer_password: "none_shall_pass",
         account_number: 123456789,
         routing_number: 12345678,
         discretionary_data: {hair_color: "red"}
       }
 
-      c = PayTrace::Customer.new
-      c.update(params)
+      PayTrace::Customer.update(params)
 
-      PayTrace::API::Gateway.last_request.must_equal base_url + "METHOD~UpdateCustomer|NEWCUSTID~foo_bar|" +
+      assert_last_request_equals "METHOD~UpdateCustomer|CUSTID~bar_foo|" +
       "EMAIL~support@paytrace.com|PHONE~123-555-1212|FAX~456-555-1212|CUSTPSWD~none_shall_pass|DDA~123456789|" +
-      "TR~12345678|hair_color~red|"
+      "TR~12345678|NEWCUSTID~foo_bar|hair_color~red|"
     end
   end
 
   describe "delete customer profile" do
-    it "works with an instantiated Customer object" do
-      c = PayTrace::Customer.new("foo_bar")
-       c.delete
-
-        PayTrace::API::Gateway.last_request.must_equal base_url + "METHOD~DeleteCustomer|CUSTID~foo_bar|"
-    end
-
     it "works with a static class method" do
       PayTrace::Customer.delete("foob_barb")
 
-      PayTrace::API::Gateway.last_request.must_equal base_url + "METHOD~DeleteCustomer|CUSTID~foob_barb|"
+      assert_last_request_equals "METHOD~DeleteCustomer|CUSTID~foob_barb|"
     end
   end
 end