Merge remote-tracking branch 'origin/MAGETWO-22826-persistent-cookies' into ext-s51

Author: Dale Sikkema

app/code/Magento/Sales/Helper/Guest.php

@@ -225,7 +225,6 @@ private function setGuestViewCookie($cookieValue)
     {
         $metadata = $this->cookieMetadataFactory->createPublicCookieMetadata()
             ->setPath(self::COOKIE_PATH)
-            ->setDuration(self::COOKIE_LIFETIME)
             ->setHttpOnly(true);
         $this->cookieManager->setPublicCookie(self::COOKIE_NAME, $cookieValue, $metadata);
     }

app/code/Magento/Sales/Test/Unit/Helper/GuestTest.php

@@ -138,10 +138,6 @@ public function testLoadValidOrderNotEmptyPost()
             ->method('setPath')
             ->with(Guest::COOKIE_PATH)
             ->will($this->returnSelf());
-        $metaDataMock->expects($this->once())
-            ->method('setDuration')
-            ->with(Guest::COOKIE_LIFETIME)
-            ->will($this->returnSelf());
         $metaDataMock->expects($this->once())
             ->method('setHttpOnly')
             ->with(true)
@@ -188,10 +184,6 @@ public function testLoadValidOrderStoredCookie()
             ->method('setPath')
             ->with(Guest::COOKIE_PATH)
             ->will($this->returnSelf());
-        $metaDataMock->expects($this->once())
-            ->method('setDuration')
-            ->with(Guest::COOKIE_LIFETIME)
-            ->will($this->returnSelf());
         $metaDataMock->expects($this->once())
             ->method('setHttpOnly')
             ->with(true)