Skip to content

Commit 2c643d7

Browse files
authored
Merge pull request #25178 from nextcloud/backport/25176/stable20
[stable20] Add "composer.lock" for acceptance tests to git
2 parents 63a8349 + 26a6e46 commit 2c643d7

File tree

3 files changed

+2774
-4
lines changed

3 files changed

+2774
-4
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ Vagrantfile
156156
clover.xml
157157

158158
# Tests - dependencies
159-
tests/acceptance/composer.lock
160159
tests/acceptance/vendor/
161160

162161
composer.phar

tests/acceptance/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"require-dev": {
3-
"behat/behat": "^3.0",
3+
"behat/behat": "3.7.0",
44
"behat/mink": "1.7.1",
5-
"behat/mink-extension": "*",
5+
"behat/mink-extension": "2.3.1",
66
"behat/mink-selenium2-driver": "1.3.1",
7-
"phpunit/phpunit": "~4.6"
7+
"phpunit/phpunit": "4.8.36"
88
},
99
"autoload": {
1010
"psr-4": {

0 commit comments

Comments
 (0)