From 33f9d6def16da26444f32e9c23ca1f5491b07f0b Mon Sep 17 00:00:00 2001
From: Vasco Guita <vasco@guita.org>
Date: Thu, 26 Jan 2023 15:06:35 +0100
Subject: [PATCH] Use cs3org/behat:latest docker image for tests

---
 .dockerignore                             |  1 -
 .drone.star                               |  8 +-------
 Makefile                                  | 21 ++++-----------------
 changelog/unreleased/enhancement-behat.md |  3 +++
 composer.json                             | 22 ----------------------
 vendor-bin/behat/composer.json            | 22 ----------------------
 6 files changed, 8 insertions(+), 69 deletions(-)
 create mode 100644 changelog/unreleased/enhancement-behat.md
 delete mode 100644 composer.json
 delete mode 100644 vendor-bin/behat/composer.json

diff --git a/.dockerignore b/.dockerignore
index ab22e55d14..08e0ed907f 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,5 +4,4 @@ docs
 grpc-tests
 tests
 tools
-vendor-bin
 *.md
diff --git a/.drone.star b/.drone.star
index 8c94590fcd..080822a577 100644
--- a/.drone.star
+++ b/.drone.star
@@ -1,7 +1,7 @@
 OC_CI_GOLANG = "owncloudci/golang:1.19"
 OC_CI_ALPINE = "owncloudci/alpine:latest"
 OSIXIA_OPEN_LDAP = "osixia/openldap:1.3.0"
-OC_CI_PHP = "owncloudci/php:7.4"
+OC_CI_PHP = "cs3org/behat:latest"
 OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier:latest"
 
 def makeStep():
@@ -109,8 +109,6 @@ def virtualViews():
                 "image": OC_CI_PHP,
                 "commands": [
                     "cd /drone/src",
-                    "composer self-update",
-                    "composer --version",
                     "make test-acceptance-api",
                 ],
                 "environment": {
@@ -176,8 +174,6 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
                         "image": OC_CI_PHP,
                         "commands": [
                             "cd /drone/src/tmp/testrunner",
-                            "composer self-update",
-                            "composer --version",
                             "make test-acceptance-core-api",
                         ],
                         "environment": {
@@ -252,8 +248,6 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []):
                         "image": OC_CI_PHP,
                         "commands": [
                             "cd /drone/src/tmp/testrunner",
-                            "composer self-update",
-                            "composer --version",
                             "make test-acceptance-core-api",
                         ],
                         "environment": {
diff --git a/Makefile b/Makefile
index b5dd750a31..ef39b0fe97 100644
--- a/Makefile
+++ b/Makefile
@@ -141,24 +141,11 @@ clean: toolchain-clean
 dist: gen-doc
 	go run tools/create-artifacts/main.go -version ${VERSION} -commit ${GIT_COMMIT} -goversion ${GO_VERSION}
 
-BEHAT_BIN=vendor-bin/behat/vendor/bin/behat
 # behat config file for core api tests
 CORE_BEHAT_YML=$(PATH_TO_APITESTS)/tests/acceptance/config/behat-core.yml
 
-test-acceptance-api: vendor-bin/behat/vendor
-	BEHAT_BIN=$(BEHAT_BIN) $(PATH_TO_APITESTS)/tests/acceptance/run.sh --type api
+test-acceptance-api:
+	$(PATH_TO_APITESTS)/tests/acceptance/run.sh --type api
 
-test-acceptance-core-api: vendor-bin/behat/vendor
-	BEHAT_BIN=$(BEHAT_BIN) BEHAT_YML=$(CORE_BEHAT_YML) $(PATH_TO_APITESTS)/tests/acceptance/run.sh --type core-api
-
-vendor/bamarni/composer-bin-plugin: composer.lock
-	composer install
-
-vendor-bin/behat/vendor: vendor/bamarni/composer-bin-plugin vendor-bin/behat/composer.lock
-	composer bin behat install --no-progress
-
-vendor-bin/behat/composer.lock: vendor-bin/behat/composer.json
-	@echo behat composer.lock is not up to date.
-
-composer.lock: composer.json
-	@echo composer.lock is not up to date.
\ No newline at end of file
+test-acceptance-core-api:
+	BEHAT_YML=$(CORE_BEHAT_YML) $(PATH_TO_APITESTS)/tests/acceptance/run.sh --type core-api
\ No newline at end of file
diff --git a/changelog/unreleased/enhancement-behat.md b/changelog/unreleased/enhancement-behat.md
new file mode 100644
index 0000000000..011b11c08e
--- /dev/null
+++ b/changelog/unreleased/enhancement-behat.md
@@ -0,0 +1,3 @@
+Enhancement: Use cs3org/behat:latest docker image for tests
+
+https://github.com/cs3org/reva/pull/3629
\ No newline at end of file
diff --git a/composer.json b/composer.json
deleted file mode 100644
index 05a282bed1..0000000000
--- a/composer.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "name": "cs3org/reva",
-  "config" : {
-    "platform": {
-      "php": "7.4"
-    },
-    "vendor-dir": "./vendor-php",
-    "allow-plugins": {
-      "bamarni/composer-bin-plugin": true
-    }
-  },
-  "require": {
-  },
-  "require-dev": {
-    "bamarni/composer-bin-plugin": "^1.4"
-  },
-  "extra": {
-    "bamarni-bin": {
-      "bin-links": false
-    }
-  }
-}
diff --git a/vendor-bin/behat/composer.json b/vendor-bin/behat/composer.json
deleted file mode 100644
index 9406128a3b..0000000000
--- a/vendor-bin/behat/composer.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "config" : {
-        "platform": {
-            "php": "7.4"
-        }
-    },
-    "require": {
-        "behat/behat": "^3.8",
-        "behat/gherkin": "4.7.1",
-        "behat/mink": "1.7.1",
-        "behat/mink-extension": "^2.3",
-        "behat/mink-selenium2-driver": "^1.4",
-        "ciaranmcnulty/behat-stepthroughextension" : "dev-master",
-        "rdx/behat-variables": "^1.2",
-        "sensiolabs/behat-page-object-extension": "^2.3",
-        "symfony/translation": "^4.4",
-        "sabre/xml": "^2.2",
-        "guzzlehttp/guzzle": "^7.2",
-        "phpunit/phpunit": "^9.4",
-        "laminas/laminas-ldap": "^2.10"
-    }
-}