Add Pager testing for current_url

Author: jim-parry

system/Pager/PagerRenderer.php

@@ -81,7 +81,7 @@ class PagerRenderer
 		 */
 	protected $pageCount;
 	/**
-	 * URI? unused?
+	 * URI base for pagination links
 	 *
 	 * @var integer
 	 */

tests/system/Helpers/URLHelperTest.php

@@ -1096,12 +1096,13 @@ public function testBasedNoIndex()
 		$config->baseURL   = 'http://example.com/ci/v4/';
 		$config->indexPage = 'index.php';
 		$request           = Services::request($config);
-		$request->uri      = new URI('http://example.com/somewhere');
+		$request->uri      = new URI('http://example.com/ci/v4/x/y');
 
 		Services::injectMock('request', $request);
 
 		$this->assertEquals('http://example.com/ci/v4/index.php/controller/method', site_url('controller/method', null, $config));
 		$this->assertEquals('http://example.com/ci/v4/controller/method', base_url('controller/method', null, $config));
+		$this->assertEquals(base_url(uri_string()), current_url());
 	}
 
 	public function testBasedWithIndex()
@@ -1113,12 +1114,13 @@ public function testBasedWithIndex()
 		$config->baseURL   = 'http://example.com/ci/v4/';
 		$config->indexPage = 'index.php';
 		$request           = Services::request($config);
-		$request->uri      = new URI('http://example.com/somewhere');
+		$request->uri      = new URI('http://example.com/ci/v4/index.php/x/y');
 
 		Services::injectMock('request', $request);
 
 		$this->assertEquals('http://example.com/ci/v4/index.php/controller/method', site_url('controller/method', null, $config));
 		$this->assertEquals('http://example.com/ci/v4/controller/method', base_url('controller/method', null, $config));
+		$this->assertEquals(base_url(uri_string()), current_url());
 	}
 
 	public function testBasedWithoutIndex()
@@ -1130,12 +1132,13 @@ public function testBasedWithoutIndex()
 		$config->baseURL   = 'http://example.com/ci/v4/';
 		$config->indexPage = '';
 		$request           = Services::request($config);
-		$request->uri      = new URI('http://example.com/somewhere');
+		$request->uri      = new URI('http://example.com/ci/v4/x/y');
 
 		Services::injectMock('request', $request);
 
 		$this->assertEquals('http://example.com/ci/v4/controller/method', site_url('controller/method', null, $config));
 		$this->assertEquals('http://example.com/ci/v4/controller/method', base_url('controller/method', null, $config));
+		$this->assertEquals(base_url(uri_string()), current_url());
 	}
 
 	public function testBasedWithOtherIndex()
@@ -1147,12 +1150,13 @@ public function testBasedWithOtherIndex()
 		$config->baseURL   = 'http://example.com/ci/v4/';
 		$config->indexPage = 'fc.php';
 		$request           = Services::request($config);
-		$request->uri      = new URI('http://example.com/somewhere');
+		$request->uri      = new URI('http://example.com/ci/v4/x/y');
 
 		Services::injectMock('request', $request);
 
 		$this->assertEquals('http://example.com/ci/v4/fc.php/controller/method', site_url('controller/method', null, $config));
 		$this->assertEquals('http://example.com/ci/v4/controller/method', base_url('controller/method', null, $config));
+		$this->assertEquals(base_url(uri_string()), current_url());
 	}
 
 }

tests/system/Pager/PagerTest.php

@@ -1,6 +1,8 @@
 <?php namespace CodeIgniter\Pager;
 
+use CodeIgniter\HTTP\URI;
 use CodeIgniter\Pager\Exceptions\PagerException;
+use Config\App;
 use Config\Pager;
 use Config\Services;
 
@@ -19,7 +21,6 @@ class PagerTest extends \CIUnitTestCase
 	protected function setUp()
 	{
 		parent::setUp();
-
 		helper('url');
 
 		$_SERVER['HTTP_HOST'] = 'example.com';
@@ -354,4 +355,32 @@ public function testHeadLinks()
 		$this->assertContains('<link rel="canonical"', $last_page);
 		$this->assertNotContains('<link rel="next"', $last_page);
 	}
+
+	public function testBasedURI()
+	{
+		$_SERVER['HTTP_HOST']   = 'example.com';
+		$_SERVER['REQUEST_URI'] = '/ci/v4/x/y';
+		$_GET                   = [];
+
+		$config            = new App();
+		$config->baseURL   = 'http://example.com/ci/v4/';
+		$config->indexPage = 'fc.php';
+		$request           = Services::request($config);
+		$request->uri      = new URI('http://example.com/ci/v4/x/y');
+
+		Services::injectMock('request', $request);
+
+		$this->config = new Pager();
+		$this->pager  = new \CodeIgniter\Pager\Pager($this->config, Services::renderer());
+
+		$_GET['page'] = 2;
+
+		$this->pager->store('foo', 2, 12, 70);
+
+		$expected = current_url(true);
+		$expected = (string)$expected->setQuery('page=1');
+
+		$this->assertEquals((string)$expected, $this->pager->getPreviousPageURI('foo'));
+	}
+
 }