removing test-acceptance-from-core-api and merging core and api beh…

…at config files to use single command to run api tests

.drone.star

@@ -1129,12 +1129,13 @@ def coreApiTests(ctx, part_number = 1, number_of_parts = 1, storage = "ocis", ac
                              "BEHAT_FILTER_TAGS": filterTags,
                              "DIVIDE_INTO_NUM_PARTS": number_of_parts,
                              "RUN_PART": part_number,
+                             "ACCEPTANCE_TEST_TYPE": "core-api",
                              "EXPECTED_FAILURES_FILE": expectedFailuresFile,
                              "UPLOAD_DELETE_WAIT_TIME": "1" if storage == "owncloud" else 0,
                              "OCIS_WRAPPER_URL": "http://ocis-server:5200",
                          },
                          "commands": [
-                             "make -C %s test-acceptance-from-core-api" % (dirs["base"]),
+                             "make -C %s test-acceptance-api" % (dirs["base"]),
                          ],
                      },
                  ] +

Makefile

@@ -86,7 +86,6 @@ help:
 	@echo -e "${GREEN}Testing with test suite natively installed:${RESET}\n"
 	@echo -e "${PURPLE}\tdocs: https://owncloud.dev/ocis/development/testing/#testing-with-test-suite-natively-installed${RESET}\n"
 	@echo -e "\tmake test-acceptance-api\t\t${BLUE}run API acceptance tests${RESET}"
-	@echo -e "\tmake test-acceptance-from-core-api\t\t${BLUE}run core API acceptance tests${RESET}"
 	@echo -e "\tmake test-paralleldeployment-api\t${BLUE}run API acceptance tests for parallel deployment${RESET}"
 	@echo -e "\tmake clean-tests\t\t\t${BLUE}delete API tests framework dependencies${RESET}"
 	@echo
@@ -125,17 +124,11 @@ clean-tests:
 BEHAT_BIN=vendor-bin/behat/vendor/bin/behat
 # behat config file for parallel deployment tests
 PARALLEL_BEHAT_YML=tests/parallelDeployAcceptance/config/behat.yml
-# behat config file for core api tests
-CORE_BEHAT_YML=tests/acceptance/config/behat-core.yml
 
 .PHONY: test-acceptance-api
 test-acceptance-api: vendor-bin/behat/vendor
 	BEHAT_BIN=$(BEHAT_BIN) $(PWD)/tests/acceptance/run.sh
 
-.PHONY: test-acceptance-from-core-api
-test-acceptance-from-core-api: vendor-bin/behat/vendor
-	BEHAT_BIN=$(BEHAT_BIN) BEHAT_YML=$(CORE_BEHAT_YML) $(PWD)/tests/acceptance/run.sh --type core-api
-
 .PHONY: test-paralleldeployment-api
 test-paralleldeployment-api: vendor-bin/behat/vendor
 	BEHAT_BIN=$(BEHAT_BIN) BEHAT_YML=$(PARALLEL_BEHAT_YML) $(PWD)/tests/acceptance/run.sh