From af3c8195afcb386e85cac828a637208d80ae2236 Mon Sep 17 00:00:00 2001 From: Daniel Ruf Date: Wed, 30 Jan 2019 23:12:20 +0100 Subject: [PATCH 1/3] tests: fix expected string (#6665) --- tests/functional/ConsumablesCest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional/ConsumablesCest.php b/tests/functional/ConsumablesCest.php index 7fc9a6e7f6..c6f8285ec2 100644 --- a/tests/functional/ConsumablesCest.php +++ b/tests/functional/ConsumablesCest.php @@ -43,7 +43,7 @@ class ConsumablesCest $I->seeElement('.alert-danger'); $I->see('The name must be at least 3 characters', '.alert-msg'); $I->see('The qty must be at least 0', '.alert-msg'); - $I->see('The min amt must be at least 1', '.alert-msg'); + $I->see('The min amt must be at least 0', '.alert-msg'); } public function passesCorrectValidation(FunctionalTester $I) From 8ce78c6b3169221712870c9bb627b4995cd6de7c Mon Sep 17 00:00:00 2001 From: Daniel Ruf Date: Wed, 30 Jan 2019 23:32:33 +0100 Subject: [PATCH 2/3] tests: allow to fail on PHP 7.3 and use the latest PHP 7.1 release (#6666) --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 35c5cdf973..57e7eb3c6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,14 @@ services: php: - 5.6 - 7.0 - - 7.2 - - 7.1.4 + - 7.1 + - 7.2 - 7.3 + matrix: + allow_failures: + - php: 7.3 + # execute any number of scripts before the test run, custom env's are available as variables before_script: - phpenv config-add .github/travis-memory.ini From 2ad270cf33585fa511d3bc40778cadfa44ba7a81 Mon Sep 17 00:00:00 2001 From: Daniel Ruf Date: Thu, 31 Jan 2019 00:14:17 +0100 Subject: [PATCH 3/3] ci: fix indentation (#6669) --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 57e7eb3c6c..4012e16e4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,9 @@ php: - 7.2 - 7.3 - matrix: +matrix: allow_failures: - - php: 7.3 + - php: 7.3 # execute any number of scripts before the test run, custom env's are available as variables before_script: