Merge branch 'b-6.x'

CHANGELOG.md

@@ -274,6 +274,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Use error_404_handler in article list controller in place of outdated 404 handling [PR-643](https://github.com/OXID-eSales/oxideshop_ce/pull/643)
 - Fix indents in config.inc.php.dist [PR-527](https://github.com/OXID-eSales/oxideshop_ce/pull/527)
 
+## [6.2.2] 2019-02-21
+
+### Fixed
+- Fix issue with shop roles readonly. [Bug 6851](https://bugs.oxid-esales.com/view.php?id=6851)
+
 ## [6.2.1] - 2018-07-31
 
 ### Added
@@ -587,6 +592,7 @@ See
 [6.3.2]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.3.1...v6.3.2
 [6.3.1]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.3.0...v6.3.1
 [6.3.0]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.2.1...v6.3.0
+[6.2.2]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.2.1...v6.2.2
 [6.2.1]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.2.0...v6.2.1
 [6.2.0]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.1.0...v6.2.0
 [6.1.0]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.0.0...v6.1.0

tests/Integration/Core/Database/Adapter/DatabaseInterfaceImplementationBaseTest.php

@@ -101,6 +101,7 @@ public function setUp()
         parent::setUp();
 
         $this->initializeDatabase();
+        $this->truncateTestTable();
         $this->assureTestTableIsEmpty();
     }
 
@@ -264,16 +265,7 @@ protected function assertObjectHasAttributeWithValue($object, $attributeName, $a
 
     protected function assureTestTableIsEmpty()
     {
-        if (!$this->isEmptyTestTable()) {
-            $this->truncateTestTable();
-        }
-
-        $this->assertEmpty($this->fetchAllTestTableRows(), "Problem while truncating the table '" . self::TABLE_NAME . "'!");
-    }
-
-    protected function isEmptyTestTable()
-    {
-        return empty($this->fetchAllTestTableRows());
+        $this->assertEmpty($this->fetchAllTestTableRows(), "Table '" . self::TABLE_NAME . "' is empty");
     }
 
     protected function fetchAllTestTableRows()

tests/Integration/Core/Database/Adapter/DatabaseInterfaceImplementationTest.php

@@ -1413,17 +1413,6 @@ protected function isEmptyTestTable()
         return empty($this->fetchAllTestTableRows());
     }
 
-    /**
-     * Helper methods to be used in all tests extending this class
-     */
-    /**
-     * Assure, that the table oxdoctrinetest is empty. If it is not empty, the test will fail.
-     */
-    protected function assureTestTableIsEmpty()
-    {
-        $this->assertEmpty($this->fetchAllTestTableRows(), "Table '" . self::TABLE_NAME . "' is empty");
-    }
-
     /**
      * Get an instance of ConfigFile based on a empty file.
      *