From b072b985850a14eea813234742d5b12366f75a4b Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Thu, 1 Dec 2016 16:41:43 -0600
Subject: [PATCH] Merge remote-tracking branch 'upstream/develop' into pr
# Conflicts:
# dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
# lib/internal/Magento/Framework/App/Config/ScopePool.php
# lib/internal/Magento/Framework/App/ResourceConnection/Config.php
# lib/internal/Magento/Framework/App/Test/Unit/Config/ScopePoolTest.php
# lib/internal/Magento/Framework/App/Test/Unit/ResourceConnection/ConfigTest.php
---
.../Framework/App/Config/ScopePoolTest.php | 49 -------------------
1 file changed, 49 deletions(-)
delete mode 100644 dev/tests/integration/testsuite/Magento/Framework/App/Config/ScopePoolTest.php
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Config/ScopePoolTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Config/ScopePoolTest.php
deleted file mode 100644
index 8e000676c7a..00000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/App/Config/ScopePoolTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Copyright © 2016 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Framework\App\Config;
-
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Framework\App\Cache\Frontend\Pool;
-use \Magento\Framework\App\Config\ScopePool;
-
-class ScopePoolTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @var ScopePool
- */
- private $scopePool;
-
- protected function setUp()
- {
- /** @var \Magento\TestFramework\ObjectManager $objectManager */
- $objectManager = Bootstrap::getObjectManager();
- $objectManager->removeSharedInstance(ScopePool::class);
- $this->scopePool = $objectManager->get(ScopePool::class);
- }
-
- /**
- * @param string $scopeType
- * @param string $scopeCode
- * @dataProvider getScopeDataProvider
- */
- public function testGetScope($scopeType, $scopeCode = null)
- {
- $this->scopePool->clean();
- $this->assertEquals(
- $this->scopePool->getScope($scopeType, $scopeCode),
- $this->scopePool->getScope($scopeType, $scopeCode)
- );
- }
-
- public function getScopeDataProvider()
- {
- return [
- ['default'],
- ['stores', 'default'],
- ['websites', 'default']
- ];
- }
-}
--
GitLab