diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-07 11:13:05 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-07 11:13:05 +0200 |
| commit | 1f8e6e78ccfb053388f9f4790ccbe74ef557889c (patch) | |
| tree | 2671f7139f4796a21296dfef9874c22033220580 /apps/files/tests/controller/apicontrollertest.php | |
| parent | 95e55aa4adb690947ff73f2c703dac7010ed2cae (diff) | |
| parent | 0fcd273714a4dd75e2fa8a59fea0fe38cd5aa934 (diff) | |
| download | nextcloud-server-1f8e6e78ccfb053388f9f4790ccbe74ef557889c.tar.gz nextcloud-server-1f8e6e78ccfb053388f9f4790ccbe74ef557889c.zip | |
Merge pull request #15424 from owncloud/failing-master-tests
Fix failing tests related to timezones on master
Diffstat (limited to 'apps/files/tests/controller/apicontrollertest.php')
| -rw-r--r-- | apps/files/tests/controller/apicontrollertest.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files/tests/controller/apicontrollertest.php b/apps/files/tests/controller/apicontrollertest.php index 5d32a693ad3..bbab711310c 100644 --- a/apps/files/tests/controller/apicontrollertest.php +++ b/apps/files/tests/controller/apicontrollertest.php @@ -110,7 +110,7 @@ class ApiControllerTest extends TestCase { [ 'id' => null, 'parentId' => null, - 'date' => 'January 1, 1970 at 12:00:55 AM GMT+0', + 'date' => \OCP\Util::formatDate(55), 'mtime' => 55000, 'icon' => \OCA\Files\Helper::determineIcon($fileInfo), 'name' => 'root.txt', @@ -175,7 +175,7 @@ class ApiControllerTest extends TestCase { [ 'id' => null, 'parentId' => null, - 'date' => 'January 1, 1970 at 12:00:55 AM GMT+0', + 'date' => \OCP\Util::formatDate(55), 'mtime' => 55000, 'icon' => \OCA\Files\Helper::determineIcon($fileInfo1), 'name' => 'root.txt', @@ -194,7 +194,7 @@ class ApiControllerTest extends TestCase { [ 'id' => null, 'parentId' => null, - 'date' => 'January 1, 1970 at 12:16:39 AM GMT+0', + 'date' => \OCP\Util::formatDate(999), 'mtime' => 999000, 'icon' => \OCA\Files\Helper::determineIcon($fileInfo2), 'name' => 'root.txt', |