From dbf7b68bed9efa76840d65b6c7be0d02228d01e3 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Fri, 27 Jan 2023 08:36:06 +0545
Subject: [PATCH] Use cs3org/behat:latest docker image for tests

---
 .dockerignore                  |  1 -
 .drone.star                    |  8 +-------
 Makefile                       | 12 ------------
 composer.json                  | 22 ----------------------
 vendor-bin/behat/composer.json | 22 ----------------------
 5 files changed, 1 insertion(+), 64 deletions(-)
 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 1a5fc2970d..506b3a8d3e 100644
--- a/.drone.star
+++ b/.drone.star
@@ -3,7 +3,7 @@ OC_CI_GOLANG = "owncloudci/golang:1.18"
 OC_CI_ALPINE = "owncloudci/alpine:latest"
 OSIXIA_OPEN_LDAP = "osixia/openldap:1.3.0"
 REDIS = "redis:6-alpine"
-OC_CI_PHP = "owncloudci/php:7.4"
+OC_CI_PHP = "cs3org/behat:latest"
 OC_LITMUS = "owncloud/litmus:latest"
 OC_CS3_API_VALIDATOR = "owncloud/cs3api-validator:0.2.0"
 OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier:latest"
@@ -233,8 +233,6 @@ def virtualViews():
                 "image": OC_CI_PHP,
                 "commands": [
                     "cd /drone/src/tmp/testrunner",
-                    "composer self-update",
-                    "composer --version",
                     "make test-acceptance-from-core-api",
                 ],
                 "environment": {
@@ -579,8 +577,6 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
                         "image": OC_CI_PHP,
                         "commands": [
                             "cd /drone/src/tmp/testrunner",
-                            "composer self-update",
-                            "composer --version",
                             "make test-acceptance-from-core-api",
                         ],
                         "environment": {
@@ -657,8 +653,6 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []):
                         "image": OC_CI_PHP,
                         "commands": [
                             "cd /drone/src/tmp/testrunner",
-                            "composer self-update",
-                            "composer --version",
                             "make test-acceptance-from-core-api",
                         ],
                         "environment": {
diff --git a/Makefile b/Makefile
index c7075ed568..591e507544 100644
--- a/Makefile
+++ b/Makefile
@@ -172,15 +172,3 @@ mockery: $(MOCKERY)
 .PHONY: go-generate
 go-generate:
 	go generate ./...
-
-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
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"
-    }
-}