Skip to content

Commit

Permalink
Merge pull request #37 from rondogency/timestamp-fix
Browse files Browse the repository at this point in the history 
Fixed all hardcoded timestamps in mock response
  • Loading branch information
Ziyi Mu authored Jul 12, 2018
2 parents b0f375c + d2d8143 commit 260f98b
Show file tree
Hide file tree
Showing 10 changed files with 57 additions and 35 deletions.
8 changes: 6 additions & 2 deletions tests/Message/FetchRefundsRequestTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public function setUp()
$this->refundReference = $this->faker->refundReference();
$this->currency = $this->faker->currency();
$this->amount = $this->faker->monetaryAmount($this->currency);
$this->timestamp = date('Y-m-d\T12:00:00-04:00');
}

/**
Expand Down Expand Up @@ -151,7 +152,8 @@ public function testSendSuccess()
'TRANSACTION_ID' => $this->transactionId,
'TRANSACTION_REFERENCE' => $this->transactionReference,
'CURRENCY' => $this->currency,
'AMOUNT' => $this->amount
'AMOUNT' => $this->amount,
'TIMESTAMP' => $this->timestamp
));

$response = $this->request->send();
Expand Down Expand Up @@ -189,7 +191,9 @@ public function testSendSuccess()
*/
public function testSendByTimeSuccess()
{
$this->setMockSoapResponse('FetchRefundsByTimeSuccess.xml');
$this->setMockSoapResponse('FetchRefundsByTimeSuccess.xml', array(
'TIMESTAMP' => $this->timestamp
));

$response = $this->request->send();

Expand Down
15 changes: 12 additions & 3 deletions tests/Message/FetchTransactionRequestTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ public function setUp()
$this->avsCode = $this->faker->statusCode();
$this->token = $this->faker->payPalToken();
$this->paypalEmail = $this->faker->email();

/* timestamp should set to current time or it will break vod test */
$this->timestamp = date('Y-m-d\T12:00:00-04:00');
}

