summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-06-28 10:54:29 +0200
committerGitHub <noreply@github.com>2019-06-28 10:54:29 +0200
commit2c449469d302c695ee03f6b572e329a005a25651 (patch)
tree866b63aef25ff33d3bd181c153d55d77bc063b27 /tests
parentca76d13c7824367956fcf9ef812432b9c6fc9a2d (diff)
parent20afe94297ca534b9a59cd73dc90d5cb6546ac02 (diff)
downloadnextcloud-server-2c449469d302c695ee03f6b572e329a005a25651.tar.gz
nextcloud-server-2c449469d302c695ee03f6b572e329a005a25651.zip
Merge pull request #16070 from nextcloud/fix/setup-check-no-internet-no-error
Do not show a internet connectivity warning if internet access is dis…
Diffstat (limited to 'tests')
-rw-r--r--tests/Settings/Controller/CheckSetupControllerTest.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/Settings/Controller/CheckSetupControllerTest.php b/tests/Settings/Controller/CheckSetupControllerTest.php
index deca75b4b26..9463e4b2a45 100644
--- a/tests/Settings/Controller/CheckSetupControllerTest.php
+++ b/tests/Settings/Controller/CheckSetupControllerTest.php
@@ -180,7 +180,7 @@ class CheckSetupControllerTest extends TestCase {
$this->assertFalse(
self::invokePrivate(
$this->checkSetupController,
- 'isInternetConnectionWorking'
+ 'hasInternetConnectivityProblems'
)
);
}
@@ -206,10 +206,10 @@ class CheckSetupControllerTest extends TestCase {
->will($this->returnValue($client));
- $this->assertTrue(
+ $this->assertFalse(
self::invokePrivate(
$this->checkSetupController,
- 'isInternetConnectionWorking'
+ 'hasInternetConnectivityProblems'
)
);
}
@@ -235,10 +235,10 @@ class CheckSetupControllerTest extends TestCase {
->method('newClient')
->will($this->returnValue($client));
- $this->assertFalse(
+ $this->assertTrue(
self::invokePrivate(
$this->checkSetupController,
- 'isInternetConnectionWorking'
+ 'hasInternetConnectivityProblems'
)
);
}
@@ -540,7 +540,7 @@ class CheckSetupControllerTest extends TestCase {
'backgroundJobsUrl' => 'https://example.org',
],
'cronErrors' => [],
- 'serverHasInternetConnection' => false,
+ 'serverHasInternetConnectionProblems' => true,
'isMemcacheConfigured' => true,
'memcacheDocs' => 'http://docs.example.org/server/go.php?to=admin-performance',
'isRandomnessSecure' => self::invokePrivate($this->checkSetupController, 'isRandomnessSecure'),