diff options
| -rw-r--r-- | .drone.yml | 120 | ||||
| -rw-r--r-- | build/integration/config/behat.yml | 10 | ||||
| -rw-r--r-- | build/integration/features/bootstrap/SharingContext.php | 40 | ||||
| -rw-r--r-- | build/integration/sharing_features/sharing-v1-part2.feature (renamed from build/integration/features/sharing-v1-part2.feature) | 0 | ||||
| -rw-r--r-- | build/integration/sharing_features/sharing-v1-part3.feature (renamed from build/integration/features/sharing-v1-part3.feature) | 0 | ||||
| -rw-r--r-- | build/integration/sharing_features/sharing-v1.feature (renamed from build/integration/features/sharing-v1.feature) | 0 |
6 files changed, 110 insertions, 60 deletions
diff --git a/.drone.yml b/.drone.yml index 4b60cb32986..4f758c654d0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1123,20 +1123,20 @@ trigger: --- kind: pipeline -name: integration-sharing-v1 +name: integration-checksums-v1 steps: - name: submodules image: docker:git commands: - git submodule update --init -- name: integration-sharing-v1 - image: nextcloudci/integration-php7.1:2 +- name: integration-checksums-v1 + image: nextcloudci/integration-php7.1:1 commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - cd build/integration - - ./run.sh features/sharing-v1.feature + - ./run.sh features/checksums.feature trigger: branch: @@ -1148,20 +1148,20 @@ trigger: --- kind: pipeline -name: integration-sharing-v1-part2 +name: integration-external-storage steps: - name: submodules image: docker:git commands: - git submodule update --init -- name: integration-sharing-v1-part2 - image: nextcloudci/integration-php7.1:2 +- name: integration-external-storage + image: nextcloudci/integration-php7.1:1 commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - cd build/integration - - ./run.sh features/sharing-v1-part2.feature + - ./run.sh features/external-storage.feature trigger: branch: @@ -1173,20 +1173,20 @@ trigger: --- kind: pipeline -name: integration-sharing-v1-part3 +name: integration-provisioning-v1 steps: - name: submodules image: docker:git commands: - git submodule update --init -- name: integration-sharing-v1-part3 - image: nextcloudci/integration-php7.1:2 +- name: integration-provisioning-v1 + image: nextcloudci/integration-php7.1:1 commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - cd build/integration - - ./run.sh features/sharing-v1-part3.feature + - ./run.sh features/provisioning-v1.feature trigger: branch: @@ -1198,20 +1198,20 @@ trigger: --- kind: pipeline -name: integration-checksums-v1 +name: integration-tags steps: - name: submodules image: docker:git commands: - git submodule update --init -- name: integration-checksums-v1 - image: nextcloudci/integration-php7.1:2 +- name: integration-tags + image: nextcloudci/integration-php7.1:1 commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - cd build/integration - - ./run.sh features/checksums.feature + - ./run.sh features/tags.feature trigger: branch: @@ -1223,20 +1223,20 @@ trigger: --- kind: pipeline -name: integration-external-storage +name: integration-caldav steps: - name: submodules image: docker:git commands: - git submodule update --init -- name: integration-external-storage - image: nextcloudci/integration-php7.1:2 +- name: integration-caldav + image: nextcloudci/integration-php7.1:1 commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - cd build/integration - - ./run.sh features/external-storage.feature + - ./run.sh features/caldav.feature trigger: branch: @@ -1248,20 +1248,20 @@ trigger: --- kind: pipeline -name: integration-provisioning-v1 +name: integration-comments steps: - name: submodules image: docker:git commands: - git submodule update --init -- name: integration-provisioning-v1 - image: nextcloudci/integration-php7.1:2 +- name: integration-comments + image: nextcloudci/integration-php7.1:1 commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - cd build/integration - - ./run.sh features/provisioning-v1.feature + - ./run.sh features/comments.feature trigger: branch: @@ -1273,20 +1273,20 @@ trigger: --- kind: pipeline -name: integration-tags +name: integration-comments-search steps: - name: submodules image: docker:git commands: - git submodule update --init -- name: integration-tags - image: nextcloudci/integration-php7.1:2 +- name: integration-comments-search + image: nextcloudci/integration-php7.1:1 commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - cd build/integration - - ./run.sh features/tags.feature + - ./run.sh features/comments-search.feature trigger: branch: @@ -1298,20 +1298,20 @@ trigger: --- kind: pipeline -name: integration-caldav +name: integration-favorites steps: - name: submodules image: docker:git commands: - git submodule update --init -- name: integration-caldav - image: nextcloudci/integration-php7.1:2 +- name: integration-favorites + image: nextcloudci/integration-php7.1:1 commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - cd build/integration - - ./run.sh features/caldav.feature + - ./run.sh features/favorites.feature trigger: branch: @@ -1323,20 +1323,20 @@ trigger: --- kind: pipeline -name: integration-comments +name: integration-provisioning-v2 steps: - name: submodules image: docker:git commands: - git submodule update --init -- name: integration-comments - image: nextcloudci/integration-php7.1:2 +- name: integration-provisioning-v2 + image: nextcloudci/integration-php7.1:1 commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - cd build/integration - - ./run.sh features/comments.feature + - ./run.sh features/provisioning-v2.feature trigger: branch: @@ -1348,20 +1348,20 @@ trigger: --- kind: pipeline -name: integration-comments-search +name: integration-webdav-related steps: - name: submodules image: docker:git commands: - git submodule update --init -- name: integration-comments-search - image: nextcloudci/integration-php7.1:2 +- name: integration-webdav-related + image: nextcloudci/integration-php7.1:1 commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - cd build/integration - - ./run.sh features/comments-search.feature + - ./run.sh features/webdav-related.feature trigger: branch: @@ -1373,20 +1373,20 @@ trigger: --- kind: pipeline -name: integration-favorites +name: integration-sharees-features steps: - name: submodules image: docker:git commands: - git submodule update --init -- name: integration-favorites - image: nextcloudci/integration-php7.1:2 +- name: integration-sharees-features + image: nextcloudci/integration-php7.1:1 commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - cd build/integration - - ./run.sh features/favorites.feature + - ./run.sh sharees_features/sharees.feature trigger: branch: @@ -1398,20 +1398,20 @@ trigger: --- kind: pipeline -name: integration-provisioning-v2 +name: integration-sharees-v2-features steps: - name: submodules image: docker:git commands: - git submodule update --init -- name: integration-provisioning-v2 - image: nextcloudci/integration-php7.1:2 +- name: integration-sharees-v2-features + image: nextcloudci/integration-php7.1:1 commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - cd build/integration - - ./run.sh features/provisioning-v2.feature + - ./run.sh sharees_features/sharees_provisioningapiv2.feature trigger: branch: @@ -1423,20 +1423,20 @@ trigger: --- kind: pipeline -name: integration-webdav-related +name: integration-sharing-v1 steps: - name: submodules image: docker:git commands: - git submodule update --init -- name: integration-webdav-related - image: nextcloudci/integration-php7.1:2 +- name: integration-sharing-v1 + image: nextcloudci/integration-php7.1:1 commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - cd build/integration - - ./run.sh features/webdav-related.feature + - ./run.sh sharing_features/sharing-v1.feature trigger: branch: @@ -1448,20 +1448,20 @@ trigger: --- kind: pipeline -name: integration-sharees-features +name: integration-sharing-v1-part2 steps: - name: submodules image: docker:git commands: - git submodule update --init -- name: integration-sharees-features - image: nextcloudci/integration-php7.1:2 +- name: integration-sharing-v1-part2 + image: nextcloudci/integration-php7.1:1 commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - cd build/integration - - ./run.sh sharees_features/sharees.feature + - ./run.sh sharing_features/sharing-v1-part2.feature trigger: branch: @@ -1473,20 +1473,20 @@ trigger: --- kind: pipeline -name: integration-sharees-v2-features +name: integration-sharing-v1-part3 steps: - name: submodules image: docker:git commands: - git submodule update --init -- name: integration-sharees-v2-features - image: nextcloudci/integration-php7.1:2 +- name: integration-sharing-v1-part3 + image: nextcloudci/integration-php7.1:1 commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - cd build/integration - - ./run.sh sharees_features/sharees_provisioningapiv2.feature + - ./run.sh sharing_features/sharing-v1-part3.feature trigger: branch: diff --git a/build/integration/config/behat.yml b/build/integration/config/behat.yml index 51b749360e3..27d7daa4818 100644 --- a/build/integration/config/behat.yml +++ b/build/integration/config/behat.yml @@ -55,6 +55,16 @@ default: - admin - admin regular_user_password: 123456 + sharing: + paths: + - "%paths.base%/../sharing_features" + contexts: + - SharingContext: + baseUrl: http://localhost:8080/ocs/ + admin: + - admin + - admin + regular_user_password: 123456 setup: paths: - "%paths.base%/../setup_features" diff --git a/build/integration/features/bootstrap/SharingContext.php b/build/integration/features/bootstrap/SharingContext.php new file mode 100644 index 00000000000..f208565740b --- /dev/null +++ b/build/integration/features/bootstrap/SharingContext.php @@ -0,0 +1,40 @@ +<?php +/** + * + * + * @author Joas Schilling <coding@schilljs.com> + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +use Behat\Behat\Context\Context; +use Behat\Behat\Context\SnippetAcceptingContext; +use PHPUnit\Framework\Assert; +use Psr\Http\Message\ResponseInterface; + +require __DIR__ . '/../../vendor/autoload.php'; + + +/** + * Features context. + */ +class SharingContext implements Context, SnippetAcceptingContext { + use Sharing; + use AppConfiguration; + + protected function resetAppConfigs() {} +} diff --git a/build/integration/features/sharing-v1-part2.feature b/build/integration/sharing_features/sharing-v1-part2.feature index 9fbb4cda947..9fbb4cda947 100644 --- a/build/integration/features/sharing-v1-part2.feature +++ b/build/integration/sharing_features/sharing-v1-part2.feature diff --git a/build/integration/features/sharing-v1-part3.feature b/build/integration/sharing_features/sharing-v1-part3.feature index 7c2e66f281b..7c2e66f281b 100644 --- a/build/integration/features/sharing-v1-part3.feature +++ b/build/integration/sharing_features/sharing-v1-part3.feature diff --git a/build/integration/features/sharing-v1.feature b/build/integration/sharing_features/sharing-v1.feature index dd5cc9fff4f..dd5cc9fff4f 100644 --- a/build/integration/features/sharing-v1.feature +++ b/build/integration/sharing_features/sharing-v1.feature |