@@ -110,7 +110,7 @@ public function setUp()
110
110
111
111
$ this ->resourceMock = $ this ->getMock (
112
112
'Magento\Integration\Model\ResourceModel\Oauth\Consumer ' ,
113
- ['getTimeInSecondsSinceTokenExchangeStarted ' , ' getIdFieldName ' , 'selectByCompositeKey ' , 'deleteOldEntries ' ],
113
+ ['getIdFieldName ' , 'selectByCompositeKey ' , 'deleteOldEntries ' ],
114
114
[],
115
115
'' ,
116
116
false ,
@@ -215,19 +215,31 @@ public function testValidateInvalidConsumerSecret()
215
215
216
216
public function testGetConsumerExpirationPeriodValid ()
217
217
{
218
- $ this ->resourceMock ->expects ($ this ->once ())
219
- ->method ('getTimeInSecondsSinceTokenExchangeStarted ' )
220
- ->will ($ this ->returnValue (30 ));
218
+ $ dateHelperMock = $ this ->getMockBuilder ('Magento\Framework\Stdlib\DateTime\DateTime ' )
219
+ ->disableOriginalConstructor ()
220
+ ->getMock ();
221
+ $ dateHelperMock ->expects ($ this ->at (0 ))->method ('gmtTimestamp ' )->willReturn (time ());
222
+ $ dateHelperMock ->expects ($ this ->at (1 ))->method ('gmtTimestamp ' )->willReturn (time () - 100 );
223
+
224
+ $ dateHelper = new \ReflectionProperty ('Magento\Integration\Model\Oauth\Consumer ' , '_dateHelper ' );
225
+ $ dateHelper ->setAccessible (true );
226
+ $ dateHelper ->setValue ($ this ->consumerModel , $ dateHelperMock );
221
227
222
228
$ this ->consumerModel ->setUpdatedAt (time ());
223
229
$ this ->assertTrue ($ this ->consumerModel ->isValidForTokenExchange ());
224
230
}
225
231
226
232
public function testGetConsumerExpirationPeriodExpired ()
227
233
{
228
- $ this ->resourceMock ->expects ($ this ->once ())
229
- ->method ('getTimeInSecondsSinceTokenExchangeStarted ' )
230
- ->will ($ this ->returnValue (400 ));
234
+ $ dateHelperMock = $ this ->getMockBuilder ('Magento\Framework\Stdlib\DateTime\DateTime ' )
235
+ ->disableOriginalConstructor ()
236
+ ->getMock ();
237
+ $ dateHelperMock ->expects ($ this ->at (0 ))->method ('gmtTimestamp ' )->willReturn (time ());
238
+ $ dateHelperMock ->expects ($ this ->at (1 ))->method ('gmtTimestamp ' )->willReturn (time () - 1000 );
239
+
240
+ $ dateHelper = new \ReflectionProperty ('Magento\Integration\Model\Oauth\Consumer ' , '_dateHelper ' );
241
+ $ dateHelper ->setAccessible (true );
242
+ $ dateHelper ->setValue ($ this ->consumerModel , $ dateHelperMock );
231
243
232
244
$ this ->consumerModel ->setUpdatedAt (time ());
233
245
$ this ->assertFalse ($ this ->consumerModel ->isValidForTokenExchange ());
0 commit comments