diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-06-15 00:42:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-15 00:42:55 +0200 |
| commit | 1604066184f053f664c47063cb021b56a1741038 (patch) | |
| tree | ad8ee3d3c3e5c00005acd34bb0ea63d3a7b1e141 | |
| parent | 9c6be6872c7009cef465bb22be071108753aa95a (diff) | |
| parent | 189b131e33a8bff0d26fd1b7f8f37269a0dd474b (diff) | |
| download | nextcloud-server-1604066184f053f664c47063cb021b56a1741038.tar.gz nextcloud-server-1604066184f053f664c47063cb021b56a1741038.zip | |
Merge pull request #94 from nextcloud/ci-integration-tests
Add integration tests
| -rw-r--r-- | .drone.yml | 8 | ||||
| -rw-r--r-- | build/integration/features/provisioning-v1.feature | 1 | ||||
| -rwxr-xr-x | build/integration/run.sh | 9 |
3 files changed, 18 insertions, 0 deletions
diff --git a/.drone.yml b/.drone.yml index bfd173c1347..9fde7b6ce5b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,4 +1,11 @@ build: + integration: + image: morrisjobke/nextcloud-ci-php7:1.0.3 + commands: + - git submodule update --init + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh jsunit: image: morrisjobke/nextcloud-ci-jsunit:1.0.2 commands: @@ -6,6 +13,7 @@ build: sqlite: image: morrisjobke/nextcloud-ci-php7:1.0 commands: + - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass='' - ./autotest.sh sqlite diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature index d44903c2743..1e0df08a631 100644 --- a/build/integration/features/provisioning-v1.feature +++ b/build/integration/features/provisioning-v1.feature @@ -282,6 +282,7 @@ Feature: provisioning Then the OCS status code should be "100" And the HTTP status code should be "200" And apps returned are + | admin_audit | | comments | | dav | | federatedfilesharing | diff --git a/build/integration/run.sh b/build/integration/run.sh index 5a222bda3e3..3725ba1af6f 100755 --- a/build/integration/run.sh +++ b/build/integration/run.sh @@ -1,5 +1,14 @@ #!/usr/bin/env bash +COMPOSER=$(which composer) + +if [ -x "$COMPOSER" ]; then + echo "Using composer executable $COMPOSER" +else + echo "Could not find composer executable" >&2 + exit 1 +fi + composer install SCENARIO_TO_RUN=$1 |