Skip to content

Commit

Permalink
Merge pull request #25176 from nextcloud/add-composer-lock-for-accept…
Browse files Browse the repository at this point in the history
…ance-tests-to-git

Add "composer.lock" for acceptance tests to git
  • Loading branch information
MorrisJobke committed Jan 18, 2021
2 parents 6d291c3 + d6a1d8d commit cfe098e
Show file tree
Hide file tree
Showing 3 changed files with 2,774 additions and 4 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ Vagrantfile
clover.xml

# Tests - dependencies
tests/acceptance/composer.lock
tests/acceptance/vendor/

composer.phar
6 changes: 3 additions & 3 deletions tests/acceptance/composer.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"require-dev": {
"behat/behat": "^3.0",
"behat/behat": "3.7.0",
"behat/mink": "1.7.1",
"behat/mink-extension": "*",
"behat/mink-extension": "2.3.1",
"behat/mink-selenium2-driver": "1.3.1",
"phpunit/phpunit": "~4.6"
"phpunit/phpunit": "4.8.36"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit cfe098e

Please sign in to comment.