Skip to content

Commit f329397

Browse files
committed
Merge pull request #280 from magento-ogre/MAGETWO-47514-integration-test-failing-on-2.0
[Ogres] Fixed integration test failing on 2.0
2 parents b06b423 + bc582f9 commit f329397

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

dev/tests/integration/testsuite/Magento/Setup/Model/UpdatePackagesCacheTest.php

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66

77
namespace Magento\Setup\Model;
88

9-
use Magento\Framework\App\Filesystem\DirectoryList;
109
use Magento\TestFramework\Helper\Bootstrap;
1110
use Magento\Framework\Composer\ComposerJsonFinder;
1211
use Magento\Framework\Composer\MagentoComposerApplicationFactory;
13-
use Magento\Framework\Stdlib\DateTime\DateTime;
12+
use Magento\Setup\Model\UpdatePackagesCache;
1413

1514
/**
1615
* Tests Magento\Framework\ComposerInformation
@@ -88,19 +87,19 @@ public function testGetPackagesForUpdate()
8887
->method('get')
8988
->willReturn($this->objectManager);
9089

91-
/** @var \Magento\Setup\Model\UpdatePackagesCache $updatePackagesCache */
92-
$updatePackagesCache = $this->objectManager->create(
93-
'Magento\Setup\Model\UpdatePackagesCache',
94-
[
95-
'applicationFactory' => new MagentoComposerApplicationFactory(
96-
$this->composerJsonFinder,
97-
$this->directoryList
98-
),
99-
'filesystem' => $this->filesystem,
100-
'composerInformation' => $this->composerInformation,
101-
'objectManagerProvider' => $objectManagerProvider,
90+
/** @var UpdatePackagesCache $updatePackagesCache|\PHPUnit_Framework_MockObject_MockObject */
91+
$updatePackagesCache = $this->getMock('Magento\Setup\Model\UpdatePackagesCache', [], [], '', false);
92+
93+
$packages = [
94+
'packages' => [
95+
$packageName => [
96+
'latestVersion' => '1000.100.200'
97+
]
10298
]
103-
);
99+
];
100+
101+
$updatePackagesCache->expects($this->once())->method('syncPackagesForUpdate')->willReturn(true);
102+
$updatePackagesCache->expects($this->once())->method('getPackagesForUpdate')->willReturn($packages);
104103

105104
$requiredPackages = $this->composerInformation->getInstalledMagentoPackages();
106105
$this->assertArrayHasKey($packageName, $requiredPackages);

0 commit comments

Comments
 (0)