Merge remote-tracking branch 'origin/MAGETWO-36587' into BUGS

AndriyNasinnyk · AndriyNasinnyk · commit 3d57de07578a · 2015-04-24T15:26:06.000+03:00
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
@@ -171,7 +171,7 @@ public function testGetCurrentStatus($status, $lastLoginAt, $lastVisitAt, $lastL
                 'customer/online_customers/online_minutes_interval',
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
-            ->willReturn(60); //TODO: it's value mocked because unit tests run data providers before all testsuite
+            ->willReturn(240); //TODO: it's value mocked because unit tests run data providers before all testsuite
 
         $this->customerLog->expects($this->any())->method('getLastLoginAt')->willReturn($lastLoginAt);
         $this->customerLog->expects($this->any())->method('getLastVisitAt')->willReturn($lastVisitAt);

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ public function testGetCurrentStatus($status, $lastLoginAt, $lastVisitAt, $lastL`
`171`	`171`	`'customer/online_customers/online_minutes_interval',`
`172`	`172`	`\Magento\Store\Model\ScopeInterface::SCOPE_STORE`
`173`	`173`	`)`
`174`		`- ->willReturn(60); //TODO: it's value mocked because unit tests run data providers before all testsuite`
	`174`	`+ ->willReturn(240); //TODO: it's value mocked because unit tests run data providers before all testsuite`
`175`	`175`
`176`	`176`	`$this->customerLog->expects($this->any())->method('getLastLoginAt')->willReturn($lastLoginAt);`
`177`	`177`	`$this->customerLog->expects($this->any())->method('getLastVisitAt')->willReturn($lastVisitAt);`