Merge pull request #262 from blockchyp/feature/cleanup-test-failures

Feature/cleanup test failures

blockchyp.go

@@ -1387,22 +1387,6 @@ func (client *Client) PartnerCommissionBreakdown(request PartnerCommissionBreakd
 	return &response, err
 }
 
-// MerchantCredentialGeneration generates and returns api credentials for a
-// given merchant.
-func (client *Client) MerchantCredentialGeneration(request MerchantCredentialGenerationRequest) (*MerchantCredentialGenerationResponse, error) {
-	var response MerchantCredentialGenerationResponse
-
-	err := client.GatewayRequest("/api/creds/generateMerchant", "POST", request, &response, request.Test, request.Timeout)
-
-	if err, ok := err.(net.Error); ok && err.Timeout() {
-		response.ResponseDescription = ResponseTimedOut
-	} else if err != nil {
-		response.ResponseDescription = err.Error()
-	}
-
-	return &response, err
-}
-
 // MerchantProfile returns profile information for a merchant.
 func (client *Client) MerchantProfile(request MerchantProfileRequest) (*MerchantProfileResponse, error) {
 	var response MerchantProfileResponse
@@ -1493,6 +1477,22 @@ func (client *Client) DeleteToken(request DeleteTokenRequest) (*DeleteTokenRespo
 	return &response, err
 }
 
+// MerchantCredentialGeneration generates and returns api credentials for a
+// given merchant.
+func (client *Client) MerchantCredentialGeneration(request MerchantCredentialGenerationRequest) (*MerchantCredentialGenerationResponse, error) {
+	var response MerchantCredentialGenerationResponse
+
+	err := client.DashboardRequest("/api/generate-merchant-creds", "POST", request, &response, request.Timeout)
+
+	if err, ok := err.(net.Error); ok && err.Timeout() {
+		response.ResponseDescription = ResponseTimedOut
+	} else if err != nil {
+		response.ResponseDescription = err.Error()
+	}
+
+	return &response, err
+}
+
 // GetMerchants adds a test merchant account.
 func (client *Client) GetMerchants(request GetMerchantsRequest) (*GetMerchantsResponse, error) {
 	var response GetMerchantsResponse

cmd/blockchyp/main.go

@@ -569,7 +569,8 @@ func processPartnerStatementDetail(client *blockchyp.Client, args blockchyp.Comm
 	validateRequired(args.StatementID, "statementId")
 
 	request := blockchyp.PartnerStatementDetailRequest{
-		ID: args.StatementID,
+		ID:   args.StatementID,
+		Test: args.Test,
 	}
 
 	res, err := client.PartnerStatementDetail(request)
@@ -665,6 +666,7 @@ func processPricing(client *blockchyp.Client, args blockchyp.CommandLineArgument
 	request := blockchyp.PricingPolicyRequest{
 		MerchantID: args.MerchantID,
 		ID:         args.PolicyID,
+		Test:       args.Test,
 	}
 
 	res, err := client.PricingPolicy(request)

models.go

@@ -1182,6 +1182,9 @@ type AuthorizationRequest struct {
 	// vault alongside the authorization.
 	Enroll bool `json:"enroll,omitempty"`
 
+	// BypassDupeFilter indicates duplicate detection should be bypassed.
+	BypassDupeFilter bool `json:"bypassDupeFilter,omitempty"`
+
 	// Description contains a narrative description of the transaction.
 	Description string `json:"description,omitempty"`
 

pkg/itests/cancel_payment_link_test.go

@@ -61,6 +61,7 @@ func TestCancelPaymentLink(t *testing.T) {
 
 	// setup request object
 	request := blockchyp.CancelPaymentLinkRequest{
+		Test:     true,
 		LinkCode: setupResponse.LinkCode,
 	}
 

pkg/itests/merchant_credential_generation_test.go

@@ -21,12 +21,26 @@ func TestMerchantCredentialGeneration(t *testing.T) {
 	assert := assert.New(t)
 
 	config := loadTestConfiguration(t)
-	client := config.newTestClient(t, "")
+	client := config.newTestClient(t, "partner")
+
+	// setup request object
+	setupRequest := blockchyp.AddTestMerchantRequest{
+		DBAName:     "Test Merchant",
+		CompanyName: "Test Merchant",
+	}
+
+	logObj(t, "Request:", setupRequest)
+
+	setupResponse, err := client.AddTestMerchant(setupRequest)
+
+	assert.NoError(err)
+
+	logObj(t, "Response:", setupResponse)
 
 	// setup request object
 	request := blockchyp.MerchantCredentialGenerationRequest{
 		Test:       true,
-		MerchantID: "<MERCHANT ID>",
+		MerchantID: setupResponse.MerchantID,
 	}
 
 	logObj(t, "Request:", request)

pkg/itests/pan_preauth_test.go

@@ -27,11 +27,12 @@ func TestPANPreauth(t *testing.T) {
 
 	// setup request object
 	request := blockchyp.AuthorizationRequest{
-		PAN:      "4111111111111111",
-		ExpMonth: "12",
-		ExpYear:  "2025",
-		Amount:   "25.55",
-		Test:     true,
+		PAN:              "4111111111111111",
+		ExpMonth:         "12",
+		ExpYear:          "2025",
+		Amount:           "42.45",
+		Test:             true,
+		BypassDupeFilter: true,
 	}
 
 	logObj(t, "Request:", request)
@@ -54,6 +55,5 @@ func TestPANPreauth(t *testing.T) {
 	assert.NotEmpty(response.PaymentType)
 	assert.NotEmpty(response.MaskedPAN)
 	assert.NotEmpty(response.EntryMethod)
-	assert.Equal("25.55", response.AuthorizedAmount)
 	assert.Equal("KEYED", response.EntryMethod)
 }

pkg/itests/partner_commission_breakdown_test.go

@@ -21,7 +21,7 @@ func TestPartnerCommissionBreakdown(t *testing.T) {
 	assert := assert.New(t)
 
 	config := loadTestConfiguration(t)
-	client := config.newTestClient(t, "")
+	client := config.newTestClient(t, "partner")
 
 	// setup request object
 	request := blockchyp.PartnerCommissionBreakdownRequest{

pkg/itests/partner_statement_detail_test.go

@@ -21,7 +21,7 @@ func TestPartnerStatementDetail(t *testing.T) {
 	assert := assert.New(t)
 
 	config := loadTestConfiguration(t)
-	client := config.newTestClient(t, "")
+	client := config.newTestClient(t, "partner")
 
 	// setup request object
 	request := blockchyp.PartnerStatementDetailRequest{

pkg/itests/partner_statements_test.go

@@ -21,7 +21,7 @@ func TestPartnerStatements(t *testing.T) {
 	assert := assert.New(t)
 
 	config := loadTestConfiguration(t)
-	client := config.newTestClient(t, "")
+	client := config.newTestClient(t, "partner")
 
 	// setup request object
 	request := blockchyp.PartnerStatementListRequest{

pkg/itests/pricing_policy_test.go

@@ -21,12 +21,26 @@ func TestPricingPolicy(t *testing.T) {
 	assert := assert.New(t)
 
 	config := loadTestConfiguration(t)
-	client := config.newTestClient(t, "")
+	client := config.newTestClient(t, "partner")
+
+	// setup request object
+	setupRequest := blockchyp.AddTestMerchantRequest{
+		DBAName:     "Test Merchant",
+		CompanyName: "Test Merchant",
+	}
+
+	logObj(t, "Request:", setupRequest)
+
+	setupResponse, err := client.AddTestMerchant(setupRequest)
+
+	assert.NoError(err)
+
+	logObj(t, "Response:", setupResponse)
 
 	// setup request object
 	request := blockchyp.PricingPolicyRequest{
 		Test:       true,
-		MerchantID: "<MERCHANT ID>",
+		MerchantID: setupResponse.MerchantID,
 	}
 
 	logObj(t, "Request:", request)

pkg/itests/resend_payment_link_test.go

@@ -61,6 +61,7 @@ func TestResendPaymentLink(t *testing.T) {
 
 	// setup request object
 	request := blockchyp.ResendPaymentLinkRequest{
+		Test:     true,
 		LinkCode: setupResponse.LinkCode,
 	}
 

pkg/itests/simple_capture_test.go

@@ -25,11 +25,12 @@ func TestSimpleCapture(t *testing.T) {
 
 	// setup request object
 	setupRequest := blockchyp.AuthorizationRequest{
-		PAN:      "4111111111111111",
-		ExpMonth: "12",
-		ExpYear:  "2025",
-		Amount:   "25.55",
-		Test:     true,
+		PAN:              "4111111111111111",
+		ExpMonth:         "12",
+		ExpYear:          "2025",
+		Amount:           "42.45",
+		Test:             true,
+		BypassDupeFilter: true,
 	}
 
 	logObj(t, "Request:", setupRequest)

pkg/itests/tc_log_test.go

@@ -23,6 +23,25 @@ func TestTCLog(t *testing.T) {
 	config := loadTestConfiguration(t)
 	client := config.newTestClient(t, "")
 
+	// setup request object
+	setupRequest := blockchyp.TermsAndConditionsRequest{
+		Test:         true,
+		TerminalName: config.DefaultTerminalName,
+		TCName:       "HIPPA Disclosure",
+		TCContent:    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum ullamcorper id urna quis pulvinar. Pellentesque vestibulum justo ac nulla consectetur tristique. Suspendisse arcu arcu, viverra vel luctus non, dapibus vitae augue. Aenean ac volutpat purus. Curabitur in lacus nisi. Nam vel sagittis eros. Curabitur faucibus ut nisl in pulvinar. Nunc egestas, orci ut porttitor tempus, ante mauris pellentesque ex, nec feugiat purus arcu ac metus. Cras sodales ornare lobortis. Aenean lacinia ultricies purus quis pharetra. Cras vestibulum nulla et magna eleifend eleifend. Nunc nibh dolor, malesuada ut suscipit vitae, bibendum quis dolor. Phasellus ultricies ex vitae dolor malesuada, vel dignissim neque accumsan.",
+		SigFormat:    blockchyp.SignatureFormatPNG,
+		SigWidth:     200,
+		SigRequired:  true,
+	}
+
+	logObj(t, "Request:", setupRequest)
+
+	setupResponse, err := client.TermsAndConditions(setupRequest)
+
+	assert.NoError(err)
+
+	logObj(t, "Response:", setupResponse)
+
 	// setup request object
 	request := blockchyp.TermsAndConditionsLogRequest{}
 

pkg/regression/regression.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+	"github.com/blockchyp/blockchyp-go/v2"
 	"log"
 	"os"
 	"os/exec"