]> source.dussan.org Git - nextcloud-server.git/commitdiff
Adjust unit tests 12412/head
authorJoas Schilling <coding@schilljs.com>
Fri, 9 Nov 2018 09:22:19 +0000 (10:22 +0100)
committerJoas Schilling <coding@schilljs.com>
Mon, 12 Nov 2018 13:29:00 +0000 (14:29 +0100)
Signed-off-by: Joas Schilling <coding@schilljs.com>
apps/updatenotification/tests/Settings/AdminTest.php
apps/updatenotification/tests/UpdateCheckerTest.php

index d1f44367a1cea59a531dff012b10efa64534bdf8..3eaeb5922249f15a1e7232ec8f4ff0baadf2ecc4 100644 (file)
@@ -104,6 +104,7 @@ class AdminTest extends TestCase {
                        ->willReturn([
                                'updateAvailable' => true,
                                'updateVersion' => '8.1.2',
+                               'updateVersionString' => 'Nextcloud 8.1.2',
                                'downloadLink' => 'https://downloads.nextcloud.org/server',
                                'changes' => [],
                                'updaterEnabled' => true,
@@ -129,7 +130,8 @@ class AdminTest extends TestCase {
                                'lastChecked' => 'LastCheckedReturnValue',
                                'currentChannel' => Util::getChannel(),
                                'channels' => $channels,
-                               'newVersionString' => '8.1.2',
+                               'newVersion' => '8.1.2',
+                               'newVersionString' => 'Nextcloud 8.1.2',
                                'downloadLink' => 'https://downloads.nextcloud.org/server',
                                'changes' => [],
                                'updaterEnabled' => true,
index 16861eea54e6c2a58268e6f2cee4b3d198468445..fc70d2d94510024d3b2fc5d6f1e6dccea71653b8 100644 (file)
@@ -51,8 +51,8 @@ class UpdateCheckerTest extends TestCase {
                        ->expects($this->once())
                        ->method('check')
                        ->willReturn([
-                               'version' => 123,
-                               'versionstring' => 'Nextcloud 123',
+                               'version' => '1.2.3',
+                               'versionstring' => 'Nextcloud 1.2.3',
                                'web'=> 'javascript:alert(1)',
                                'url'=> 'javascript:alert(2)',
                                'changes' => 'javascript:alert(3)',
@@ -62,7 +62,8 @@ class UpdateCheckerTest extends TestCase {
 
                $expected = [
                        'updateAvailable' => true,
-                       'updateVersion' => 'Nextcloud 123',
+                       'updateVersion' => '1.2.3',
+                       'updateVersionString' => 'Nextcloud 1.2.3',
                        'updaterEnabled' => false,
                        'versionIsEol' => true,
                ];
@@ -91,8 +92,8 @@ class UpdateCheckerTest extends TestCase {
                        ->expects($this->once())
                        ->method('check')
                        ->willReturn([
-                               'version' => '123',
-                               'versionstring' => 'Nextcloud 123',
+                               'version' => '1.2.3',
+                               'versionstring' => 'Nextcloud 1.2.3',
                                'web'=> 'https://docs.nextcloud.com/myUrl',
                                'url'=> 'https://downloads.nextcloud.org/server',
                                'changes' => 'https://updates.nextcloud.com/changelog_server/?version=123.0.0',
@@ -106,7 +107,8 @@ class UpdateCheckerTest extends TestCase {
 
                $expected = [
                        'updateAvailable' => true,
-                       'updateVersion' => 'Nextcloud 123',
+                       'updateVersion' => '1.2.3',
+                       'updateVersionString' => 'Nextcloud 1.2.3',
                        'updaterEnabled' => true,
                        'versionIsEol' => false,
                        'updateLink' => 'https://docs.nextcloud.com/myUrl',