MAGETWO-56095: When category has products that are not visible to catalog the pager still shows is this expected behavior?

Author: le0n4eg

app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php

@@ -417,6 +417,9 @@ public function isIndexable()
         if ($this->getAttributeCode() == 'price') {
             return false;
         }
+        if ($this->getAttributeCode() == 'visibility') {
+            return true;
+        }
 
         if (!$this->getIsFilterableInSearch() && !$this->getIsVisibleInAdvancedSearch() && !$this->getIsFilterable()) {
             return false;

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php

@@ -45,6 +45,47 @@ public function testSaveActionRedirectsSuccessfully()
         $this->assertTrue($isRedirectPresent);
     }
 
+    /**
+     * @covers \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save::execute
+     *
+     * @dataProvider saveActionVisibilityAttrDataProvider
+     * @param array $attributes
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testSaveActionChangeVisibility($attributes)
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Catalog\Model\ProductRepository::class
+        );
+        $product = $repository->get('simple');
+        $product->setOrigData();
+        $product->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE);
+        $product->save();
+
+        /** @var $session \Magento\Backend\Model\Session */
+        $session = $objectManager->get(\Magento\Backend\Model\Session::class);
+        $session->setProductIds([$product->getId()]);
+        $this->getRequest()->setParam('attributes', $attributes);
+
+        $this->dispatch('backend/catalog/product_action_attribute/save/store/0');
+        /** @var \Magento\Catalog\Model\Category $category */
+        $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Catalog\Model\CategoryFactory::class
+        );
+        /** @var \Magento\Catalog\Block\Product\ListProduct $listProduct */
+        $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Catalog\Block\Product\ListProduct::class
+        );
+
+        $category = $categoryFactory->create()->load(2);
+        $layer = $listProduct->getLayer();
+        $layer->setCurrentCategory($category);
+        $productCollection = $layer->getProductCollection();
+        $productItem = $productCollection->getFirstItem();
+        $this->assertEquals($session->getProductIds(), [$productItem->getId()]);
+    }
+
     /**
      * @covers \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Validate::execute
      *
@@ -97,4 +138,17 @@ public function validateActionDataProvider()
             ]
         ];
     }
+
+    /**
+     * Data Provider for save with visibility attribute
+     *
+     * @return array
+     */
+    public function saveActionVisibilityAttrDataProvider()
+    {
+        return [
+            ['arguments' => ['visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH]],
+            ['arguments' => ['visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG]]
+        ];
+    }
 }