Merge branch 'MAGETWO-58386' into bugfixes

Author: valdislav

app/code/Magento/Eav/Test/Unit/Model/CustomAttributeMapperTest.php renamed to app/code/Magento/Eav/Test/Unit/Model/CustomAttributesMapperTest.php

@@ -162,12 +162,11 @@ public function libraryDataProvider()
         $componentRegistrar = new ComponentRegistrar();
         include_once $componentRegistrar->getPath(ComponentRegistrar::LIBRARY, 'magento/framework')
             . '/Option/ArrayInterface.php';
-        $blackList = Files::init()->readLists(__DIR__ . '/_files/blacklist.txt');
+        $blackList = Files::init()->readLists(__DIR__ . '/_files/blacklist*.txt');
         $dataProvider = Files::init()->getPhpFiles(Files::INCLUDE_LIBS | Files::AS_DATA_SET);
 
         foreach ($dataProvider as $key => $data) {
-            $file = str_replace(BP . '/', '', $data[0]);
-            if (in_array($file, $blackList)) {
+            if (in_array($data[0], $blackList)) {
                 unset($dataProvider[$key]);
             } else {
                 include_once $data[0];

dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php

@@ -46,7 +46,7 @@ protected function setUp()
     {
         $this->priceLayout = $this->getMockBuilder(\Magento\Framework\Pricing\Render\Layout::class)
             ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+            ->getMock();
 
         $this->price = $this->getMockBuilder(\Magento\Framework\Pricing\Price\PriceInterface::class)
             ->disableOriginalConstructor()