/**
Expand Down Expand Up @@ -127,7 +130,8 @@ public function testSendSuccess()
'SKU' => $this->sku,
'AUTHORIZATION_CODE' => $this->authorizationCode,
'CVV_CODE' => $this->cvvCode,
'AVS_CODE' => $this->avsCode
'AVS_CODE' => $this->avsCode,
'TIMESTAMP' => $this->timestamp
));

$response = $this->request->send();
Expand Down Expand Up @@ -189,6 +193,7 @@ public function testSendSuccess()
$this->assertTrue(is_string($attribute->getName()));
$this->assertTrue(is_string($attribute->getValue()));
}
$this->assertEquals($this->timestamp, $transaction->getTimestamp());

$this->assertSame('https://soap.prodtest.sj.vindicia.com/18.0/Transaction.wsdl', $this->getLastEndpoint());
}
Expand All @@ -200,7 +205,8 @@ public function testSendByReferenceSuccess()
{
$this->setMockSoapResponse('FetchTransactionByReferenceSuccess.xml', array(
'TRANSACTION_ID' => $this->transactionId,
'TRANSACTION_REFERENCE' => $this->transactionReference
'TRANSACTION_REFERENCE' => $this->transactionReference,
'TIMESTAMP' => $this->timestamp
));

$response = $this->request->send();
Expand All @@ -212,6 +218,7 @@ public function testSendByReferenceSuccess()
$this->assertSame($this->transactionId, $response->getTransactionId());
$this->assertSame($this->transactionReference, $response->getTransactionReference());
$this->assertSame($this->transactionId, $response->getTransaction()->getId());
$this->assertEquals($this->timestamp, $response->getTransaction()->getTimestamp());

$this->assertSame('https://soap.prodtest.sj.vindicia.com/18.0/Transaction.wsdl', $this->getLastEndpoint());
}
Expand Down Expand Up @@ -275,7 +282,8 @@ public function testSendPayPalSuccess()
'TAX_CLASSIFICATION' => $this->taxClassification,
'SKU' => $this->sku,
'TOKEN' => $this->token,
'PAYPAL_EMAIL' => $this->paypalEmail
'PAYPAL_EMAIL' => $this->paypalEmail,
'TIMESTAMP' => $this->timestamp
));

$response = $this->request->send();
Expand Down Expand Up @@ -335,6 +343,7 @@ public function testSendPayPalSuccess()
$this->assertTrue(is_string($attribute->getName()));
$this->assertTrue(is_string($attribute->getValue()));
}
$this->assertEquals($this->timestamp, $transaction->getTimestamp());

$this->assertSame('https://soap.prodtest.sj.vindicia.com/18.0/Transaction.wsdl', $this->getLastEndpoint());
}
Expand Down
13 changes: 11 additions & 2 deletions tests/Message/FetchTransactionsRequestTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public function setUp()
'customerReference' => $this->customerReference
)
);
$this->timestamp = date('Y-m-d\T12:00:00-04:00', time());
}

/**
Expand Down Expand Up @@ -170,7 +171,9 @@ public function testCustomerIdOrTimesNotBoth()
*/
public function testSendSuccess()
{
$this->setMockSoapResponse('FetchTransactionsSuccess.xml');
$this->setMockSoapResponse('FetchTransactionsSuccess.xml', array(
'TIMESTAMP' => $this->timestamp
));

$response = $this->request->send();

Expand All @@ -185,6 +188,8 @@ public function testSendSuccess()
$this->assertInstanceOf('\Omnipay\Vindicia\Transaction', $transactions[1]);
$this->assertNotNull($transactions[0]->getId());
$this->assertNotNull($transactions[1]->getId());
$this->assertEquals($this->timestamp, $transactions[0]->getTimestamp());
$this->assertEquals($this->timestamp, $transactions[1]->getTimestamp());

$this->assertSame('https://soap.prodtest.sj.vindicia.com/18.0/Transaction.wsdl', $this->getLastEndpoint());
}
Expand All @@ -194,7 +199,9 @@ public function testSendSuccess()
*/
public function testSendByTimeSuccess()
{
$this->setMockSoapResponse('FetchTransactionsByTimeSuccess.xml');
$this->setMockSoapResponse('FetchTransactionsByTimeSuccess.xml', array(
'TIMESTAMP' => $this->timestamp
));

$response = $this->request->send();

Expand All @@ -207,6 +214,8 @@ public function testSendByTimeSuccess()
$this->assertSame(2, count($transactions));
$this->assertNotNull($transactions[0]->getId());
$this->assertNotNull($transactions[1]->getId());
$this->assertEquals($this->timestamp, $transactions[0]->getTimestamp());
$this->assertEquals($this->timestamp, $transactions[1]->getTimestamp());

$this->assertSame('https://soap.prodtest.sj.vindicia.com/18.0/Transaction.wsdl', $this->getLastEndpoint());
}
Expand Down
4 changes: 2 additions & 2 deletions tests/Mock/FetchPayPalTransactionSuccess.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<currency xmlns="" xsi:type="xsd:string">[CURRENCY]</currency>
<divisionNumber xmlns="" xsi:type="xsd:string">12345</divisionNumber>
<merchantTransactionId xmlns="" xsi:type="xsd:string">[TRANSACTION_ID]</merchantTransactionId>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:04-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<account xmlns="" xsi:type="vin:Account">
<VID xmlns="" xsi:type="xsd:string">[CUSTOMER_REFERENCE]</VID>
<merchantAccountId xmlns="" xsi:type="xsd:string">[CUSTOMER_ID]</merchantAccountId>
Expand Down Expand Up @@ -59,7 +59,7 @@
</statusLog>
<statusLog xmlns="" xsi:type="vin:TransactionStatus">
<status xmlns="" xsi:type="vin:TransactionStatusType">New</status>
<timestamp xmlns="" xsi:type="xsd:dateTime">2018-06-15T08:06:04-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<paymentMethodType xmlns="" xsi:type="vin:PaymentMethodType">PayPal</paymentMethodType>
<payPalStatus xmlns="" xsi:type="vin:TransactionStatusPayPal">
<token xmlns="" xsi:type="xsd:string">[TOKEN]</token>
Expand Down
8 changes: 4 additions & 4 deletions tests/Mock/FetchRefundsByTimeSuccess.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<currency xmlns="" xsi:type="xsd:string">USD</currency>
<divisionNumber xmlns="" xsi:type="xsd:string">12345</divisionNumber>
<merchantTransactionId xmlns="" xsi:type="xsd:string">XYZ12345678</merchantTransactionId>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:04-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<account xmlns="" xsi:type="vin:Account">
<VID xmlns="" xsi:type="xsd:string">9876543210fedcba9876543210fedcba</VID>
<merchantAccountId xmlns="" xsi:type="xsd:string">123456789abcd</merchantAccountId>
Expand Down Expand Up @@ -58,7 +58,7 @@
</sourcePaymentMethod>
<statusLog xmlns="" xsi:type="vin:TransactionStatus">
<status xmlns="" xsi:type="vin:TransactionStatusType">Authorized</status>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:05-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<paymentMethodType xmlns="" xsi:type="vin:PaymentMethodType">CreditCard</paymentMethodType>
<creditCardStatus xmlns="" xsi:type="vin:TransactionStatusCreditCard">
<authCode xmlns="" xsi:type="xsd:string">100</authCode>
Expand All @@ -77,7 +77,7 @@
</statusLog>
<statusLog xmlns="" xsi:type="vin:TransactionStatus">
<status xmlns="" xsi:type="vin:TransactionStatusType">New</status>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:04-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<paymentMethodType xmlns="" xsi:type="vin:PaymentMethodType">CreditCard</paymentMethodType>
<creditCardStatus xmlns="" xsi:type="vin:TransactionStatusCreditCard">
<authCode xmlns="" xsi:type="xsd:string">100</authCode>
Expand Down Expand Up @@ -125,7 +125,7 @@
<amount xmlns="" xsi:type="xsd:decimal">140</amount>
<amountIncludesTax xmlns="" xsi:type="xsd:boolean">0</amountIncludesTax>
<currency xmlns="" xsi:type="xsd:string">USD</currency>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:08-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<tokenAction xmlns="" xsi:type="vin:RefundTokenAction">None</tokenAction>
<status xmlns="" xsi:type="vin:RefundStatus">Processing</status>
</refunds>
Expand Down
8 changes: 4 additions & 4 deletions tests/Mock/FetchRefundsSuccess.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<currency xmlns="" xsi:type="xsd:string">USD</currency>
<divisionNumber xmlns="" xsi:type="xsd:string">12345</divisionNumber>
<merchantTransactionId xmlns="" xsi:type="xsd:string">[TRANSACTION_ID]</merchantTransactionId>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:04-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<account xmlns="" xsi:type="vin:Account">
<VID xmlns="" xsi:type="xsd:string">9876543210fedcba9876543210fedcba</VID>
<merchantAccountId xmlns="" xsi:type="xsd:string">123456789abcd</merchantAccountId>
Expand Down Expand Up @@ -58,7 +58,7 @@
</sourcePaymentMethod>
<statusLog xmlns="" xsi:type="vin:TransactionStatus">
<status xmlns="" xsi:type="vin:TransactionStatusType">Authorized</status>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:05-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<paymentMethodType xmlns="" xsi:type="vin:PaymentMethodType">CreditCard</paymentMethodType>
<creditCardStatus xmlns="" xsi:type="vin:TransactionStatusCreditCard">
<authCode xmlns="" xsi:type="xsd:string">100</authCode>
Expand All @@ -77,7 +77,7 @@
</statusLog>
<statusLog xmlns="" xsi:type="vin:TransactionStatus">
<status xmlns="" xsi:type="vin:TransactionStatusType">New</status>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:04-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<paymentMethodType xmlns="" xsi:type="vin:PaymentMethodType">CreditCard</paymentMethodType>
<creditCardStatus xmlns="" xsi:type="vin:TransactionStatusCreditCard">
<authCode xmlns="" xsi:type="xsd:string">100</authCode>
Expand Down Expand Up @@ -125,7 +125,7 @@
<amount xmlns="" xsi:type="xsd:decimal">[AMOUNT]</amount>
<amountIncludesTax xmlns="" xsi:type="xsd:boolean">0</amountIncludesTax>
<currency xmlns="" xsi:type="xsd:string">[CURRENCY]</currency>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:08-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<tokenAction xmlns="" xsi:type="vin:RefundTokenAction">None</tokenAction>
<status xmlns="" xsi:type="vin:RefundStatus">Processing</status>
<nameValues xmlns="" xsi:type="vin:NameValuePair">
Expand Down
6 changes: 3 additions & 3 deletions tests/Mock/FetchTransactionByReferenceSuccess.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<currency xmlns="" xsi:type="xsd:string">USD</currency>
<divisionNumber xmlns="" xsi:type="xsd:string">12345</divisionNumber>
<merchantTransactionId xmlns="" xsi:type="xsd:string">[TRANSACTION_ID]</merchantTransactionId>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:04-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<account xmlns="" xsi:type="vin:Account">
<VID xmlns="" xsi:type="xsd:string">9876543210fedcba9876543210fedcba</VID>
<merchantAccountId xmlns="" xsi:type="xsd:string">123456789abcd</merchantAccountId>
Expand Down Expand Up @@ -55,7 +55,7 @@
</sourcePaymentMethod>
<statusLog xmlns="" xsi:type="vin:TransactionStatus">
<status xmlns="" xsi:type="vin:TransactionStatusType">Authorized</status>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:05-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<paymentMethodType xmlns="" xsi:type="vin:PaymentMethodType">CreditCard</paymentMethodType>
<creditCardStatus xmlns="" xsi:type="vin:TransactionStatusCreditCard">
<authCode xmlns="" xsi:type="xsd:string">100</authCode>
Expand All @@ -74,7 +74,7 @@
</statusLog>
<statusLog xmlns="" xsi:type="vin:TransactionStatus">
<status xmlns="" xsi:type="vin:TransactionStatusType">New</status>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:04-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<paymentMethodType xmlns="" xsi:type="vin:PaymentMethodType">CreditCard</paymentMethodType>
<creditCardStatus xmlns="" xsi:type="vin:TransactionStatusCreditCard">
<authCode xmlns="" xsi:type="xsd:string">100</authCode>
Expand Down
6 changes: 3 additions & 3 deletions tests/Mock/FetchTransactionSuccess.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<currency xmlns="" xsi:type="xsd:string">[CURRENCY]</currency>
<divisionNumber xmlns="" xsi:type="xsd:string">12345</divisionNumber>
<merchantTransactionId xmlns="" xsi:type="xsd:string">[TRANSACTION_ID]</merchantTransactionId>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:04-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<account xmlns="" xsi:type="vin:Account">
<VID xmlns="" xsi:type="xsd:string">[CUSTOMER_REFERENCE]</VID>
<merchantAccountId xmlns="" xsi:type="xsd:string">[CUSTOMER_ID]</merchantAccountId>
Expand Down Expand Up @@ -60,7 +60,7 @@
</sourcePaymentMethod>
<statusLog xmlns="" xsi:type="vin:TransactionStatus">
<status xmlns="" xsi:type="vin:TransactionStatusType">Authorized</status>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:05-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<paymentMethodType xmlns="" xsi:type="vin:PaymentMethodType">CreditCard</paymentMethodType>
<creditCardStatus xmlns="" xsi:type="vin:TransactionStatusCreditCard">
<authCode xmlns="" xsi:type="xsd:string">[AUTHORIZATION_CODE]</authCode>
Expand All @@ -81,7 +81,7 @@
</statusLog>
<statusLog xmlns="" xsi:type="vin:TransactionStatus">
<status xmlns="" xsi:type="vin:TransactionStatusType">New</status>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:04-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<paymentMethodType xmlns="" xsi:type="vin:PaymentMethodType">CreditCard</paymentMethodType>
<creditCardStatus xmlns="" xsi:type="vin:TransactionStatusCreditCard">
<authCode xmlns="" xsi:type="xsd:string">[AUTHORIZATION_CODE]</authCode>
Expand Down
12 changes: 6 additions & 6 deletions tests/Mock/FetchTransactionsByTimeSuccess.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<currency xmlns="" xsi:type="xsd:string">USD</currency>
<divisionNumber xmlns="" xsi:type="xsd:string">12345</divisionNumber>
<merchantTransactionId xmlns="" xsi:type="xsd:string">XYZ123456</merchantTransactionId>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:04-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<account xmlns="" xsi:type="vin:Account">
<VID xmlns="" xsi:type="xsd:string">9876543210fedcba9876543210fedcba</VID>
<merchantAccountId xmlns="" xsi:type="xsd:string">123456789abcd</merchantAccountId>
Expand Down Expand Up @@ -55,7 +55,7 @@
</sourcePaymentMethod>
<statusLog xmlns="" xsi:type="vin:TransactionStatus">
<status xmlns="" xsi:type="vin:TransactionStatusType">Authorized</status>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:05-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<paymentMethodType xmlns="" xsi:type="vin:PaymentMethodType">CreditCard</paymentMethodType>
<creditCardStatus xmlns="" xsi:type="vin:TransactionStatusCreditCard">
<authCode xmlns="" xsi:type="xsd:string">100</authCode>
Expand All @@ -74,7 +74,7 @@
</statusLog>
<statusLog xmlns="" xsi:type="vin:TransactionStatus">
<status xmlns="" xsi:type="vin:TransactionStatusType">New</status>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:04-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<paymentMethodType xmlns="" xsi:type="vin:PaymentMethodType">CreditCard</paymentMethodType>
<creditCardStatus xmlns="" xsi:type="vin:TransactionStatusCreditCard">
<authCode xmlns="" xsi:type="xsd:string">100</authCode>
Expand Down Expand Up @@ -124,7 +124,7 @@
<currency xmlns="" xsi:type="xsd:string">USD</currency>
<divisionNumber xmlns="" xsi:type="xsd:string">12345</divisionNumber>
<merchantTransactionId xmlns="" xsi:type="xsd:string">XYZ654321</merchantTransactionId>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:04-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<account xmlns="" xsi:type="vin:Account">
<VID xmlns="" xsi:type="xsd:string">9876543210fedcba9876543210fedcba</VID>
<merchantAccountId xmlns="" xsi:type="xsd:string">123456789abcd</merchantAccountId>
Expand Down Expand Up @@ -160,7 +160,7 @@
</sourcePaymentMethod>
<statusLog xmlns="" xsi:type="vin:TransactionStatus">
<status xmlns="" xsi:type="vin:TransactionStatusType">Authorized</status>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:05-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<paymentMethodType xmlns="" xsi:type="vin:PaymentMethodType">CreditCard</paymentMethodType>
<creditCardStatus xmlns="" xsi:type="vin:TransactionStatusCreditCard">
<authCode xmlns="" xsi:type="xsd:string">100</authCode>
Expand All @@ -179,7 +179,7 @@
</statusLog>
<statusLog xmlns="" xsi:type="vin:TransactionStatus">
<status xmlns="" xsi:type="vin:TransactionStatusType">New</status>
<timestamp xmlns="" xsi:type="xsd:dateTime">2016-10-04T08:06:04-07:00</timestamp>
<timestamp xmlns="" xsi:type="xsd:dateTime">[TIMESTAMP]</timestamp>
<paymentMethodType xmlns="" xsi:type="vin:PaymentMethodType">CreditCard</paymentMethodType>
<creditCardStatus xmlns="" xsi:type="vin:TransactionStatusCreditCard">
<authCode xmlns="" xsi:type="xsd:string">100</authCode>
Expand Down
Loading

0 comments on commit 260f98b

Please sign in to comment.