X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=tests%2FUtilsTest.php;h=02eecda216f8c03adafe50f57bcb32bdf7ace787;hb=refs%2Fpull%2F408%2Fhead;hp=7f218ad5633482cf2cafc11bb70d2df27bca60ea;hpb=68bc21353a6138a898724c8bb87684bb2b6b2c1c;p=github%2Fshaarli%2FShaarli.git
diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
old mode 100755
new mode 100644
index 7f218ad5..02eecda2
--- a/tests/UtilsTest.php
+++ b/tests/UtilsTest.php
@@ -118,6 +118,8 @@ class UtilsTest extends PHPUnit_Framework_TestCase
$this->assertEquals($ref, generateLocation($ref, 'localhost'));
$ref = 'http://localhost:8080/?test';
$this->assertEquals($ref, generateLocation($ref, 'localhost:8080'));
+ $ref = '?localreferer#hash';
+ $this->assertEquals($ref, generateLocation($ref, 'localhost:8080'));
}
/**
@@ -136,37 +138,6 @@ class UtilsTest extends PHPUnit_Framework_TestCase
$this->assertEquals('?', generateLocation($ref, 'localhost'));
}
- /**
- * Check supported PHP versions
- */
- public function testCheckSupportedPHPVersion()
- {
- $minVersion = '5.3';
- checkPHPVersion($minVersion, '5.4.32');
- checkPHPVersion($minVersion, '5.5');
- checkPHPVersion($minVersion, '5.6.10');
- }
-
- /**
- * Check a unsupported PHP version
- * @expectedException Exception
- * @expectedExceptionMessageRegExp /Your PHP version is obsolete/
- */
- public function testCheckSupportedPHPVersion51()
- {
- checkPHPVersion('5.3', '5.1.0');
- }
-
- /**
- * Check another unsupported PHP version
- * @expectedException Exception
- * @expectedExceptionMessageRegExp /Your PHP version is obsolete/
- */
- public function testCheckSupportedPHPVersion52()
- {
- checkPHPVersion('5.3', '5.2');
- }
-
/**
* Test is_session_id_valid with a valid ID - TEST ALL THE HASHES!
*
@@ -216,4 +187,41 @@ class UtilsTest extends PHPUnit_Framework_TestCase
is_session_id_valid('c0ZqcWF3VFE2NmJBdm1HMVQ0ZHJ3UmZPbTFsNGhkNHI=')
);
}
+
+ /**
+ * Test text2clickable without a redirector being set.
+ */
+ public function testText2clickableWithoutRedirector()
+ {
+ $text = 'stuff http://hello.there/is=someone#here otherstuff';
+ $expectedText = 'stuff http://hello.there/is=someone#here otherstuff';
+ $processedText = text2clickable($text, '');
+ $this->assertEquals($expectedText, $processedText);
+ }
+
+ /**
+ * Test text2clickable a redirector set.
+ */
+ public function testText2clickableWithRedirector()
+ {
+ $text = 'stuff http://hello.there/is=someone#here otherstuff';
+ $redirector = 'http://redirector.to';
+ $expectedText = 'stuff http://hello.there/is=someone#here otherstuff';
+ $processedText = text2clickable($text, $redirector);
+ $this->assertEquals($expectedText, $processedText);
+ }
+
+ /**
+ * Test testSpace2nbsp.
+ */
+ public function testSpace2nbsp()
+ {
+ $text = ' Are you thrilled by flags ?'. PHP_EOL .' Really?';
+ $expectedText = ' Are you thrilled by flags ?'. PHP_EOL .' Really?';
+ $processedText = space2nbsp($text);
+ $this->assertEquals($expectedText, $processedText);
+ }
}