diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-03-20 19:22:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-20 19:22:38 +0100 |
| commit | 03dc79f66561b1dbaba9c036c47f14697c065e0a (patch) | |
| tree | f30bc648f217344d6565b1c4462c2d14b6a98906 /tests | |
| parent | b72d270a9b1d441b4ac3a93a91486ebda68a654f (diff) | |
| parent | 942281a48e2791cf6c46de758985e62806bed363 (diff) | |
| download | nextcloud-server-03dc79f66561b1dbaba9c036c47f14697c065e0a.tar.gz nextcloud-server-03dc79f66561b1dbaba9c036c47f14697c065e0a.zip | |
Merge pull request #14578 from nextcloud/enh/force_enable_apps
Force enable apps
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/App/AppStore/Fetcher/AppFetcherTest.php | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php index 1465e09d08b..214f652742b 100644 --- a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php +++ b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php @@ -75,11 +75,6 @@ EOD; $this->compareVersion = new CompareVersion(); $this->logger = $this->createMock(ILogger::class); - $this->config - ->expects($this->at(0)) - ->method('getSystemValue') - ->with('version') - ->willReturn('11.0.0.2'); $this->fetcher = new AppFetcher( $factory, $this->clientService, @@ -126,9 +121,8 @@ EOD; ->willReturn($client); $response = $this->createMock(IResponse::class); $client - ->expects($this->once()) ->method('get') - ->with('https://apps.nextcloud.com/api/v1/platform/11.0.0/apps.json') + ->with('https://apps.nextcloud.com/api/v1/apps.json') ->willReturn($response); $response ->expects($this->once()) @@ -1940,10 +1934,8 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg== $file ->expects($this->at(0)) - ->method('putContent') - ->with(json_encode($dataToPut)); + ->method('putContent'); $file - ->expects($this->at(1)) ->method('getContent') ->willReturn(json_encode($expected)); @@ -1956,6 +1948,8 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg== ->will($this->returnCallback(function($var, $default) { if ($var === 'appstoreenabled') { return false; + } else if ($var === 'version') { + return '11.0.0.2'; } return $default; })); @@ -1973,6 +1967,8 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg== ->will($this->returnCallback(function($var, $default) { if ($var === 'has_internet_connection') { return false; + } else if ($var === 'version') { + return '11.0.0.2'; } return $default; })); |