diff options
author | Joas Schilling <coding@schilljs.com> | 2021-10-21 10:27:12 +0300 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2021-10-21 10:27:12 +0300 |
commit | f24e8212c383e74261a42d1fcf88a81bde2ed5e8 (patch) | |
tree | a267fed57d0e672f4f1a9c3c34f83e8087766ed5 /tests/lib/App/AppStore/Fetcher/FetcherBase.php | |
parent | facb50ebcc1f4a9fef8be746717272ef24103007 (diff) |
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'tests/lib/App/AppStore/Fetcher/FetcherBase.php')
-rw-r--r-- | tests/lib/App/AppStore/Fetcher/FetcherBase.php | 68 |
1 files changed, 41 insertions, 27 deletions
diff --git a/tests/lib/App/AppStore/Fetcher/FetcherBase.php b/tests/lib/App/AppStore/Fetcher/FetcherBase.php index 03ba4187268..87a09cb617d 100644 --- a/tests/lib/App/AppStore/Fetcher/FetcherBase.php +++ b/tests/lib/App/AppStore/Fetcher/FetcherBase.php @@ -77,7 +77,7 @@ abstract class FetcherBase extends TestCase { public function testGetWithAlreadyExistingFileAndUpToDateTimestampAndVersion() { $this->config ->expects($this->at(0)) - ->method('getSystemValue') + ->method('getSystemValueBool') ->with('appstoreenabled', true) ->willReturn(true); $this->config @@ -126,9 +126,7 @@ abstract class FetcherBase extends TestCase { $this->config ->method('getSystemValue') ->willReturnCallback(function ($var, $default) { - if ($var === 'appstoreenabled') { - return true; - } elseif ($var === 'has_internet_connection') { + if ($var === 'has_internet_connection') { return true; } elseif ($var === 'appstoreurl') { return 'https://apps.nextcloud.com/api/v1'; @@ -137,6 +135,10 @@ abstract class FetcherBase extends TestCase { } return $default; }); + $this->config + ->method('getSystemValueBool') + ->with('appstoreenabled', $this->anything()) + ->willReturn(true); $folder = $this->createMock(ISimpleFolder::class); $file = $this->createMock(ISimpleFile::class); @@ -202,14 +204,16 @@ abstract class FetcherBase extends TestCase { public function testGetWithAlreadyExistingFileAndOutdatedTimestamp() { $this->config->method('getSystemValue') ->willReturnCallback(function ($key, $default) { - if ($key === 'appstoreenabled') { - return true; - } elseif ($key === 'version') { + if ($key === 'version') { return '11.0.0.2'; } else { return $default; } }); + $this->config + ->method('getSystemValueBool') + ->with('appstoreenabled', true) + ->willReturn(true); $folder = $this->createMock(ISimpleFolder::class); $file = $this->createMock(ISimpleFile::class); @@ -279,9 +283,7 @@ abstract class FetcherBase extends TestCase { $this->config ->method('getSystemValue') ->willReturnCallback(function ($var, $default) { - if ($var === 'appstoreenabled') { - return true; - } elseif ($var === 'has_internet_connection') { + if ($var === 'has_internet_connection') { return true; } elseif ($var === 'appstoreurl') { return 'https://apps.nextcloud.com/api/v1'; @@ -290,6 +292,10 @@ abstract class FetcherBase extends TestCase { } return $default; }); + $this->config + ->method('getSystemValueBool') + ->with('appstoreenabled', true) + ->willReturn(true); $folder = $this->createMock(ISimpleFolder::class); $file = $this->createMock(ISimpleFile::class); @@ -355,9 +361,7 @@ abstract class FetcherBase extends TestCase { $this->config ->method('getSystemValue') ->willReturnCallback(function ($var, $default) { - if ($var === 'appstoreenabled') { - return true; - } elseif ($var === 'has_internet_connection') { + if ($var === 'has_internet_connection') { return true; } elseif ($var === 'appstoreurl') { return 'https://apps.nextcloud.com/api/v1'; @@ -366,6 +370,10 @@ abstract class FetcherBase extends TestCase { } return $default; }); + $this->config + ->method('getSystemValueBool') + ->with('appstoreenabled', true) + ->willReturn(true); $folder = $this->createMock(ISimpleFolder::class); $file = $this->createMock(ISimpleFile::class); @@ -429,12 +437,12 @@ abstract class FetcherBase extends TestCase { public function testGetWithExceptionInClient() { $this->config->method('getSystemValue') ->willReturnCallback(function ($key, $default) { - if ($key === 'appstoreenabled') { - return true; - } else { - return $default; - } + return $default; }); + $this->config + ->method('getSystemValueBool') + ->with('appstoreenabled', true) + ->willReturn(true); $folder = $this->createMock(ISimpleFolder::class); $file = $this->createMock(ISimpleFile::class); @@ -469,14 +477,16 @@ abstract class FetcherBase extends TestCase { public function testGetMatchingETag() { $this->config->method('getSystemValue') ->willReturnCallback(function ($key, $default) { - if ($key === 'appstoreenabled') { - return true; - } elseif ($key === 'version') { + if ($key === 'version') { return '11.0.0.2'; } else { return $default; } }); + $this->config + ->method('getSystemValueBool') + ->with('appstoreenabled', true) + ->willReturn(true); $folder = $this->createMock(ISimpleFolder::class); $file = $this->createMock(ISimpleFile::class); @@ -550,14 +560,16 @@ abstract class FetcherBase extends TestCase { public function testGetNoMatchingETag() { $this->config->method('getSystemValue') ->willReturnCallback(function ($key, $default) { - if ($key === 'appstoreenabled') { - return true; - } elseif ($key === 'version') { + if ($key === 'version') { return '11.0.0.2'; } else { return $default; } }); + $this->config + ->method('getSystemValueBool') + ->with('appstoreenabled', true) + ->willReturn(true); $folder = $this->createMock(ISimpleFolder::class); $file = $this->createMock(ISimpleFile::class); @@ -637,14 +649,16 @@ abstract class FetcherBase extends TestCase { public function testFetchAfterUpgradeNoETag() { $this->config->method('getSystemValue') ->willReturnCallback(function ($key, $default) { - if ($key === 'appstoreenabled') { - return true; - } elseif ($key === 'version') { + if ($key === 'version') { return '11.0.0.3'; } else { return $default; } }); + $this->config + ->method('getSystemValueBool') + ->with('appstoreenabled', true) + ->willReturn(true); $folder = $this->createMock(ISimpleFolder::class); $file = $this->createMock(ISimpleFile::class); |