Skip to content
This repository has been archived by the owner on Apr 13, 2023. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@tig-robertgrundeken
tig-robertgrundeken committed Apr 3, 2020
2 parents fd53256 + 3fb84ec commit f8653c9
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 29 deletions.
14 changes: 9 additions & 5 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,17 @@ matrix:
# PHP 7.2 is only supported in Magento 2.3.x
include:
- php: 7.1
env: MAGENTO_VERSION=2.2.10
env: MAGENTO_VERSION=2.2.11
- 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 CODE_COVERAGE=true
env: MAGENTO_VERSION=2.3.3 # DI_COMPILE=true
- php: 7.3
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
Expand Down
51 changes: 30 additions & 21 deletions Test/Fixtures/env.php
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,43 @@
<?php
return [
'backend' => [
'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,
]
];
3 changes: 1 addition & 2 deletions Test/Fixtures/tig-gls-fixture.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9418,7 +9418,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');
Expand Down Expand Up @@ -10371,4 +10370,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
-- Dump completed on 2016-02-02 9:05:12
3 changes: 2 additions & 1 deletion view/frontend/web/js/view/delivery-options.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -253,4 +254,4 @@ define([

});

});
});

0 comments on commit f8653c9

Please sign in to comment.