From 59b4ea9801b555ee98837de7cfb73edbca283b0b Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Sun, 15 Mar 2015 13:06:01 +0200
Subject: [PATCH] MAGETWO-34363: Pull request processing
---
.../Magento/Customer/Model/Observer/Log.php | 11 +--------
.../Test/Unit/Model/Observer/LogTest.php | 24 +++----------------
2 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/app/code/Magento/Customer/Model/Observer/Log.php b/app/code/Magento/Customer/Model/Observer/Log.php
index c83f8abee8c..539221b5e37 100644
--- a/app/code/Magento/Customer/Model/Observer/Log.php
+++ b/app/code/Magento/Customer/Model/Observer/Log.php
@@ -21,21 +21,12 @@ class Log
*/
protected $logger;
- /**
- * Date formats converter.
- *
- * @var DateTime
- */
- protected $dateTime;
-
/**
* @param Logger $logger
- * @param DateTime $dateTime
*/
- public function __construct(Logger $logger, DateTime $dateTime)
+ public function __construct(Logger $logger)
{
$this->logger = $logger;
- $this->dateTime = $dateTime;
}
/**
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Observer/LogTest.php b/app/code/Magento/Customer/Test/Unit/Model/Observer/LogTest.php
index 86db3e21386..fcd3ff2c58f 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Observer/LogTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Observer/LogTest.php
@@ -25,19 +25,13 @@ class LogTest extends \PHPUnit_Framework_TestCase
*/
protected $loggerMock;
- /**
- * @var DateTime | \PHPUnit_Framework_MockObject_MockObject
- */
- protected $dateTime;
-
/**
* @return void
*/
public function setUp()
{
$this->loggerMock = $this->getMock('Magento\Customer\Model\Logger', [], [], '', false);
- $this->dateTime = $this->getMock('Magento\Framework\Stdlib\DateTime', [], [], '', false);
- $this->logObserver = new Log($this->loggerMock, $this->dateTime);
+ $this->logObserver = new Log($this->loggerMock);
}
/**
@@ -46,7 +40,6 @@ class LogTest extends \PHPUnit_Framework_TestCase
public function testLogLastLoginAt()
{
$id = 1;
- $time = 123;
$observerMock = $this->getMock('Magento\Framework\Event\Observer', [], [], '', false);
$eventMock = $this->getMock('Magento\Framework\Event', ['getCustomer'], [], '', false);
@@ -62,13 +55,8 @@ class LogTest extends \PHPUnit_Framework_TestCase
->method('getId')
->willReturn($id);
- $this->dateTime->expects($this->once())
- ->method('now')
- ->willReturn($time);
-
$this->loggerMock->expects($this->once())
- ->method('log')
- ->with($id, ['last_login_at' => $time]);
+ ->method('log');
$this->logObserver->logLastLoginAt($observerMock);
}
@@ -79,7 +67,6 @@ class LogTest extends \PHPUnit_Framework_TestCase
public function testLogLastLogoutAt()
{
$id = 1;
- $time = 123;
$observerMock = $this->getMock('Magento\Framework\Event\Observer', [], [], '', false);
$eventMock = $this->getMock('Magento\Framework\Event', ['getCustomer'], [], '', false);
@@ -95,13 +82,8 @@ class LogTest extends \PHPUnit_Framework_TestCase
->method('getId')
->willReturn($id);
- $this->dateTime->expects($this->once())
- ->method('now')
- ->willReturn($time);
-
$this->loggerMock->expects($this->once())
- ->method('log')
- ->with($id, ['last_logout_at' => $time]);
+ ->method('log');
$this->logObserver->logLastLogoutAt($observerMock);
}
--
GitLab