Skip to content

Commit 33393e2

Browse files
Merge pull request #2676 from magento-borg/MAGETWO-92468-make-tests-namespace-agnostic-2.3-develop
[borg] MAGETWO-92468: Make PR testsuite namespace-agnostic
2 parents 3ab560d + ca5df87 commit 33393e2

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@ lib/web/mage/adminhtml/varienLoader.js
1414
lib/web/magnifier/magnifier.js
1515
lib/web/magnifier/magnify.js
1616
lib/web/varien/js.js
17+
18+
// MINIFIED FILES
19+
app/code/**/*.min.js

dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
'/\.(jpe?g|png|gif|ttf|swf|eot|woff|pdf|mp3|pdf|jar|jbf|php\.dist)$/',
88
'/pub\/opt\/magento\/var/',
99
'/COPYING\.txt/',
10-
'/setup\/src\/Zend\/Mvc\/Controller\/LazyControllerAbstractFactory\.php/'
10+
'/setup\/src\/Zend\/Mvc\/Controller\/LazyControllerAbstractFactory\.php/',
11+
'/app\/code\/(?!Magento)[^\/]*/'
1112
];

dev/tools/grunt/tools/collect-validation-files.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
* See COPYING.txt for license details.
44
*/
55

6-
/**
7-
* Copyright © Magento, Inc. All rights reserved.
8-
* See COPYING.txt for license details.
9-
*/
106
'use strict';
117

128
var glob = require('glob'),
@@ -29,8 +25,8 @@ module.exports = {
2925
getFilesForValidate: function () {
3026
var blackListFiles = glob.sync(pc.static.blacklist + '*.txt'),
3127
whiteListFiles = glob.sync(pc.static.whitelist + '*.txt'),
32-
blackList = this.readFiles(blackListFiles),
33-
whiteList = this.readFiles(whiteListFiles),
28+
blackList = this.readFiles(blackListFiles).filter(this.isListEntryValid),
29+
whiteList = this.readFiles(whiteListFiles).filter(this.isListEntryValid),
3430
files = [],
3531
entireBlackList = [];
3632

@@ -45,6 +41,11 @@ module.exports = {
4541
return files;
4642
},
4743

44+
isListEntryValid: function(line) {
45+
line = line.trim();
46+
return line.length > 0 && line.startsWith('// ') !== true;
47+
},
48+
4849
getFiles: function (file) {
4950
if (file) {
5051
return file.split(',');

0 commit comments

Comments
 (0)