From 6b930331a8bc720d5e225f04a7aa25e5ed6ac01e Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Wed, 17 Apr 2019 21:43:54 +0300
Subject: [PATCH] graphQl-309: fixed tests

---
 composer.lock                                 | 33 +++++++++++++++-
 .../Api/CheckoutAgreementsListTest.php        | 39 +++++++------------
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/composer.lock b/composer.lock
index 8747ecc6d8d28..db753d6de6cff 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7d2484d86d4d31622f2427d46724ca6f",
+    "content-hash": "d5945e7c615def5bc906a9e876235934",
     "packages": [
         {
             "name": "braintree/braintree_php",
@@ -6618,6 +6618,36 @@
             ],
             "time": "2018-02-14T22:37:14+00:00"
         },
+        {
+            "name": "magento/magento-coding-standard",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/magento/magento-coding-standard.git",
+                "reference": "f7de26fb6add389d1b42286f67ee87424588a868"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/magento/magento-coding-standard/zipball/f7de26fb6add389d1b42286f67ee87424588a868",
+                "reference": "f7de26fb6add389d1b42286f67ee87424588a868",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0",
+                "squizlabs/php_codesniffer": "~3.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "type": "phpcodesniffer-standard",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "OSL-3.0",
+                "AFL-3.0"
+            ],
+            "description": "A set of Magento specific PHP CodeSniffer rules.",
+            "time": "2019-04-05T19:05:17+00:00"
+        },
         {
             "name": "magento/magento2-functional-testing-framework",
             "version": "2.3.14",
@@ -7842,6 +7872,7 @@
                 "mock",
                 "xunit"
             ],
+            "abandoned": true,
             "time": "2018-08-09T05:50:03+00:00"
         },
         {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CheckoutAgreements/Api/CheckoutAgreementsListTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CheckoutAgreements/Api/CheckoutAgreementsListTest.php
index 17fa58be72fa2..62491e5e8376b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CheckoutAgreements/Api/CheckoutAgreementsListTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CheckoutAgreements/Api/CheckoutAgreementsListTest.php
@@ -16,7 +16,6 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Store\Api\Data\StoreInterface;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -40,6 +39,8 @@ protected function setUp()
         parent::setUp();
 
         $this->objectManager = Bootstrap::getObjectManager();
+
+        // TODO: remove usage of the Config, use ConfigFixture instead https://github.com/magento/graphql-ce/issues/167
         $this->config = $this->objectManager->get(Config::class);
         $this->saveAgreementConfig(1);
     }
@@ -124,29 +125,17 @@ public function testGetAgreementNotSet()
     /**
      * @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_active_with_html_content.php
      * @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_inactive_with_text_content.php
-     * @magentoApiDataFixture Magento/Store/_files/second_store.php
      */
     public function testDisabledAgreements()
     {
-        $secondStoreCode = 'fixture_second_store';
-        $agreementsName = 'Checkout Agreement (active)';
-
         $query = $this->getQuery();
-        $this->assignAgreementsToStore($secondStoreCode, $agreementsName);
+        $this->saveAgreementConfig(0);
 
-        /** @var StoreManagerInterface $storeManager */
-        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
-        $store = $storeManager->getStore($secondStoreCode);
-        $this->saveAgreementConfig(0, $store);
-
-        $headerMap['Store'] = $secondStoreCode;
-        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $response = $this->graphQlQuery($query);
 
         $this->assertArrayHasKey('checkoutAgreements', $response);
         $agreements = $response['checkoutAgreements'];
         $this->assertCount(0, $agreements);
-
-        $this->deleteAgreementConfig($store);
     }
 
     /**
@@ -200,31 +189,29 @@ protected function tearDown()
      * @param int $value
      * @param StoreInterface $store
      */
-    private function saveAgreementConfig(int $value, ?StoreInterface $store = null): void
+    private function saveAgreementConfig(int $value): void
     {
-        $scopeId = $store ? $store->getId() : 0;
-        $scope = $store ? ScopeInterface::SCOPE_STORE : ScopeConfigInterface::SCOPE_TYPE_DEFAULT;
         $this->config->saveConfig(
             $this->agreementsXmlConfigPath,
             $value,
-            $scope,
-            $scopeId
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            0
         );
 
         $this->reinitConfig();
     }
 
     /**
-     * @param StoreInterface $store
+     * Delete config
+     *
+     * @return void
      */
-    private function deleteAgreementConfig(?StoreInterface $store = null): void
+    private function deleteAgreementConfig(): void
     {
-        $scopeId = $store ? $store->getId() : 0;
-        $scope = $store ? ScopeInterface::SCOPE_STORE : ScopeConfigInterface::SCOPE_TYPE_DEFAULT;
         $this->config->deleteConfig(
             $this->agreementsXmlConfigPath,
-            $scope,
-            $scopeId
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            0
         );
 
         $this->reinitConfig();