Merge remote-tracking branch 'remotes/tango-ce/MAGETWO-33450' into MAGETWO-33812

Author: Yuri Kovsher

app/code/Magento/Catalog/Block/Category/View.php

@@ -76,6 +76,7 @@ protected function _prepareLayout()
             if ($this->_categoryHelper->canUseCanonicalTag()) {
                 $this->pageConfig->addRemotePageAsset(
                     $category->getUrl(),
+                    'canonical',
                     ['attributes' => ['rel' => 'canonical']]
                 );
             }

app/code/Magento/Catalog/Block/Product/View.php

@@ -148,6 +148,7 @@ protected function _prepareLayout()
         if ($this->_productHelper->canUseCanonicalTag()) {
             $this->pageConfig->addRemotePageAsset(
                 $product->getUrlModel()->getUrl($product, ['_ignore_category' => true]),
+                'canonical',
                 ['attributes' => ['rel' => 'canonical']]
             );
         }

dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/ViewTest.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Controller\Product;
+
+/**
+ * @magentoDataFixture Magento/Catalog/controllers/_files/products.php
+ */
+class ViewTest extends \Magento\TestFramework\TestCase\AbstractController
+{
+    /**
+     * @magentoConfigFixture current_store catalog/seo/product_canonical_tag 1
+     */
+    public function testViewActionWithCanonicalTag()
+    {
+        $this->dispatch('catalog/product/view/id/1/');
+
+        $this->assertContains(
+            '<link  rel="canonical" href="http://localhost/index.php/catalog/product/view/_ignore_category/1/id/1/" />',
+            $this->getResponse()->getBody()
+        );
+    }
+}