From 6bbda28881223a39e548b9fde0e4d62f5fcbec82 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 17 Nov 2017 20:41:58 +0100
Subject: [PATCH] Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
.../App/AppStore/Fetcher/AppFetcherTest.php | 26 ++++++++++++++++---
.../AppStore/Fetcher/CategoryFetcherTest.php | 24 ++++++++++++++---
.../lib/App/AppStore/Fetcher/FetcherBase.php | 26 ++++++++++++++++---
3 files changed, 67 insertions(+), 9 deletions(-)
diff --git a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
index 2efecef4dc7..4549b05935c 100644
--- a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
+++ b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
@@ -1945,10 +1945,30 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg==
public function testAppstoreDisabled() {
$this->config
- ->expects($this->once())
->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->willReturn(false);
+ ->will($this->returnCallback(function($var, $default) {
+ if ($var === 'appstoreenabled') {
+ return false;
+ }
+ return $default;
+ }));
+ $this->appData
+ ->expects($this->never())
+ ->method('getFolder');
+
+ $this->assertEquals([], $this->fetcher->get());
+ }
+
+
+ public function testNoInternet() {
+ $this->config
+ ->method('getSystemValue')
+ ->will($this->returnCallback(function($var, $default) {
+ if ($var === 'has_internet_connection') {
+ return false;
+ }
+ return $default;
+ }));
$this->appData
->expects($this->never())
->method('getFolder');
diff --git a/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php b/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php
index a1ce718520f..f4b8c320c51 100644
--- a/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php
+++ b/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php
@@ -40,15 +40,33 @@ class CategoryFetcherTest extends FetcherBase {
public function testAppstoreDisabled() {
$this->config
- ->expects($this->once())
->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->willReturn(false);
+ ->will($this->returnCallback(function($var, $default) {
+ if ($var === 'appstoreenabled') {
+ return false;
+ }
+ return $default;
+ }));
$this->appData
->expects($this->never())
->method('getFolder');
$this->assertEquals([], $this->fetcher->get());
+ }
+
+ public function testNoInternet() {
+ $this->config
+ ->method('getSystemValue')
+ ->will($this->returnCallback(function($var, $default) {
+ if ($var === 'has_internet_connection') {
+ return false;
+ }
+ return $default;
+ }));
+ $this->appData
+ ->expects($this->never())
+ ->method('getFolder');
+ $this->assertEquals([], $this->fetcher->get());
}
}
diff --git a/tests/lib/App/AppStore/Fetcher/FetcherBase.php b/tests/lib/App/AppStore/Fetcher/FetcherBase.php
index 2cfb34a0965..90b7523d850 100644
--- a/tests/lib/App/AppStore/Fetcher/FetcherBase.php
+++ b/tests/lib/App/AppStore/Fetcher/FetcherBase.php
@@ -78,6 +78,11 @@ abstract class FetcherBase extends TestCase {
$this->config
->expects($this->at(1))
->method('getSystemValue')
+ ->with('has_internet_connection', true)
+ ->willReturn(true);
+ $this->config
+ ->expects($this->at(2))
+ ->method('getSystemValue')
->with(
$this->equalTo('version'),
$this->anything()
@@ -121,11 +126,16 @@ abstract class FetcherBase extends TestCase {
$this->config
->expects($this->at(1))
->method('getSystemValue')
- ->with('appstoreenabled', true)
+ ->with('has_internet_connection', true)
->willReturn(true);
$this->config
->expects($this->at(2))
->method('getSystemValue')
+ ->with('appstoreenabled', true)
+ ->willReturn(true);
+ $this->config
+ ->expects($this->at(3))
+ ->method('getSystemValue')
->with(
$this->equalTo('version'),
$this->anything()
@@ -277,11 +287,16 @@ abstract class FetcherBase extends TestCase {
$this->config
->expects($this->at(1))
->method('getSystemValue')
- ->with('appstoreenabled', true)
+ ->with('has_internet_connection', true)
->willReturn(true);
$this->config
->expects($this->at(2))
->method('getSystemValue')
+ ->with('appstoreenabled', true)
+ ->willReturn(true);
+ $this->config
+ ->expects($this->at(3))
+ ->method('getSystemValue')
->with(
$this->equalTo('version'),
$this->anything()
@@ -356,11 +371,16 @@ abstract class FetcherBase extends TestCase {
$this->config
->expects($this->at(1))
->method('getSystemValue')
- ->with('appstoreenabled', true)
+ ->with('has_internet_connection', true)
->willReturn(true);
$this->config
->expects($this->at(2))
->method('getSystemValue')
+ ->with('appstoreenabled', true)
+ ->willReturn(true);
+ $this->config
+ ->expects($this->at(3))
+ ->method('getSystemValue')
->with(
$this->equalTo('version'),
$this->anything()
--
GitLab