Skip to content

Commit 66daede

Browse files
committed
AC-1199:: Fixed the fuctional automation tests
1 parent aef145b commit 66daede

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ define([
240240
};
241241

242242
swatchComponents.iframe.off('load');
243-
swatchComponents.iframe.load(iframeHandler);
243+
swatchComponents.iframe.on('load', iframeHandler);
244244
swatchComponents.form.submit();
245245
$(this).val('');
246246
});

lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use Composer\Package\CompletePackageInterface;
1212
use Composer\Package\Locker;
1313
use Composer\Package\RootPackageInterface;
14-
use Composer\Repository\RepositoryInterface;
14+
use Composer\Repository\LockArrayRepository;
1515
use Magento\Framework\Composer\ComposerInformation;
1616
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
1717
use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
@@ -36,7 +36,7 @@ class ComposerInformationTest extends TestCase
3636
private $lockerMock;
3737

3838
/**
39-
* @var RepositoryInterface|InvocationMocker
39+
* @var LockArrayRepository|InvocationMocker
4040
*/
4141
private $lockerRepositoryMock;
4242

@@ -53,7 +53,10 @@ protected function setUp(): void
5353
$this->lockerMock = $this->getMockBuilder(Locker::class)
5454
->disableOriginalConstructor()
5555
->getMock();
56-
$this->lockerRepositoryMock = $this->getMockForAbstractClass(RepositoryInterface::class);
56+
$this->lockerRepositoryMock = $this->getMockBuilder(LockArrayRepository::class)
57+
->setMethods(['getLockedRepository', 'getPackages'])
58+
->disableOriginalConstructor()
59+
->getMock();
5760
$this->packageMock = $this->getMockForAbstractClass(CompletePackageInterface::class);
5861
$this->lockerMock->method('getLockedRepository')->willReturn($this->lockerRepositoryMock);
5962
$this->packageMock->method('getType')->willReturn('metapackage');

0 commit comments

Comments
 (0)