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

Rename integration API tests to acceptance #137

Merged
merged 1 commit into from
Mar 1, 2018
Merged

Rename integration API tests to acceptance #137

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
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ matrix:
env: DB=mysql;TEST=test-js;CORE_BRANCH=master
- php: 5.6
env: DB=mysql;TEST=test-js
# Integration tests
# Acceptance tests
- php: 7.1
env: DB=mysql;TEST=test-integration;CORE_BRANCH=master
env: DB=mysql;TEST=test-acceptance;CORE_BRANCH=master
- php: 5.6
env: DB=mysql;TEST=test-integration;CORE_BRANCH=stable10
env: DB=mysql;TEST=test-acceptance;CORE_BRANCH=stable10
allow_failures:
- env: DB=mysql;TEST=test-codecheck-deprecations
fast_finish: true
8 changes: 4 additions & 4 deletions rules/tests.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ help-test:
@echo -e "test-syntax\t\tto run syntax checks"
@echo -e "test-codecheck\t\tto run the code checker"
@echo -e "test-php\t\tto run PHP test suites"
@echo -e "test-integration\tto run integration tests"
@echo -e "test-acceptance\tto run acceptance tests"
@echo -e "test-js\t\t\tto run JS test suites (single run)"
@echo -e "test-js-debug\t\tto run JS test and watch for changes"
@echo
Expand Down Expand Up @@ -64,9 +64,9 @@ $(clover_xml): test-php
test-upload-coverage: $(OCULAR) $(clover_xml)
$(OCULAR) code-coverage:upload --format=php-clover $(clover_xml)

.PHONY: test-integration
test-integration: test-syntax-php
cd tests/integration && OCC="$(OCC)" ./run.sh
.PHONY: test-acceptance
test-acceptance: test-syntax-php
cd tests/acceptance && OCC="$(OCC)" ./run.sh

.PHONY: test-js
test-js: $(bower_deps) $(KARMA) js-templates test-syntax-js
Expand Down
0 tests/integration/.gitignore → tests/acceptance/.gitignore
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/integration/composer.json → tests/acceptance/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

"autoload": {
"psr-0": {
"": ["../../../../tests/integration/features/bootstrap/","features/bootstrap"]
"": ["../../../../tests/acceptance/features/bootstrap/","features/bootstrap"]

}
}
Expand Down
0 tests/integration/composer.lock → tests/acceptance/composer.lock
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions tests/integration/config/behat.yml → tests/acceptance/config/behat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
default:
autoload:
#- %paths.base%/../../../../../build/integration/features/bootstrap
#- %paths.base%/../../../../../build/acceptance/features/bootstrap
#- %paths.base%/../features/bootstrap
- %paths.base%/../vendor/autoload.php


suites:
default:
paths:
Expand Down
0 ...stom_groups_features/CustomGroups.feature → ...stom_groups_features/CustomGroups.feature
View file
Open in desktop
File renamed without changes.
0 ...ups_features/Sharing-CustomGroups.feature → ...ups_features/Sharing-CustomGroups.feature
View file
Open in desktop
File renamed without changes.
0 ...eatures/bootstrap/CustomGroupsContext.php → ...eatures/bootstrap/CustomGroupsContext.php
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/integration/run.sh → tests/acceptance/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ mkdir -p output
composer install

OC_PATH=../../../../
CORE_INT_TESTS_PATH=tests/integration/
CORE_INT_TESTS_PATH=tests/acceptance/

OCC=${OC_PATH}occ

Expand Down