Skip to content

Commit b2dd5ef

Browse files
Merge pull request #2675 from magento-borg/MAGETWO-92468-make-tests-namespace-agnostic-2.2.5
[borg] MAGETWO-92468: Make PR testsuite namespace-agnostic
2 parents 8fc8439 + f8a4502 commit b2dd5ef

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
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
@@ -3,6 +3,9 @@ app/code/Magento/Customer/view/frontend/web/js/zxcvbn.js
33
app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-bundle.js
44
app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-standalone-preset.js
55

6+
// MINIFIED FILES
7+
app/code/**/*.min.js
8+
69
// TO REFACTORING
710
app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js
811
app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.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
@@ -6,5 +6,6 @@
66
return [
77
'/\.(jpe?g|png|gif|ttf|swf|eot|woff|pdf|mp3|pdf|jar|jbf)$/',
88
'/pub\/opt\/magento\/var/',
9-
'/COPYING\.txt/'
9+
'/COPYING\.txt/',
10+
'/app\/code\/(?!Magento)[^\/]*/'
1011
];

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

Lines changed: 14 additions & 8 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,17 +25,27 @@ 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),
34-
files = [];
28+
blackList = this.readFiles(blackListFiles).filter(this.isListEntryValid),
29+
whiteList = this.readFiles(whiteListFiles).filter(this.isListEntryValid),
30+
files = [],
31+
entireBlackList = [];
32+
33+
fst.arrayRead(blackList, function (data) {
34+
entireBlackList = _.union(entireBlackList, data);
35+
});
3536

3637
fst.arrayRead(whiteList, function (data) {
37-
files = _.difference(data, blackList);
38+
files = _.difference(data, entireBlackList);
3839
});
3940

4041
return files;
4142
},
4243

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

0 commit comments

Comments
 (0)