Merge branch 'develop' into dane/restore-backups
This commit is contained in:
commit
be26921fcc
41 changed files with 440 additions and 362 deletions
|
@ -55,7 +55,7 @@ abstract class ClientApiIntegrationTestCase extends IntegrationTestCase
|
|||
/**
|
||||
* Returns a link to the specific resource using the client API.
|
||||
*
|
||||
* @param mixed $model
|
||||
* @param mixed $model
|
||||
* @param string|null $append
|
||||
*/
|
||||
protected function link($model, $append = null): string
|
||||
|
|
|
@ -24,7 +24,7 @@ class GetServerSchedulesTest extends ClientApiIntegrationTestCase
|
|||
* Test that schedules for a server are returned.
|
||||
*
|
||||
* @param array $permissions
|
||||
* @param bool $individual
|
||||
* @param bool $individual
|
||||
* @dataProvider permissionsDataProvider
|
||||
*/
|
||||
public function testServerSchedulesAreReturned($permissions, $individual)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue