From af9ff49a773fb78a7186874ab7df973b9919cf88 Mon Sep 17 00:00:00 2001 From: Robert Grundeken Date: Thu, 2 Apr 2020 08:58:47 +0200 Subject: [PATCH 1/8] Added settings for jshint to allow 'let' in javascript --- .jshint | 1 + 1 file changed, 1 insertion(+) create mode 100644 .jshint diff --git a/.jshint b/.jshint new file mode 100644 index 0000000..ebc7b70 --- /dev/null +++ b/.jshint @@ -0,0 +1 @@ +use 'esversion: 6' From 18d4bcb4b2ed4c2db4fdd0fd04e71eaaf98f12c8 Mon Sep 17 00:00:00 2001 From: Robert Grundeken Date: Thu, 2 Apr 2020 09:12:45 +0200 Subject: [PATCH 2/8] New version of jshint settings --- .jshint | 1 - .jshintrc | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) delete mode 100644 .jshint create mode 100644 .jshintrc diff --git a/.jshint b/.jshint deleted file mode 100644 index ebc7b70..0000000 --- a/.jshint +++ /dev/null @@ -1 +0,0 @@ -use 'esversion: 6' diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 0000000..2b6f469 --- /dev/null +++ b/.jshintrc @@ -0,0 +1,3 @@ +{ + "esversion": 6 +} From 2fb143e38dddb2fd0fa0d44a0ed40819c9d39001 Mon Sep 17 00:00:00 2001 From: Robert Grundeken Date: Thu, 2 Apr 2020 09:21:09 +0200 Subject: [PATCH 3/8] Added jshint esversion comment to the file to allow 'let' --- view/frontend/web/js/view/delivery-options.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/view/frontend/web/js/view/delivery-options.js b/view/frontend/web/js/view/delivery-options.js index 852e6e5..dd0203b 100644 --- a/view/frontend/web/js/view/delivery-options.js +++ b/view/frontend/web/js/view/delivery-options.js @@ -28,6 +28,7 @@ * @copyright Copyright (c) Total Internet Group B.V. https://tig.nl/copyright * @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US */ +/* jshint esversion: 6 */ define([ 'jquery', 'uiComponent', @@ -253,4 +254,4 @@ define([ }); -}); \ No newline at end of file +}); From 2fb73f6af28b158971a5bb6c18e33c7a77ba3401 Mon Sep 17 00:00:00 2001 From: Robert Grundeken Date: Thu, 2 Apr 2020 09:41:52 +0200 Subject: [PATCH 4/8] updated travis magento version checks --- .jshintrc | 3 --- .travis.yml | 12 ++++++++---- 2 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 .jshintrc diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index 2b6f469..0000000 --- a/.jshintrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "esversion": 6 -} diff --git a/.travis.yml b/.travis.yml index 96e6cc5..56cd81d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,14 +18,18 @@ matrix: # PHP 7.1 is only supported in Magento 2.2.x # PHP 7.2 is only supported in Magento 2.3.x include: - - php: 7.1 - env: MAGENTO_VERSION=2.2.10 - php: 7.1 env: MAGENTO_VERSION=2.3.1 - php: 7.1 - env: MAGENTO_VERSION=2.3.2 # DI_COMPILE=true + env: MAGENTO_VERSION=2.3.2 + - php: 7.2 + env: MAGENTO_VERSION=2.3.3 # DI_COMPILE=true - php: 7.2 - env: MAGENTO_VERSION=2.3.3 CODE_COVERAGE=true + env: MAGENTO_VERSION=2.3.4 CODE_COVERAGE=true + + allow_failures: + - php: 7.1 + env: MAGENTO_VERSION=2.2.11 before_script: - export PATH=$PATH:$HOME/.composer/vendor/bin From 6b68711c3583dc980bdad01c82bb22851134f34c Mon Sep 17 00:00:00 2001 From: Robert Grundeken Date: Thu, 2 Apr 2020 10:00:28 +0200 Subject: [PATCH 5/8] updated .travis.yml with 2.3.4 php 7.3 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 56cd81d..0473675 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,12 +19,12 @@ matrix: # PHP 7.2 is only supported in Magento 2.3.x include: - php: 7.1 - env: MAGENTO_VERSION=2.3.1 + env: MAGENTO_VERSION=2.2.11 - php: 7.1 env: MAGENTO_VERSION=2.3.2 - php: 7.2 env: MAGENTO_VERSION=2.3.3 # DI_COMPILE=true - - php: 7.2 + - php: 7.3 env: MAGENTO_VERSION=2.3.4 CODE_COVERAGE=true allow_failures: From c98f602b5f8673addea98f372f5353fc23eb467f Mon Sep 17 00:00:00 2001 From: Robert Grundeken Date: Thu, 2 Apr 2020 11:09:16 +0200 Subject: [PATCH 6/8] Removed prefilled setup_module table --- Test/Fixtures/tig-gls-fixture.sql | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Test/Fixtures/tig-gls-fixture.sql b/Test/Fixtures/tig-gls-fixture.sql index 550cee5..105d3fd 100644 --- a/Test/Fixtures/tig-gls-fixture.sql +++ b/Test/Fixtures/tig-gls-fixture.sql @@ -9419,11 +9419,6 @@ CREATE TABLE `setup_module` ( -- Dumping data for table `setup_module` -- -LOCK TABLES `setup_module` WRITE; -/*!40000 ALTER TABLE `setup_module` DISABLE KEYS */; -INSERT INTO `setup_module` VALUES ('Magento_AdminNotification','2.0.0','2.0.0'),('Magento_AdvancedPricingImportExport','2.0.0','2.0.0'),('Magento_Authorization','2.0.0','2.0.0'),('Magento_Authorizenet','2.0.0','2.0.0'),('Magento_Backend','2.0.0','2.0.0'),('Magento_Backup','2.0.0','2.0.0'),('Magento_Braintree','2.0.0','2.0.0'),('Magento_BraintreeTwo','2.0.0','2.0.0'),('Magento_Bundle','2.0.1','2.0.1'),('Magento_BundleImportExport','2.0.0','2.0.0'),('Magento_CacheInvalidate','2.0.0','2.0.0'),('Magento_Captcha','2.0.0','2.0.0'),('Magento_Catalog','2.0.3','2.0.3'),('Magento_CatalogImportExport','2.0.0','2.0.0'),('Magento_CatalogInventory','2.0.0','2.0.0'),('Magento_CatalogRule','2.0.0','2.0.0'),('Magento_CatalogRuleConfigurable','2.0.0','2.0.0'),('Magento_CatalogSearch','2.0.0','2.0.0'),('Magento_CatalogUrlRewrite','2.0.0','2.0.0'),('Magento_CatalogWidget','2.0.0','2.0.0'),('Magento_Checkout','2.0.0','2.0.0'),('Magento_CheckoutAgreements','2.0.1','2.0.1'),('Magento_Cms','2.0.0','2.0.0'),('Magento_CmsUrlRewrite','2.0.0','2.0.0'),('Magento_Config','2.0.0','2.0.0'),('Magento_ConfigurableImportExport','2.0.0','2.0.0'),('Magento_ConfigurableProduct','2.0.0','2.0.0'),('Magento_Contact','2.0.0','2.0.0'),('Magento_Cookie','2.0.0','2.0.0'),('Magento_Cron','2.0.0','2.0.0'),('Magento_CurrencySymbol','2.0.0','2.0.0'),('Magento_Customer','2.0.6','2.0.6'),('Magento_CustomerImportExport','2.0.0','2.0.0'),('Magento_Deploy','2.0.0','2.0.0'),('Magento_Developer','2.0.0','2.0.0'),('Magento_Dhl','2.0.0','2.0.0'),('Magento_Directory','2.0.0','2.0.0'),('Magento_Downloadable','2.0.0','2.0.0'),('Magento_DownloadableImportExport','2.0.0','2.0.0'),('Magento_Eav','2.0.0','2.0.0'),('Magento_Email','2.0.0','2.0.0'),('Magento_EncryptionKey','2.0.0','2.0.0'),('Magento_Fedex','2.0.0','2.0.0'),('Magento_GiftMessage','2.0.0','2.0.0'),('Magento_GoogleAdwords','2.0.0','2.0.0'),('Magento_GoogleAnalytics','2.0.0','2.0.0'),('Magento_GoogleOptimizer','2.0.0','2.0.0'),('Magento_GroupedImportExport','2.0.0','2.0.0'),('Magento_GroupedProduct','2.0.0','2.0.0'),('Magento_ImportExport','2.0.1','2.0.1'),('Magento_Indexer','2.0.0','2.0.0'),('Magento_Integration','2.0.0','2.0.0'),('Magento_LayeredNavigation','2.0.0','2.0.0'),('Magento_Marketplace','1.0.0','1.0.0'),('Magento_MediaStorage','2.0.0','2.0.0'),('Magento_Msrp','2.0.0','2.0.0'),('Magento_Multishipping','2.0.0','2.0.0'),('Magento_NewRelicReporting','2.0.0','2.0.0'),('Magento_Newsletter','2.0.0','2.0.0'),('Magento_OfflinePayments','2.0.0','2.0.0'),('Magento_OfflineShipping','2.0.0','2.0.0'),('Magento_PageCache','2.0.0','2.0.0'),('Magento_Payment','2.0.0','2.0.0'),('Magento_Paypal','2.0.0','2.0.0'),('Magento_Persistent','2.0.0','2.0.0'),('Magento_ProductAlert','2.0.0','2.0.0'),('Magento_ProductVideo','2.0.0.2','2.0.0.2'),('Magento_Quote','2.0.1','2.0.1'),('Magento_Reports','2.0.0','2.0.0'),('Magento_RequireJs','2.0.0','2.0.0'),('Magento_Review','2.0.0','2.0.0'),('Magento_Rss','2.0.0','2.0.0'),('Magento_Rule','2.0.0','2.0.0'),('Magento_Sales','2.0.1','2.0.1'),('Magento_SalesRule','2.0.0','2.0.0'),('Magento_SalesSequence','2.0.0','2.0.0'),('Magento_SampleData','2.0.0','2.0.0'),('Magento_Search','2.0.1','2.0.1'),('Magento_SendFriend','2.0.0','2.0.0'),('Magento_Shipping','2.0.0','2.0.0'),('Magento_Sitemap','2.0.0','2.0.0'),('Magento_Store','2.0.0','2.0.0'),('Magento_Swagger','2.0.0','2.0.0'),('Magento_Swatches','2.0.0','2.0.0'),('Magento_Tax','2.0.1','2.0.1'),('Magento_TaxImportExport','2.0.0','2.0.0'),('Magento_Theme','2.0.0','2.0.0'),('Magento_Translation','2.0.0','2.0.0'),('Magento_Ui','2.0.0','2.0.0'),('Magento_Ups','2.0.0','2.0.0'),('Magento_UrlRewrite','2.0.0','2.0.0'),('Magento_User','2.0.1','2.0.1'),('Magento_Usps','2.0.0','2.0.0'),('Magento_Variable','2.0.0','2.0.0'),('Magento_Vault','2.0.0','2.0.0'),('Magento_Version','2.0.0','2.0.0'),('Magento_Webapi','2.0.0','2.0.0'),('Magento_Weee','2.0.0','2.0.0'),('Magento_Widget','2.0.0','2.0.0'),('Magento_Wishlist','2.0.0','2.0.0'),('TIG_Buckaroo','0.9.2','0.9.2'); -/*!40000 ALTER TABLE `setup_module` ENABLE KEYS */; -UNLOCK TABLES; -- -- Table structure for table `shipping_tablerate` @@ -10371,4 +10366,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2016-02-02 9:05:12 \ No newline at end of file +-- Dump completed on 2016-02-02 9:05:12 From 61e32f6f90f31615ba576b1f887c51d368177742 Mon Sep 17 00:00:00 2001 From: Robert Grundeken Date: Thu, 2 Apr 2020 12:43:07 +0200 Subject: [PATCH 7/8] reverted changes in the tests regarding setup_module table --- Test/Fixtures/tig-gls-fixture.sql | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Test/Fixtures/tig-gls-fixture.sql b/Test/Fixtures/tig-gls-fixture.sql index 105d3fd..f3d6540 100644 --- a/Test/Fixtures/tig-gls-fixture.sql +++ b/Test/Fixtures/tig-gls-fixture.sql @@ -9418,7 +9418,11 @@ CREATE TABLE `setup_module` ( -- -- Dumping data for table `setup_module` -- - +LOCK TABLES `setup_module` WRITE; +/*!40000 ALTER TABLE `setup_module` DISABLE KEYS */; +INSERT INTO `setup_module` VALUES ('Magento_AdminNotification','2.0.0','2.0.0'),('Magento_AdvancedPricingImportExport','2.0.0','2.0.0'),('Magento_Authorization','2.0.0','2.0.0'),('Magento_Authorizenet','2.0.0','2.0.0'),('Magento_Backend','2.0.0','2.0.0'),('Magento_Backup','2.0.0','2.0.0'),('Magento_Braintree','2.0.0','2.0.0'),('Magento_BraintreeTwo','2.0.0','2.0.0'),('Magento_Bundle','2.0.1','2.0.1'),('Magento_BundleImportExport','2.0.0','2.0.0'),('Magento_CacheInvalidate','2.0.0','2.0.0'),('Magento_Captcha','2.0.0','2.0.0'),('Magento_Catalog','2.0.3','2.0.3'),('Magento_CatalogImportExport','2.0.0','2.0.0'),('Magento_CatalogInventory','2.0.0','2.0.0'),('Magento_CatalogRule','2.0.0','2.0.0'),('Magento_CatalogRuleConfigurable','2.0.0','2.0.0'),('Magento_CatalogSearch','2.0.0','2.0.0'),('Magento_CatalogUrlRewrite','2.0.0','2.0.0'),('Magento_CatalogWidget','2.0.0','2.0.0'),('Magento_Checkout','2.0.0','2.0.0'),('Magento_CheckoutAgreements','2.0.1','2.0.1'),('Magento_Cms','2.0.0','2.0.0'),('Magento_CmsUrlRewrite','2.0.0','2.0.0'),('Magento_Config','2.0.0','2.0.0'),('Magento_ConfigurableImportExport','2.0.0','2.0.0'),('Magento_ConfigurableProduct','2.0.0','2.0.0'),('Magento_Contact','2.0.0','2.0.0'),('Magento_Cookie','2.0.0','2.0.0'),('Magento_Cron','2.0.0','2.0.0'),('Magento_CurrencySymbol','2.0.0','2.0.0'),('Magento_Customer','2.0.6','2.0.6'),('Magento_CustomerImportExport','2.0.0','2.0.0'),('Magento_Deploy','2.0.0','2.0.0'),('Magento_Developer','2.0.0','2.0.0'),('Magento_Dhl','2.0.0','2.0.0'),('Magento_Directory','2.0.0','2.0.0'),('Magento_Downloadable','2.0.0','2.0.0'),('Magento_DownloadableImportExport','2.0.0','2.0.0'),('Magento_Eav','2.0.0','2.0.0'),('Magento_Email','2.0.0','2.0.0'),('Magento_EncryptionKey','2.0.0','2.0.0'),('Magento_Fedex','2.0.0','2.0.0'),('Magento_GiftMessage','2.0.0','2.0.0'),('Magento_GoogleAdwords','2.0.0','2.0.0'),('Magento_GoogleAnalytics','2.0.0','2.0.0'),('Magento_GoogleOptimizer','2.0.0','2.0.0'),('Magento_GroupedImportExport','2.0.0','2.0.0'),('Magento_GroupedProduct','2.0.0','2.0.0'),('Magento_ImportExport','2.0.1','2.0.1'),('Magento_Indexer','2.0.0','2.0.0'),('Magento_Integration','2.0.0','2.0.0'),('Magento_LayeredNavigation','2.0.0','2.0.0'),('Magento_Marketplace','1.0.0','1.0.0'),('Magento_MediaStorage','2.0.0','2.0.0'),('Magento_Msrp','2.0.0','2.0.0'),('Magento_Multishipping','2.0.0','2.0.0'),('Magento_NewRelicReporting','2.0.0','2.0.0'),('Magento_Newsletter','2.0.0','2.0.0'),('Magento_OfflinePayments','2.0.0','2.0.0'),('Magento_OfflineShipping','2.0.0','2.0.0'),('Magento_PageCache','2.0.0','2.0.0'),('Magento_Payment','2.0.0','2.0.0'),('Magento_Paypal','2.0.0','2.0.0'),('Magento_Persistent','2.0.0','2.0.0'),('Magento_ProductAlert','2.0.0','2.0.0'),('Magento_ProductVideo','2.0.0.2','2.0.0.2'),('Magento_Quote','2.0.1','2.0.1'),('Magento_Reports','2.0.0','2.0.0'),('Magento_RequireJs','2.0.0','2.0.0'),('Magento_Review','2.0.0','2.0.0'),('Magento_Rss','2.0.0','2.0.0'),('Magento_Rule','2.0.0','2.0.0'),('Magento_Sales','2.0.1','2.0.1'),('Magento_SalesRule','2.0.0','2.0.0'),('Magento_SalesSequence','2.0.0','2.0.0'),('Magento_SampleData','2.0.0','2.0.0'),('Magento_Search','2.0.1','2.0.1'),('Magento_SendFriend','2.0.0','2.0.0'),('Magento_Shipping','2.0.0','2.0.0'),('Magento_Sitemap','2.0.0','2.0.0'),('Magento_Store','2.0.0','2.0.0'),('Magento_Swagger','2.0.0','2.0.0'),('Magento_Swatches','2.0.0','2.0.0'),('Magento_Tax','2.0.1','2.0.1'),('Magento_TaxImportExport','2.0.0','2.0.0'),('Magento_Theme','2.0.0','2.0.0'),('Magento_Translation','2.0.0','2.0.0'),('Magento_Ui','2.0.0','2.0.0'),('Magento_Ups','2.0.0','2.0.0'),('Magento_UrlRewrite','2.0.0','2.0.0'),('Magento_User','2.0.1','2.0.1'),('Magento_Usps','2.0.0','2.0.0'),('Magento_Variable','2.0.0','2.0.0'),('Magento_Vault','2.0.0','2.0.0'),('Magento_Version','2.0.0','2.0.0'),('Magento_Webapi','2.0.0','2.0.0'),('Magento_Weee','2.0.0','2.0.0'),('Magento_Widget','2.0.0','2.0.0'),('Magento_Wishlist','2.0.0','2.0.0'),('TIG_Buckaroo','0.9.2','0.9.2'); +/*!40000 ALTER TABLE `setup_module` ENABLE KEYS */; +UNLOCK TABLES; -- -- Table structure for table `shipping_tablerate` From 3fb84ec036ca2de657cbee759b1860c2fa526a4d Mon Sep 17 00:00:00 2001 From: Daan van den Bergh Date: Thu, 2 Apr 2020 12:44:59 +0200 Subject: [PATCH 8/8] Added cache_types to env.php, because otherwise Vertex_Tax will fail. --- Test/Fixtures/env.php | 51 +++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/Test/Fixtures/env.php b/Test/Fixtures/env.php index 162200c..55e5d32 100644 --- a/Test/Fixtures/env.php +++ b/Test/Fixtures/env.php @@ -1,34 +1,43 @@ [ - 'frontName' => 'admin', - ], + 'frontName' => 'admin', + ], 'install' => [ - 'date' => 'Mon, 01 Feb 2016 15:21:04 +0000', - ], + 'date' => 'Mon, 01 Feb 2016 15:21:04 +0000', + ], 'crypt' => [ - 'key' => 'ef0e78a6c44764690780138ce89b7791', - ], + 'key' => 'ef0e78a6c44764690780138ce89b7791', + ], 'session' => [ - 'save' => 'db', - ], + 'save' => 'db', + ], 'db' => [ - 'table_prefix' => '', - 'connection' => [ - 'default' => [ - 'host' => 'MAGENTO_DB_HOST', - 'dbname' => 'MAGENTO_DB_NAME', - 'username' => 'MAGENTO_DB_USER', - 'password' => 'MAGENTO_DB_PASS', - 'active' => '1', - ], - ], + 'table_prefix' => '', + 'connection' => [ + 'default' => [ + 'host' => 'MAGENTO_DB_HOST', + 'dbname' => 'MAGENTO_DB_NAME', + 'username' => 'MAGENTO_DB_USER', + 'password' => 'MAGENTO_DB_PASS', + 'active' => '1', + ], ], + ], 'resource' => [ - 'default_setup' => [ - 'connection' => 'default', - ], + 'default_setup' => [ + 'connection' => 'default', ], + ], 'x-frame-options' => 'SAMEORIGIN', 'MAGE_MODE' => 'default', + 'cache_types' => [ + 'config' => 1, + 'layout' => 1, + 'block_html' => 1, + 'collections' => 1, + 'eav' => 1, + 'full_page' => 1, + 'translate' => 1, + ] ];