Merge remote-tracking branch 'mainline/develop' into MAGETWO-33401

Author: AndriyNasinnyk

app/code/Magento/Reports/Model/Resource/Product/Collection.php

@@ -434,10 +434,7 @@ public function addViewsCount($from = '', $to = '')
             ['views' => 'COUNT(report_table_views.event_id)']
         )->join(
             ['e' => $this->getProductEntityTableName()],
-            $this->getConnection()->quoteInto(
-                "e.entity_id = report_table_views.object_id AND e.entity_type_id = ?",
-                $this->getProductEntityTypeId()
-            )
+            'e.entity_id = report_table_views.object_id'
         )->where(
             'report_table_views.event_type_id = ?',
             $productViewEvent

dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ *
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Backend\Controller\Adminhtml\Dashboard;
+
+class ProductsViewedTest extends \Magento\Backend\Utility\Controller
+{
+    /**
+     * @magentoDataFixture Magento/Reports/_files/viewed_products.php
+     */
+    public function testExecute()
+    {
+        $this->dispatch('backend/admin/dashboard/productsViewed/');
+
+        $this->assertEquals(200, $this->getResponse()->getHttpResponseCode());
+
+        $actual = $this->getResponse()->getBody();
+        $this->assertContains('Simple Product', $actual);
+    }
+}

dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php

@@ -534,9 +534,16 @@ public function testCoversAnnotation()
         $errors = [];
         foreach ($files->getFiles([BP . '/dev/tests/{integration,unit}'], '*') as $file) {
             $code = file_get_contents($file);
-            if (preg_match('/@covers(DefaultClass)?\s+([\w\\\\]+)(::([\w\\\\]+))?/', $code, $matches)) {
-                if ($this->isNonexistentEntityCovered($matches)) {
-                    $errors[] = $file . ': ' . $matches[0];
+            if (preg_match_all(
+                '/@covers(DefaultClass)?\s+([\w\\\\]+)(::([\w\\\\]+))?/',
+                $code,
+                $matchesAll,
+                PREG_SET_ORDER
+            )) {
+                foreach ($matchesAll as $matches) {
+                    if ($this->isNonexistentEntityCovered($matches)) {
+                        $errors[] = $file . ': ' . $matches[0];
+                    }
                 }
             }
         }