Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make targets for acceptance tests #32769

Merged
merged 1 commit into from
Sep 27, 2018
Merged

Make targets for acceptance tests #32769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ pipeline:
commands:
- touch /drone/saved-settings.sh
- . /drone/saved-settings.sh
- ./tests/drone/test-acceptance.sh --remote
- make test-acceptance-api TESTING_REMOTE_SYSTEM=true
when:
matrix:
TEST_SUITE: api
Expand All @@ -363,7 +363,7 @@ pipeline:
commands:
- touch /drone/saved-settings.sh
- . /drone/saved-settings.sh
- ./tests/drone/test-acceptance.sh --remote
- make test-acceptance-webui TESTING_REMOTE_SYSTEM=true
when:
matrix:
TEST_SUITE: selenium
Expand Down
19 changes: 10 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ help:
@echo -e "make test-php-style\t\trun PHP code style checks"
@echo -e "make test-js\t\t\trun Javascript tests"
@echo -e "make test-js-debug\t\trun Javascript tests in debug mode (continuous)"
@echo -e "make test-acceptance\t\trun acceptance tests"
@echo -e "make test-acceptance-api\trun API acceptance tests"
@echo -e "make test-acceptance-webui\trun webUI acceptance tests"
@echo -e "make clean-test\t\t\tclean test results"
@echo
@echo It is also possible to run individual PHP test files with the following command:
Expand Down Expand Up @@ -180,13 +181,13 @@ test-js: $(nodejs_deps)
test-js-debug: $(nodejs_deps)
NODE_PATH='$(NODE_PREFIX)/node_modules' $(KARMA) start tests/karma.config.js

.PHONY: test-acceptance
test-acceptance: $(composer_dev_deps)
$(MAKE) -C tests/acceptance \
BEHAT_SUITE=$(BEHAT_SUITE) \
OC_TEST_ALT_HOME=$(OC_TEST_ALT_HOME) \
OC_TEST_ENCRYPTION_ENABLED=$(OC_TEST_ENCRYPTION_ENABLED) \
OC_TEST_ENCRYPTION_MASTER_KEY_ENABLED=$(OC_TEST_ENCRYPTION_MASTER_KEY_ENABLED)
.PHONY: test-acceptance-api
test-acceptance-api: $(composer_dev_deps)
./tests/acceptance/run.sh --type api

.PHONY: test-acceptance-webui
test-acceptance-webui: $(composer_dev_deps)
./tests/acceptance/run.sh --type webUI

.PHONY: test-php-lint
test-php-lint: $(composer_dev_deps)
Expand All @@ -206,7 +207,7 @@ test-php-phan: $(PHAN_BIN)
php $(PHAN_BIN) --config-file .phan/config.php --require-config-exists -p

.PHONY: test
test: test-php-lint test-php-style test-php test-js test-acceptance
test: test-php-lint test-php-style test-php test-js test-acceptance-api test-acceptance-webui

.PHONY: clean-test-acceptance
clean-test-acceptance:
Expand Down