From 9152761930e9a26203f2c997681f650d505db401 Mon Sep 17 00:00:00 2001 From: Anna Zubenko Date: Wed, 30 Nov 2016 16:03:48 +0200 Subject: [PATCH] Hotfix for tests + some formatting --- phoenix-scala/app/services/actors/RemorseTimer.scala | 4 ++-- phoenix-scala/test/integration/CartIntegrationTest.scala | 6 ++++-- .../test/integration/CheckoutIntegrationTest.scala | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/phoenix-scala/app/services/actors/RemorseTimer.scala b/phoenix-scala/app/services/actors/RemorseTimer.scala index 0b7948a763..d9dec61d0b 100644 --- a/phoenix-scala/app/services/actors/RemorseTimer.scala +++ b/phoenix-scala/app/services/actors/RemorseTimer.scala @@ -35,8 +35,8 @@ class RemorseTimer(implicit db: DB, ec: EC) extends Actor { val query = for { cordRefs ← * <~ orders.result count ← * <~ orders.map(_.state).update(newState) - refNums = cordRefs.map(_.referenceNumber) - _ ← * <~ doOrMeh(count > 0, LogActivity.orderBulkStateChanged(newState, refNums)) + refNums = cordRefs.map(_.referenceNumber) + _ ← * <~ doOrMeh(count > 0, LogActivity.orderBulkStateChanged(newState, refNums)) } yield count RemorseTimerResponse(query.runTxn) diff --git a/phoenix-scala/test/integration/CartIntegrationTest.scala b/phoenix-scala/test/integration/CartIntegrationTest.scala index 8a3b7a663e..01f28d1431 100644 --- a/phoenix-scala/test/integration/CartIntegrationTest.scala +++ b/phoenix-scala/test/integration/CartIntegrationTest.scala @@ -129,12 +129,14 @@ class CartIntegrationTest val attributes = LineItemAttributes( GiftCardLineItemAttributes(senderName = "senderName", recipientName = "recipientName", - recipientEmail = "example@example.com").some).some + recipientEmail = "example@example.com", + message = "message").some).some val attributes2 = LineItemAttributes( GiftCardLineItemAttributes(senderName = "senderName2", recipientName = "recipientName2", - recipientEmail = "example2@example.com").some).some + recipientEmail = "example2@example.com", + message = "message2").some).some def addGiftCardPayload(sku: String) = Seq(UpdateLineItemsPayload(sku, 2, attributes), UpdateLineItemsPayload(sku, 1, attributes2)) diff --git a/phoenix-scala/test/integration/CheckoutIntegrationTest.scala b/phoenix-scala/test/integration/CheckoutIntegrationTest.scala index c4946d2cf3..87a51bf4f7 100644 --- a/phoenix-scala/test/integration/CheckoutIntegrationTest.scala +++ b/phoenix-scala/test/integration/CheckoutIntegrationTest.scala @@ -41,7 +41,8 @@ class CheckoutIntegrationTest val attributes = LineItemAttributes( GiftCardLineItemAttributes(senderName = "senderName", recipientName = "recipientName", - recipientEmail = "example@example.com").some).some + recipientEmail = "example@example.com", + message = "Boop").some).some val addGiftCardPayload = Seq(UpdateLineItemsPayload("SKU-YAX", 2, attributes)) "should update attributes of order-line-items succesfully" in new Fixture {