Use raw bytes for upload size hidden input

[github/shaarli/Shaarli.git] / tests / UtilsTest.php

diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
index e5ff01e6e44f924c1c3d11a27c0dc29a6a00a3f9..d6a0aad5e8e0201da8441dcaa83eab6d7181575b 100644 (file)
--- a/tests/UtilsTest.php
+++ b/tests/UtilsTest.php
@@ -392,13 +392,14 @@ class UtilsTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('2GiB', human_bytes(strval(2 * (pow(1024, 3)))));
         $this->assertEquals('374B', human_bytes(374));
         $this->assertEquals('374B', human_bytes('374'));
+        $this->assertEquals('232kiB', human_bytes(237481));
         $this->assertEquals('Unlimited', human_bytes('0'));
         $this->assertEquals('Unlimited', human_bytes(0));
         $this->assertEquals('Setting not set', human_bytes(''));
     }
 
     /**
-     * Test get_max_upload_size
+     * Test get_max_upload_size with formatting
      */
     public function testGetMaxUploadSize()
     {
@@ -406,4 +407,14 @@ class UtilsTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('1MiB', get_max_upload_size('1m', '2m'));
         $this->assertEquals('100B', get_max_upload_size(100, 100));
     }
+
+    /**
+     * Test get_max_upload_size without formatting
+     */
+    public function testGetMaxUploadSizeRaw()
+    {
+        $this->assertEquals('1048576', get_max_upload_size(2097152, '1024k', false));
+        $this->assertEquals('1048576', get_max_upload_size('1m', '2m', false));
+        $this->assertEquals('100', get_max_upload_size(100, 100, false));
+    }
 }