Skip to content

Commit 5970eda

Browse files
JanTvrdikJanTvrdik
committed
tests: run all integration tests also with --prefer-lowest
1 parent 75286b4 commit 5970eda

15 files changed

+64
-26
lines changed

‎composer.bridgeless.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require-dev": {
3-
"nette/tester": "~1.4",
3+
"nette/tester": "~1.7",
44
"mockery/mockery": "~0.9"
55
},
66
"autoload": {

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"doctrine/cache": "~1.5",
1414
"nette/database": "~2.2",
1515
"nette/di": "~2.3.12 | ~2.4",
16-
"nette/tester": "~1.4",
16+
"nette/tester": "~1.7",
1717
"nette/utils": "~2.3",
1818
"nextras/dbal": "~1.0 | ~2.0",
1919
"mockery/mockery": "~0.9",

‎tests/cases/integration/symfony-bundle/SymfonyBundleTest.phpt

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ class SymfonyBundleTest extends TestCase
2828
{
2929
parent::setUp();
3030

31+
Environment::lock(__CLASS__, __DIR__ . '/../../../temp');
32+
3133
$options = Environment::loadData();
3234
$driversConfig = parse_ini_file(__DIR__ . '/../../../drivers.ini', TRUE);
3335
$dbalOptions = $driversConfig[$options['driver']];

‎tests/matrix/dbal/doctrine-2.0.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
22
PHP_VERSION_MIN="50400"
33
PHP_VERSION_MAX="70299"
4-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.0"
4+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
55
DBAL="doctrine"

‎tests/matrix/dbal/nette-2.0.sh renamed to ‎tests/matrix/dbal/nette-2.0-php-5.4-to-7.1.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
PHP_VERSION_MIN="50400"
3-
PHP_VERSION_MAX="70299"
3+
PHP_VERSION_MAX="70199"
44
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/database:~2.2"
55
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/caching:~2.2"
66
DBAL="nette"

‎tests/matrix/dbal/nette-2.0-php-7.2.sh

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env bash
2+
PHP_VERSION_MIN="70200"
3+
PHP_VERSION_MAX="70299"
4+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/database:~2.4"
5+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/caching:~2.4"
6+
DBAL="nette"

‎tests/matrix/nette-di/nette-2.3-php-5.4.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/usr/bin/env bash
22
PHP_VERSION_MIN="50400"
33
PHP_VERSION_MAX="50499"
4-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/di:~2.3.0"
4+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/di:~2.3.12"
55
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/utils:~2.3.0"
66
COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:~3.0"
7-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.0"
7+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
88
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.0"
99
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nextras/dbal:~1.0"
10+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~2.8"

‎tests/matrix/nette-di/nette-2.3-php-5.5-to-7.1.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/usr/bin/env bash
22
PHP_VERSION_MIN="50500"
33
PHP_VERSION_MAX="70199"
4-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/di:~2.3.0"
4+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/di:~2.3.12"
55
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/utils:~2.3.0"
66
COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:~3.0"
7-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.0"
7+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
88
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.0"
99
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nextras/dbal:~2.0"
10+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~3.0"

‎tests/matrix/nette-di/nette-2.4-php-5.6-to-7.0.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/usr/bin/env bash
22
PHP_VERSION_MIN="50600"
33
PHP_VERSION_MAX="70099"
4-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/di:~2.4.0"
4+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/di:~2.4.1"
55
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/utils:~2.4.0"
66
COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:~3.0"
7-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.0"
7+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
88
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.0"
99
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nextras/dbal:~2.0"
10+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~3.0"

‎tests/matrix/nette-di/nette-2.4-php-7.1-to-7.2.sh renamed to ‎tests/matrix/nette-di/nette-2.4-php-7.1.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/usr/bin/env bash
22
PHP_VERSION_MIN="70100"
3-
PHP_VERSION_MAX="70299"
4-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/di:~2.4.0"
3+
PHP_VERSION_MAX="70199"
4+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/di:~2.4.1"
55
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/utils:~2.4.0"
66
COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:~4.0"
7-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.0"
7+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
88
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.0"
99
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nextras/dbal:~3.0"
10+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~4.0"

‎tests/matrix/nette-di/nette-2.4-php-7.2.sh

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
PHP_VERSION_MIN="70200"
3+
PHP_VERSION_MAX="70299"
4+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/di:~2.4.7"
5+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/utils:~2.4.5"
6+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:~4.0"
7+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
8+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.0"
9+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nextras/dbal:~3.0"
10+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~4.0"

‎tests/matrix/nette-di/nette-3.0-php-7.1-to-7.2.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
PHP_VERSION_MIN="70100"
33
PHP_VERSION_MAX="70299"
44
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/di:~3.0.0@alpha"
5-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/utils:~3.0.0@alpha"
5+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/utils:~3.0.0-beta2@beta"
66
COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:~4.0"
7-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.0"
7+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
88
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.0"
99
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nextras/dbal:~3.0"
10+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~4.0"

‎tests/matrix/symfony-bundle/symfony-3.0.sh

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
#!/usr/bin/env bash
22
PHP_VERSION_MIN="50500"
33
PHP_VERSION_MAX="70299"
4-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.0"
5-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.0"
4+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
5+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.5"
66
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/doctrine-bundle"
7-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/config:~3.0"
8-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~3.0"
9-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/dependency-injection:~3.0"
10-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/http-kernel:~3.0"
11-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/yaml:~3.0"
7+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/config:~3.3"
8+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~3.3"
9+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/dependency-injection:~3.3"
10+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/doctrine-bridge:~3.3"
11+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/framework-bundle:~3.3"
12+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/http-kernel:~3.3"
13+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/yaml:~3.3"
1214
DBAL='doctrine'

‎tests/matrix/symfony-bundle/symfony-4.0.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
#!/usr/bin/env bash
22
PHP_VERSION_MIN="70100"
33
PHP_VERSION_MAX="70299"
4-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.0"
5-
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.0"
4+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
5+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.5"
66
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/doctrine-bundle"
77
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/config:~4.0"
88
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~4.0"
99
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/dependency-injection:~4.0"
10+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/doctrine-bridge:~4.0"
11+
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/framework-bundle:~4.0"
1012
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/http-kernel:~4.0"
1113
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/yaml:~4.0"
1214
DBAL='doctrine'

‎tests/run-integration.sh

+13-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,16 @@ run()
3434
fi
3535

3636
create_dbals_ini "$DBAL"
37-
composer_prepare_dependencies "$COMPOSER_REQUIRE"
37+
38+
composer_prepare_dependencies "$COMPOSER_REQUIRE" ""
39+
tester_run_integration_group "$INTEGRATION_GROUP"
40+
41+
echo
42+
echo
43+
echo "# $FILENAME with --prefer-lowest"
44+
echo
45+
46+
composer_prepare_dependencies "$COMPOSER_REQUIRE" "--prefer-lowest"
3847
tester_run_integration_group "$INTEGRATION_GROUP"
3948
}
4049

@@ -60,6 +69,7 @@ create_dbals_ini()
6069
composer_prepare_dependencies()
6170
{
6271
COMPOSER_REQUIRE="$1"
72+
COMPOSER_PREFER_LOWEST="$2"
6373

6474
cp "$PROJECT_DIR/composer.bridgeless.json" "$PROJECT_DIR/composer.json"
6575

@@ -75,7 +85,8 @@ composer_prepare_dependencies()
7585
composer update \
7686
--no-interaction \
7787
--no-progress \
78-
--quiet
88+
--quiet \
89+
$COMPOSER_PREFER_LOWEST
7990
}
8091

8192

0 commit comments

Comments
 (0)