Merge pull request #2676 from magento-borg/MAGETWO-92468-make-tests-n…

…amespace-agnostic-2.3-develop [borg] MAGETWO-92468: Make PR testsuite namespace-agnostic
magento · Jun 9, 2018 · 33393e2 · 33393e2
2 parents 3ab560d + ca5df87
commit 33393e2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt b/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
@@ -14,3 +14,6 @@ lib/web/mage/adminhtml/varienLoader.js
 lib/web/magnifier/magnifier.js
 lib/web/magnifier/magnify.js
 lib/web/varien/js.js
+
+// MINIFIED FILES
+app/code/**/*.min.js
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
@@ -7,5 +7,6 @@
     '/\.(jpe?g|png|gif|ttf|swf|eot|woff|pdf|mp3|pdf|jar|jbf|php\.dist)$/',
     '/pub\/opt\/magento\/var/',
     '/COPYING\.txt/',
-    '/setup\/src\/Zend\/Mvc\/Controller\/LazyControllerAbstractFactory\.php/'
+    '/setup\/src\/Zend\/Mvc\/Controller\/LazyControllerAbstractFactory\.php/',
+    '/app\/code\/(?!Magento)[^\/]*/'
 ];
diff --git a/dev/tools/grunt/tools/collect-validation-files.js b/dev/tools/grunt/tools/collect-validation-files.js
@@ -3,10 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
 'use strict';
 
 var glob = require('glob'),
@@ -29,8 +25,8 @@ module.exports = {
     getFilesForValidate: function () {
         var blackListFiles = glob.sync(pc.static.blacklist + '*.txt'),
             whiteListFiles = glob.sync(pc.static.whitelist + '*.txt'),
-            blackList = this.readFiles(blackListFiles),
-            whiteList = this.readFiles(whiteListFiles),
+            blackList = this.readFiles(blackListFiles).filter(this.isListEntryValid),
+            whiteList = this.readFiles(whiteListFiles).filter(this.isListEntryValid),
             files = [],
             entireBlackList = [];
 
@@ -45,6 +41,11 @@ module.exports = {
         return files;
     },
 
+    isListEntryValid: function(line) {
+        line = line.trim();
+        return line.length > 0 && line.startsWith('// ') !== true;
+    },
+
     getFiles: function (file) {
         if (file) {
             return file.split(',');