Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
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
20 changes: 14 additions & 6 deletions .github/workflows/integration-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,12 @@ jobs:
- 'collaboration_features'
- 'comments_features'
- 'dav_features'
- 'features'
- 'features/provisioning-v1.feature'
- 'features/contacts-menu.feature features/auth.feature features/avatar.feature features/maintenance-mode.feature features/provisioning-v2.feature features/log-condition.feature features/ocs-v1.feature'
- 'federation_features'
- '--tags ~@large files_features'
- '--tags ~@large&&~@tags&&~@transfer-ownership files_features'
- '--tags @tags files_features'
- '--tags @transfer-ownership files_features'
- 'filesdrop_features'
- 'file_conversions'
- 'files_reminders'
Expand All @@ -69,8 +72,12 @@ jobs:
- 'remoteapi_features'
- 'routing_features'
- 'setup_features'
- 'sharees_features'
- 'sharing_features'
- 'sharees_features/sharees.feature sharees_features/sharees_provisioningapiv2.feature'
- 'sharees_features/sharees_user.feature'
- 'sharing_features/sharing-v1.feature sharing_features/sharing-activity.feature'
- 'sharing_features/sharing-v1-part2a.feature'
- 'sharing_features/sharing-v1-part2b.feature'
- 'sharing_features/sharing-v1-part3.feature sharing_features/sharing-v1-part4.feature'
- 'theming_features'
- 'videoverification_features'

Expand Down Expand Up @@ -112,7 +119,7 @@ jobs:
ref: ${{ matrix.spreed-versions }}

- name: Checkout Activity app
if: ${{ matrix.test-suite == 'sharing_features' }}
if: ${{ contains(matrix.test-suite, 'sharing_features') }}
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
persist-credentials: false
Expand Down Expand Up @@ -160,7 +167,8 @@ jobs:
working-directory: build/integration
env:
LDAP_HOST: localhost
run: bash run.sh ${{ matrix.test-suite }} no-tail-log
BEHAT_SUITE: ${{ matrix.test-suite }}
run: bash run.sh $BEHAT_SUITE no-tail-log

- name: Print logs
if: always()
Expand Down
3 changes: 2 additions & 1 deletion build/integration/features/bootstrap/BasicStructure.php
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,9 @@ private function getDataDirectory() {
* @param string $user
*/
public function fileIsCreatedTimesInUserData($filename, $times, $user) {
$dataDirectory = $this->getDataDirectory();
for ($i = 0; $i < $times; $i++) {
file_put_contents($this->getDataDirectory() . "/$user/files" . "$filename-$i", "content-$i");
file_put_contents($dataDirectory . "/$user/files" . "$filename-$i", "content-$i");
}
}

Expand Down
1 change: 1 addition & 0 deletions build/integration/files_features/tags.feature
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
# SPDX-FileCopyrightText: 2016 ownCloud, Inc.
# SPDX-License-Identifier: AGPL-3.0-only
@tags
Feature: tags

Scenario: Creating a normal tag as regular user should work
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
# SPDX-FileCopyrightText: 2016 ownCloud, Inc.
# SPDX-License-Identifier: AGPL-3.0-only
@transfer-ownership
Feature: transfer-ownership

Scenario: transferring ownership of a file
Expand Down
7 changes: 3 additions & 4 deletions build/integration/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ fi

OC_PATH=../../
OCC=${OC_PATH}occ
TAGS=""
BEHAT_ARGS=()
if [ "$1" = "--tags" ]; then
TAGS="--tags=$2"

BEHAT_ARGS+=("--tags=$2")
shift 2
fi
SCENARIO_TO_RUN=$1
Expand Down Expand Up @@ -97,7 +96,7 @@ $BEHAT_EXECUTABLE \
--colors \
-f junit \
-f pretty \
$TAGS \
"${BEHAT_ARGS[@]}" \
$SCENARIO_TO_RUN

RESULT=$?
Expand Down
Loading
Loading