Merge remote-tracking branch 'origin/MAGETWO-32249' into Troll_S32

app/code/Magento/Eav/Test/Unit/Model/ConfigTest.php

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Eav\Model;
+namespace Magento\Eav\Test\Unit\Model;
 
 use Magento\Framework\Object;
 use Magento\Eav\Model\Config;
@@ -86,7 +86,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
         $this->stateMock
             ->expects($this->atLeastOnce())
             ->method('isEnabled')
-            ->with(Cache\Type::TYPE_IDENTIFIER)
+            ->with(\Magento\Eav\Model\Cache\Type::TYPE_IDENTIFIER)
             ->willReturn($cacheEnabled);
         $this->cacheMock
             ->expects($this->exactly($loadCalls))
@@ -181,7 +181,14 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
         $this->cacheMock
             ->expects($this->once())
             ->method('clean')
-            ->with($this->equalTo([Cache\Type::CACHE_TAG, Entity\Attribute::CACHE_TAG]));
+            ->with(
+                $this->equalTo(
+                    [
+                        \Magento\Eav\Model\Cache\Type::CACHE_TAG,
+                        \Magento\Eav\Model\Entity\Attribute::CACHE_TAG
+                    ]
+                )
+            );
         $this->config->clear();
     }
 }

dev/tests/integration/testsuite/Magento/Indexer/Controller/Adminhtml/IndexerTest.php

+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Indexer\Controller\Adminhtml;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class IndexerTest extends \Magento\Backend\Utility\Controller
+{
+    /**
+     * Assert that current page is index management page and that it has indexers mode selector
+     *
+     * @return void
+     */
+    public function testIndexersMode()
+    {
+        $this->dispatch('backend/indexer/indexer/list/');
+        $body = $this->getResponse()->getBody();
+        $this->assertContains('<h1 class="title">Index Management</h1>', $body);
+        $this->assertSelectCount('#gridIndexer_massaction-select', 1, $body, 'Mode selector is not found');
+        $this->assertContains('option value="change_mode_onthefly"', $body);
+        $this->assertContains('option value="change_mode_changelog"', $body);
+    }
+
+    /**
+     * Assert that index management contains a certain number of indexers
+     *
+     * @return void
+     */
+    public function testDefaultNumberOfIndexers()
+    {
+        $this->dispatch('backend/indexer/indexer/list/');
+        $body = $this->getResponse()->getBody();
+        $this->assertSelectCount(
+            '[name="indexer_ids"]',
+            true,
+            $body,
+            'Indexer list is empty'
+        );
+    }
+}