Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Ui/DataProvider/Config/FileResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function get($filename, $scope)
{
$iterator = $this->iteratorFactory->create(
$this->directoryRead,
$this->directoryRead->search('/*/*/etc/data_source/*')
$this->directoryRead->search('/*/*/etc/data_source/' . $filename)
);
return $iterator;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php

namespace Magento\Ui\DataProvider\Config;

use Magento\Framework\Filesystem;
use Magento\Ui\DataProvider\Config\FileResolver;
use Magento\Framework\Config\FileIteratorFactory;

class FileResolverTest extends \PHPUnit_Framework_TestCase
{
/**
* @var \Magento\Framework\Filesystem\Directory\Read | \PHPUnit_Framework_MockObject_MockObject
*/
private $mockDirectoryRead;

/**
* @var FileResolver
*/
private $fileResolver;

public function setUp()
{
$this->mockDirectoryRead = $this->getMockBuilder('Magento\Framework\Filesystem\Directory\Read')
->disableOriginalConstructor()
->getMock();
$stubFileIteratorFactory = $this->getMockBuilder('Magento\Framework\Config\FileIteratorFactory')
->disableOriginalConstructor()
->getMock();
$stubFilesystem = $this->getMockBuilder('Magento\Framework\Filesystem')
->disableOriginalConstructor()
->getMock();
$stubFilesystem->expects($this->any())
->method('getDirectoryRead')
->willReturn($this->mockDirectoryRead);
$this->fileResolver = new FileResolver($stubFilesystem, $stubFileIteratorFactory);
}

public function testItAppliesTheFilenamePattern()
{
$this->mockDirectoryRead->expects($this->once())
->method('search')
->with($this->matchesRegularExpression('#\*\.xml$#'))
->willReturn([]);

$this->fileResolver->get('*.xml', '');
}
}