Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement 'meaningful' checks to .js #112

Merged
merged 8 commits into from
Nov 2, 2023
Merged

Implement 'meaningful' checks to .js #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ab25e15
Implement 'meaningful' checks to `.js`
convenient Nov 1, 2023
e032547
Update test cases
convenient Nov 1, 2023
7b184b9
Update test cases
convenient Nov 1, 2023
404982f
Update test cases
convenient Nov 1, 2023
c248c66
Update test cases
convenient Nov 1, 2023
696bfeb
Update test cases
convenient Nov 1, 2023
4a327c1
Update test cases
convenient Nov 1, 2023
34f6ceb
Update test cases
convenient Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dev/Docker/setup-magento-with-diff.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,12 @@ echo "<!-- --><p>some change</p>" >> vendor/magento/module-ui/view/base/web/tem
# Redundant override
echo " " >> vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Ui/web/templates/redundant.html
echo " " >> vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/email/redundant.html
echo " " >> vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Checkout/web/js/redundant.js

# Ignored change
echo "<!-- -->" >> vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Ui/web/templates/ignore.html
echo "<!-- -->" >> vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/email/ignore.html
echo "/* some comment */" >> vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Checkout/web/js/ignore.js

echo "#" >> vendor/magento/module-customer/view/frontend/web/js/model/authentication-popup.js

