diff options
-rw-r--r-- | .drone.yml | 79 | ||||
-rw-r--r-- | tests/integration/features/conversation/add-participant.feature (renamed from tests/integration/features/add-participant.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation/delete-room.feature (renamed from tests/integration/features/delete-room.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation/one-to-one.feature (renamed from tests/integration/features/one-to-one.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation/promotion-demotion.feature (renamed from tests/integration/features/promotion-demotion.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation/public-private.feature (renamed from tests/integration/features/public-private.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation/remove-participant.feature (renamed from tests/integration/features/remove-participant.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation/remove-self.feature (renamed from tests/integration/features/remove-self.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation/rename-room.feature (renamed from tests/integration/features/rename-room.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation/set-password.feature (renamed from tests/integration/features/set-password.feature) | 0 |
10 files changed, 54 insertions, 25 deletions
diff --git a/.drone.yml b/.drone.yml index dc564d035..189cffc4b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -146,7 +146,7 @@ pipeline: # Run integration tests - cd tests/integration/ - - bash run.sh + - bash run.sh $TESTS_INTEGRATION when: matrix: TESTS: php7.1-integration @@ -159,7 +159,7 @@ pipeline: when: matrix: TESTS: jsunit - acceptance-chat: + acceptance: image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2 environment: - APP_NAME=spreed @@ -173,53 +173,82 @@ pipeline: - ln --symbolic `pwd` /var/www/html # Run acceptance tests - - tests/acceptance/run-local.sh --acceptance-tests-dir apps/spreed/tests/acceptance --timeout-multiplier 10 --nextcloud-server-domain acceptance-chat --selenium-server selenium:4444 allow-git-repository-modifications features/chat.feature + - tests/acceptance/run-local.sh --acceptance-tests-dir apps/spreed/tests/acceptance --timeout-multiplier 10 --nextcloud-server-domain acceptance --selenium-server selenium:4444 allow-git-repository-modifications features/$TESTS_ACCEPTANCE.feature when: matrix: - TESTS-ACCEPTANCE: chat - acceptance-conversation: - image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2 - environment: - - APP_NAME=spreed - - CORE_BRANCH=stable15 - commands: - # Pre-setup steps - - git clone --depth 1 -b $CORE_BRANCH https://github.com/nextcloud/server ../server - - cp -R . ../server/apps/$APP_NAME - - cd ../server - - git submodule update --init - - ln --symbolic `pwd` /var/www/html - - # Run acceptance tests - - tests/acceptance/run-local.sh --acceptance-tests-dir apps/spreed/tests/acceptance --timeout-multiplier 10 --nextcloud-server-domain acceptance-conversation --selenium-server selenium:4444 allow-git-repository-modifications features/conversation.feature - when: - matrix: - TESTS-ACCEPTANCE: conversation + TESTS: acceptance matrix: include: + # Checks - TESTS: eslint - TESTS: stylelint - TESTS: check-app-compatbility - TESTS: handlebars - TESTS: syntax-php7.0 - TESTS: signed-off-check + + # Unit tests - TESTS: php7.0 - TESTS: php7.1 - TESTS: php7.2 + - TESTS: jsunit + + # Integration tests sqlite + - TESTS: php7.1-integration + TESTS_INTEGRATION: features/callapi + DB: sqlite - TESTS: php7.1-integration + TESTS_INTEGRATION: features/chat DB: sqlite - TESTS: php7.1-integration + TESTS_INTEGRATION: features/conversation + DB: sqlite + - TESTS: php7.1-integration + TESTS_INTEGRATION: features/sharing + DB: sqlite + + # Integration tests MySQL 5.7 + - TESTS: php7.1-integration + TESTS_INTEGRATION: features/callapi + DB: mysql + DATABASEHOST: mysql-5.7 + - TESTS: php7.1-integration + TESTS_INTEGRATION: features/chat + DB: mysql + DATABASEHOST: mysql-5.7 + - TESTS: php7.1-integration + TESTS_INTEGRATION: features/conversation + DB: mysql + DATABASEHOST: mysql-5.7 + - TESTS: php7.1-integration + TESTS_INTEGRATION: features/sharing DB: mysql DATABASEHOST: mysql-5.7 + + # Integration tests Postgres 10 - TESTS: php7.1-integration + TESTS_INTEGRATION: features/callapi DB: pgsql DATABASEHOST: postgres-10 - - TESTS: jsunit + - TESTS: php7.1-integration + TESTS_INTEGRATION: features/chat + DB: pgsql + DATABASEHOST: postgres-10 + - TESTS: php7.1-integration + TESTS_INTEGRATION: features/conversation + DB: pgsql + DATABASEHOST: postgres-10 + - TESTS: php7.1-integration + TESTS_INTEGRATION: features/sharing + DB: pgsql + DATABASEHOST: postgres-10 + + # Acceptance tests - TESTS: acceptance - TESTS-ACCEPTANCE: chat + TESTS_ACCEPTANCE: chat - TESTS: acceptance - TESTS-ACCEPTANCE: conversation + TESTS_ACCEPTANCE: conversation services: mysql-5.7: diff --git a/tests/integration/features/add-participant.feature b/tests/integration/features/conversation/add-participant.feature index 097366956..097366956 100644 --- a/tests/integration/features/add-participant.feature +++ b/tests/integration/features/conversation/add-participant.feature diff --git a/tests/integration/features/delete-room.feature b/tests/integration/features/conversation/delete-room.feature index 89069d41e..89069d41e 100644 --- a/tests/integration/features/delete-room.feature +++ b/tests/integration/features/conversation/delete-room.feature diff --git a/tests/integration/features/one-to-one.feature b/tests/integration/features/conversation/one-to-one.feature index 8d100d575..8d100d575 100644 --- a/tests/integration/features/one-to-one.feature +++ b/tests/integration/features/conversation/one-to-one.feature diff --git a/tests/integration/features/promotion-demotion.feature b/tests/integration/features/conversation/promotion-demotion.feature index 5610b7639..5610b7639 100644 --- a/tests/integration/features/promotion-demotion.feature +++ b/tests/integration/features/conversation/promotion-demotion.feature diff --git a/tests/integration/features/public-private.feature b/tests/integration/features/conversation/public-private.feature index b0afe04a0..b0afe04a0 100644 --- a/tests/integration/features/public-private.feature +++ b/tests/integration/features/conversation/public-private.feature diff --git a/tests/integration/features/remove-participant.feature b/tests/integration/features/conversation/remove-participant.feature index d84bc8b61..d84bc8b61 100644 --- a/tests/integration/features/remove-participant.feature +++ b/tests/integration/features/conversation/remove-participant.feature diff --git a/tests/integration/features/remove-self.feature b/tests/integration/features/conversation/remove-self.feature index 8900fb8ad..8900fb8ad 100644 --- a/tests/integration/features/remove-self.feature +++ b/tests/integration/features/conversation/remove-self.feature diff --git a/tests/integration/features/rename-room.feature b/tests/integration/features/conversation/rename-room.feature index 1c686f2ce..1c686f2ce 100644 --- a/tests/integration/features/rename-room.feature +++ b/tests/integration/features/conversation/rename-room.feature diff --git a/tests/integration/features/set-password.feature b/tests/integration/features/conversation/set-password.feature index 657f6413b..657f6413b 100644 --- a/tests/integration/features/set-password.feature +++ b/tests/integration/features/conversation/set-password.feature |