Skip to content
Snippets Groups Projects
Commit e6f24bcd authored by Yaroslav Onischenko's avatar Yaroslav Onischenko
Browse files

MAGETWO-62387: Travis Build Fail - 2.2.0

parent 5a0cc81d
Branches
No related merge requests found
......@@ -40,6 +40,7 @@ class DocBlock
*
* Note: order of registering (and applying) annotations is important.
* To allow config fixtures to deal with fixture stores, data fixtures should be processed first.
* ConfigFixture applied twice because data fixtures could clean config and clean custom settings
*
* @param \Magento\TestFramework\Application $application
* @return array
......@@ -68,6 +69,7 @@ class DocBlock
new \Magento\TestFramework\Annotation\AppArea($application),
new \Magento\TestFramework\Annotation\Cache($application),
new \Magento\TestFramework\Annotation\AdminConfigFixture(),
new \Magento\TestFramework\Annotation\ConfigFixture(),
];
}
}
......@@ -24,8 +24,6 @@ class ObjectManager extends \Magento\Framework\App\ObjectManager
* @var array
*/
protected $persistedInstances = [
\Magento\TestFramework\App\Config::class,
\Magento\Framework\App\Config\ScopeConfigInterface::class,
\Magento\Framework\App\ResourceConnection::class,
\Magento\Framework\Config\Scope::class,
\Magento\Framework\ObjectManager\RelationsInterface::class,
......
......@@ -248,6 +248,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
* @magentoDataFixture Magento/Customer/_files/customer.php
* @magentoDataFixture Magento/Customer/_files/customer_address.php
* @magentoDbIsolation enabled
* @magentoAppIsolation enabled
* @dataProvider getTaxPriceDataProvider
*/
public function testGetTaxPrice(
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment