Merge branch 'bugfixes' of github.com:magento-firedrakes/magento2ce into bugfixes

Author: olysenko

dev/tests/integration/phpunit.xml.dist

@@ -47,7 +47,7 @@
         <!-- Semicolon-separated 'glob' patterns, that match global XML configuration files -->
         <const name="TESTS_GLOBAL_CONFIG_DIR" value="../../../app/etc"/>
         <!-- Whether to cleanup the application before running tests or not -->
-        <const name="TESTS_CLEANUP" value=""/>
+        <const name="TESTS_CLEANUP" value="enabled"/>
         <!-- Memory usage and estimated leaks thresholds -->
         <!--<const name="TESTS_MEM_USAGE_LIMIT" value="1024M"/>-->
         <const name="TESTS_MEM_LEAK_LIMIT" value=""/>

dev/tests/integration/testsuite/Magento/Analytics/Model/Connector/Http/ReSignUpResponseResolverTest.php

@@ -98,7 +98,12 @@ private function getSubscribeSchedule()
          * @var $scopeConfig ScopeConfigInterface
          */
         $scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-        return $scopeConfig->getValue(SubscriptionHandler::CRON_STRING_PATH);
+
+        return $scopeConfig->getValue(
+            SubscriptionHandler::CRON_STRING_PATH,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            0
+        );
     }
 
     /**

dev/tests/integration/testsuite/Magento/Analytics/_files/enabled_subscription_with_invalid_token.php

@@ -13,7 +13,7 @@
 $configWriter = $objectManager->get(\Magento\Framework\App\Config\Storage\WriterInterface::class);
 
 $configWriter->delete(SubscriptionHandler::CRON_STRING_PATH);
-$configWriter->save('default/analytics/subscription/enabled', 1);
+$configWriter->save('analytics/subscription/enabled', 1);
 
 /**
  * @var $analyticsToken \Magento\Analytics\Model\AnalyticsToken

dev/tests/integration/testsuite/Magento/Analytics/_files/enabled_subscription_with_invalid_token_rollback.php

@@ -13,7 +13,7 @@
 $configWriter = $objectManager->get(\Magento\Framework\App\Config\Storage\WriterInterface::class);
 
 $configWriter->delete(SubscriptionHandler::CRON_STRING_PATH);
-$configWriter->save('default/analytics/subscription/enabled', 0);
+$configWriter->save('analytics/subscription/enabled', 0);
 
 /**
  * @var $analyticsToken \Magento\Analytics\Model\AnalyticsToken

dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTreeTest.php

@@ -125,7 +125,7 @@ public function testGetParentIds()
     public function testGetChildren()
     {
         $this->_model->load(3);
-        $this->assertEquals('4,13', $this->_model->getChildren());
+        $this->assertEquals(array_diff([4, 13], explode(',', $this->_model->getChildren())), []);
     }
 
     public function testGetPathInStore()