Fix tests.

tests/TestCase/View/Helper/FormatHelperTest.php

@@ -82,7 +82,7 @@ class FormatHelperTest extends TestCase {
 	public function testIcon() {
 		$result = $this->Format->icon('edit');
 		$expected = '<i class="icon icon-edit fa fa-pencil" title="' . __d('tools', 'Edit') . '" data-placement="bottom" data-toggle="tooltip"></i>';
-		$this->assertEquals($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 	/**
@@ -93,7 +93,7 @@ class FormatHelperTest extends TestCase {
 	public function testIconWithCustomAttributes() {
 		$result = $this->Format->icon('edit', [], ['data-x' => 'y']);
 		$expected = '<i class="icon icon-edit fa fa-pencil" data-x="y" title="' . __d('tools', 'Edit') . '" data-placement="bottom" data-toggle="tooltip"></i>';
-		$this->assertEquals($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 	/**
@@ -102,7 +102,7 @@ class FormatHelperTest extends TestCase {
 	public function testIconWithCustomClassAttributes() {
 		$result = $this->Format->icon('edit', [], ['class' => 'my-extra']);
 		$expected = '<i class="icon icon-edit fa fa-pencil my-extra" title="' . __d('tools', 'Edit') . '" data-placement="bottom" data-toggle="tooltip"></i>';
-		$this->assertEquals($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 	/**
@@ -112,7 +112,7 @@ class FormatHelperTest extends TestCase {
 		$this->Format->setConfig('fontIcons', ['edit' => 'fax fax-pen']);
 		$result = $this->Format->icon('edit');
 		$expected = '<i class="icon icon-edit fax fax-pen" title="' . __d('tools', 'Edit') . '" data-placement="bottom" data-toggle="tooltip"></i>';
-		$this->assertEquals($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 	/**
@@ -122,11 +122,11 @@ class FormatHelperTest extends TestCase {
 		$this->Format->setConfig('iconNamespaces', ['fa', 'glyphicon']);
 		$result = $this->Format->icon('glyphicon-foo');
 		$expected = '<i class="icon icon-glyphicon-foo glyphicon glyphicon-foo" title="' . __d('tools', 'Foo') . '" data-placement="bottom" data-toggle="tooltip"></i>';
-		$this->assertEquals($expected, $result);
+		$this->assertSame($expected, $result);
 
 		$result = $this->Format->icon('glyphicon-edit');
 		$expected = '<i class="icon icon-glyphicon-edit glyphicon glyphicon-edit" title="' . __d('tools', 'Edit') . '" data-placement="bottom" data-toggle="tooltip"></i>';
-		$this->assertEquals($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 	/**
@@ -339,7 +339,7 @@ class FormatHelperTest extends TestCase {
 		];
 
 		$result = $this->Format->neighbors($neighbors, 'foo');
-		$expected = '<div class="next-prev-navi"><a href="/index/1" title="bar"><i class="icon icon-prev fa fa-prev prev" title="" data-placement="bottom" data-toggle="tooltip"></i>&nbsp;prevRecord</a>&nbsp;&nbsp;<a href="/index/2" title="y"><i class="icon icon-next fa fa-next next" title="" data-placement="bottom" data-toggle="tooltip"></i>&nbsp;nextRecord</a></div>';
+		$expected = '<div class="next-prev-navi"><a href="/index/1" title="bar"><i class="icon icon-prev fa fa-arrow-left" title="" data-placement="bottom" data-toggle="tooltip"></i>&nbsp;prevRecord</a>&nbsp;&nbsp;<a href="/index/2" title="y"><i class="icon icon-next fa fa-arrow-right" title="" data-placement="bottom" data-toggle="tooltip"></i>&nbsp;nextRecord</a></div>';
 		$this->assertEquals($expected, $result);
 	}
 
@@ -358,7 +358,7 @@ class FormatHelperTest extends TestCase {
 		$url = ['controller' => 'MyController', 'action' => 'myAction'];
 		$result = $this->Format->neighbors($neighbors, 'foo', ['slug' => true, 'url' => $url]);
 
-		$expected = '<div class="next-prev-navi nextPrevNavi"><a href="/my-controller/my-action/1/My-Foo" title="My Foo"><i class="icon icon-prev fa fa-prev" title="Prev" data-placement="bottom" data-toggle="tooltip"></i>&nbsp;prevRecord</a>&nbsp;&nbsp;<a href="/my-controller/my-action/2/My-FooBaz" title="My FooBaz"><i class="icon icon-next fa fa-next" title="Next" data-placement="bottom" data-toggle="tooltip"></i>&nbsp;nextRecord</a></div>';
+		$expected = '<div class="next-prev-navi nextPrevNavi"><a href="/my-controller/my-action/1/My-Foo" title="My Foo"><i class="icon icon-prev fa fa-arrow-left" title="Prev" data-placement="bottom" data-toggle="tooltip"></i>&nbsp;prevRecord</a>&nbsp;&nbsp;<a href="/my-controller/my-action/2/My-FooBaz" title="My FooBaz"><i class="icon icon-next fa fa-arrow-right" title="Next" data-placement="bottom" data-toggle="tooltip"></i>&nbsp;nextRecord</a></div>';
 		$this->assertEquals($expected, $result);
 	}
 

tests/bootstrap.php

@@ -105,14 +105,10 @@ Cake\Log\Log::setConfig('error', [
 Cake\Utility\Security::setSalt('foo');
 
 // Why is this required?
-//require ROOT . DS . 'config' . DS . 'bootstrap.php';
+require ROOT . DS . 'config' . DS . 'bootstrap.php';
 
 Router::defaultRouteClass(DashedRoute::class);
 
-// Why has this no effect?
-//Router::reload();
-//require TESTS . 'config' . DS . 'routes.php';
-
 class_alias(TestApp\Controller\AppController::class, 'App\Controller\AppController');
 
 Cake\Core\Plugin::getCollection()->add(new Tools\Plugin());