Skip to content

Commit 84b37d1

Browse files
authored
Merge pull request #606 from nextcloud/chore/bump-behat
chore(deps): Bump behat and dependencies in tests/ folder
2 parents 7ab35f0 + 7eeb12c commit 84b37d1

File tree

8 files changed

+651
-553
lines changed

8 files changed

+651
-553
lines changed

.github/dependabot.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,21 @@ updates:
1515
labels:
1616
- "3. to review"
1717
- "dependencies"
18+
19+
# behat
1820
- package-ecosystem: composer
19-
directory: "/tests"
21+
directory: "/vendor-bin/tests"
2022
schedule:
2123
interval: monthly
2224
time: "03:00"
2325
timezone: Europe/Paris
2426
open-pull-requests-limit: 10
27+
reviewers:
28+
- come-nc
29+
- Altahrim
30+
labels:
31+
- "3. to review"
32+
- "dependencies"
2533

2634
# box
2735
- package-ecosystem: composer

Makefile

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,25 @@ index.php: lib/UpdateException.php lib/LogException.php lib/Updater.php index.we
1919
cat lib/UpdateException.php lib/LogException.php lib/Updater.php index.web.php| grep -v "^namespace" | awk '/^<\?php$$/,/\*\//{next} 1' >> index.php
2020

2121
test/vendor:
22-
cd tests && composer install
22+
composer bin tests install
2323

2424
test: updater.phar test/vendor
25-
cd tests && vendor/behat/behat/bin/behat
25+
cd tests && ../vendor/bin/behat
2626

2727
test-cli: updater.phar test/vendor
28-
cd tests && vendor/behat/behat/bin/behat features/cli.feature
28+
cd tests && ../vendor/bin/behat features/cli.feature
2929

3030
test-stable24: updater.phar test/vendor
31-
cd tests && vendor/behat/behat/bin/behat features/stable24.feature
31+
cd tests && ../vendor/bin/behat features/stable24.feature
3232

3333
test-stable25: updater.phar test/vendor
34-
cd tests && vendor/behat/behat/bin/behat features/stable25.feature
34+
cd tests && ../vendor/bin/behat features/stable25.feature
3535

3636
test-stable26: updater.phar test/vendor
37-
cd tests && vendor/behat/behat/bin/behat features/stable26.feature
37+
cd tests && ../vendor/bin/behat features/stable26.feature
3838

3939
test-master: updater.phar test/vendor
40-
cd tests && vendor/behat/behat/bin/behat features/master.feature
40+
cd tests && ../vendor/bin/behat features/master.feature
4141

4242
check-same-code-base:
4343
cd tests && php checkSameCodeBase.php

REUSE.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-FileCopyrightText = "2015 ownCloud, Inc., 2016 Nextcloud GmbH and Nextcloud
1212
SPDX-License-Identifier = "AGPL-3.0-or-later"
1313

1414
[[annotations]]
15-
path = ["updater.phar", "box.json", "tests/composer.json", "tests/composer.lock"]
15+
path = ["updater.phar", "box.json", "vendor-bin/tests/composer.json", "vendor-bin/tests/composer.lock"]
1616
precedence = "aggregate"
1717
SPDX-FileCopyrightText = "2016 Nextcloud GmbH and Nextcloud contributors"
1818
SPDX-License-Identifier = "AGPL-3.0-or-later"

tests/composer.json

-7
This file was deleted.

vendor-bin/tests/composer.json

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"require-dev": {
3+
"behat/behat": "^3.19"
4+
},
5+
"config": {
6+
"platform": {
7+
"php": "8.1"
8+
}
9+
}
10+
}

0 commit comments

Comments
 (0)