MAGETWO-63209: Fatal error on category page when changing display mode with flat category on

Author: ameysar

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.php

@@ -37,13 +37,6 @@ class CategoryForm extends FormTabs
      */
     protected $confirmModal = '.confirm._show[data-role=modal]';
 
-    /**
-     * Category edit title.
-     *
-     * @var string
-     */
-    protected $categoryTitle = '.category-edit-title h3.title';
-
     /**
      * Fill form with tabs.
      *
@@ -74,14 +67,8 @@ public function fill(FixtureInterface $fixture, SimpleElement $element = null)
      */
     public function getCategoryId()
     {
-        $titleElement = $this->_rootElement->find($this->categoryTitle);
-        $title = '';
-        if ($titleElement->isVisible()) {
-            $title = $titleElement->getText();
-        }
-
         $categoryId = '';
-        if (preg_match('/ID:\s*(?<id>\d+)/', $title, $matches)) {
+        if (preg_match('/\/id\/(?<id>\d+)(?:\/)?/', $this->browser->getUrl(), $matches)) {
             $categoryId = $matches['id'];
         }