Expand Down
33 changes: 33 additions & 0 deletions dev/TestModule/app/design/frontend/Ampersand/theme/Magento_Checkout/web/js/ignore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/**
* Some copyright header.
* Goes here
*
*
* foobar
*/
define([
'abc123'
], function (resolver) {
'use strict';

/**
* Some function comment.
*
* @param {Object} config - Optional configuration
*/
function the_function_names_are_different(config) {
// this has been overridden and the function is different now
var foo = 1;
}

/**
* Some other function comment
*
* @param {Object} config - Optional configuration
*/
function init(config) {
resolver(the_function_names_are_different.bind(config));
}

return init;
});
40 changes: 40 additions & 0 deletions dev/TestModule/app/design/frontend/Ampersand/theme/Magento_Checkout/web/js/redundant.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/**
* Some copyright header.
* Goes here
*/
define([
'abc123'
], function (resolver) {
'use strict';

/**
* Some function comment.
*
* @param {Object} config - Optional configuration
*/
function foobar(config) {
var foo = 1;
}


/**
* what comments // do we have here
* /*
*
* oh what comments are here
* /
*/


/**
* Some other function comment
*
* @param {Object} config - Optional configuration
*/
function init(config) {
resolver(foobar.bind(config));
}
// more comments

return init;
});
29 changes: 29 additions & 0 deletions dev/TestVendorModule/src/theme/Magento_Checkout/web/js/ignore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/**
* Some copyright header.
* Goes here
*/
define([
'abc123'
], function (resolver) {
'use strict';

/**
* Some function comment.
*
* @param {Object} config - Optional configuration
*/
function this_is_the_base_function_name(config) {
var foo = 1;
}

/**
* Some other function comment
*
* @param {Object} config - Optional configuration
*/
function init(config) {
resolver(this_is_the_base_function_name.bind(config));
}

return init;
});
36 changes: 36 additions & 0 deletions dev/TestVendorModule/src/theme/Magento_Checkout/web/js/redundant.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/**
* Some copyright header.
* Goes here
*/
define([
'abc123'
], function (resolver) {
'use strict';


// more comments
/*
like this
*/
/**
* Some function comment.
*
* @param {Object} config - Optional configuration
*/
function foobar(config) {
var foo = 1;
}

// more comments

/**
* Some other function comment
*
* @param {Object} config - Optional configuration
*/
function init(config) {
resolver(foobar.bind(config));
}

return init;
});
5 changes: 3 additions & 2 deletions dev/phpunit/functional/expected_output/magentom23.out.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,10 @@
| WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndDelete.php | Ampersand\Test\Model\ToPreferenceAndDelete |
| WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndExtendAndDelete.php | Ampersand\Test\Model\ToPreferenceAndExtendAndDelete |
| WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/email/redundant.html | app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/redundant.html |
| WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Checkout/web/js/redundant.js | app/design/frontend/Ampersand/theme/Magento_Checkout/web/js/redundant.js |
| WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Ui/web/templates/redundant.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/redundant.html |
+-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
WARN count: 64
WARN count: 65
INFO count: 309 (to view re-run this tool with --show-info)
IGNORE count: 2 (to view re-run this tool with --show-ignore)
IGNORE count: 3 (to view re-run this tool with --show-ignore)
For docs on each check see https://github.com/AmpersandHQ/ampersand-magento2-upgrade-patch-helper/blob/master/docs/CHECKS_AVAILABLE.md
5 changes: 3 additions & 2 deletions dev/phpunit/functional/expected_output/magentom23VendorNamespaces.out.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,10 @@
| WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndDelete.php | Ampersand\Test\Model\ToPreferenceAndDelete |
| WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndExtendAndDelete.php | Ampersand\Test\Model\ToPreferenceAndExtendAndDelete |
| WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/email/redundant.html | app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/redundant.html |
| WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Checkout/web/js/redundant.js | app/design/frontend/Ampersand/theme/Magento_Checkout/web/js/redundant.js |
| WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Ui/web/templates/redundant.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/redundant.html |
+-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
WARN count: 65
WARN count: 66
INFO count: 314 (to view re-run this tool with --show-info)
IGNORE count: 2 (to view re-run this tool with --show-ignore)
IGNORE count: 3 (to view re-run this tool with --show-ignore)
For docs on each check see https://github.com/AmpersandHQ/ampersand-magento2-upgrade-patch-helper/blob/master/docs/CHECKS_AVAILABLE.md
6 changes: 3 additions & 3 deletions dev/phpunit/functional/expected_output/magentom24-nodb.out.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@
| WARN | Override (phtml/js/html) | vendor/magento/module-sales/view/frontend/layout/sales_order_print.xml | app/design/frontend/Ampersand/theme/Magento_Sales/layout/sales_order_print.xml |
| WARN | Override (phtml/js/html) | vendor/magento/module-ui/view/base/web/templates/block-loader.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/block-loader.html |
| WARN | Override (phtml/js/html) | vendor/magento/module-ui/view/base/web/templates/grid/masonry.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/grid/masonry.html |
| WARN | Override (phtml/js/html) | vendor/magento/module-vault/view/frontend/web/js/view/payment/method-renderer/vault.js | app/design/frontend/Ampersand/theme/Magento_Vault/web/js/view/payment/method-renderer/vault.js |
| WARN | Override (phtml/js/html) | vendor/magento/theme-frontend-blank/etc/view.xml | vendor/ampersand/upgrade-patch-helper-test-hyva-fallback-theme/theme/etc/view.xml |
| WARN | Override (phtml/js/html) | vendor/magento/theme-frontend-blank/etc/view.xml | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/etc/view.xml |
| WARN | Override (phtml/js/html) | vendor/magento/theme-frontend-luma/Magento_Sales/email/order_new.html | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Sales/email/order_new.html |
| WARN | Override (phtml/js/html) | vendor/magento/theme-frontend-luma/etc/view.xml | vendor/ampersand/upgrade-patch-helper-test-hyva-fallback-theme/theme/etc/view.xml |
| WARN | Override (phtml/js/html) | vendor/magento/theme-frontend-luma/etc/view.xml | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/etc/view.xml |
| WARN | Override (phtml/js/html) | vendor/paypal/module-braintree-core/view/base/web/js/form-builder.js | vendor/paypal/module-braintree-core/view/frontend/web/js/form-builder.js |
| WARN | Plugin | vendor/magento/framework/Stdlib/Cookie/PhpCookieManager.php | Ampersand\Test\Plugin\PhpCookieManager::beforeSetPublicCookie |
| WARN | Plugin | vendor/magento/module-adobe-ims/Model/UserProfile.php | Ampersand\Test\Plugin\AdobeImsUserProfile::afterGetUpdatedAt |
| WARN | Plugin | vendor/magento/module-adobe-ims/Model/UserProfile.php | Ampersand\Test\Plugin\AdobeImsUserProfile::aroundGetUpdatedAt |
Expand All @@ -60,9 +58,11 @@
| WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndDelete.php | Ampersand\Test\Model\ToPreferenceAndDelete |
| WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndExtendAndDelete.php | Ampersand\Test\Model\ToPreferenceAndExtendAndDelete |
| WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/email/redundant.html | app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/redundant.html |
| WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Checkout/web/js/redundant.js | app/design/frontend/Ampersand/theme/Magento_Checkout/web/js/redundant.js |
| WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Ui/web/templates/redundant.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/redundant.html |
| WARN | Redundant Override | vendor/paypal/module-braintree-core/view/base/web/js/form-builder.js | vendor/paypal/module-braintree-core/view/frontend/web/js/form-builder.js |
+-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
WARN count: 60
INFO count: 395 (to view re-run this tool with --show-info)
IGNORE count: 2 (to view re-run this tool with --show-ignore)
IGNORE count: 4 (to view re-run this tool with --show-ignore)
For docs on each check see https://github.com/AmpersandHQ/ampersand-magento2-upgrade-patch-helper/blob/master/docs/CHECKS_AVAILABLE.md
Loading