Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}
],
"require": {
"justinrainbow/json-schema": "^6.0",
"justinrainbow/json-schema": "^6.5",
"bamarni/composer-bin-plugin": "^1.8"
},
"require-dev": {
Expand Down
20 changes: 10 additions & 10 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion lib/Db/Assignment.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
use JsonSerializable;

class Assignment extends RelationalEntity implements JsonSerializable {
public $id;
protected $participant;
protected $cardId;
protected $type;
Expand Down
1 change: 0 additions & 1 deletion lib/Db/Session.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
use OCP\AppFramework\Db\Entity;

class Session extends Entity implements \JsonSerializable {
public $id;
protected $userId;
protected $token;
protected $lastContact;
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/features/decks.feature
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Feature: decks
And remember the last attachment as "my-attachment"
And post a comment with content "My first comment" on the card
When get the activities for the last card
Then the fetched activities should have 3 entries
Then the fetched activities should have 2 entries
And delete the card

When get the activities for the last card
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ HIDE_OC_LOGS=$2

# Nextcloud integration tests composer
(
cd ${OC_PATH}build/integration
cd ${OC_PATH}vendor-bin/behat
composer install
)
INSTALLED=$($OCC status | grep installed: | cut -d " " -f 5)
Expand Down
Loading