From e9ffd52cb34ba1ecd260d7663801b9e2e8b3c220 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sat, 17 Jan 2015 20:50:22 +0530
Subject: [PATCH] Add tests proving using meta('icon') with theme works as
 expected.

---
 tests/TestCase/View/Helper/HtmlHelperTest.php |  32 ++++++++++++++++++
 .../Plugin/TestTheme/webroot/favicon.ico      | Bin 0 -> 1782 bytes
 2 files changed, 32 insertions(+)
 create mode 100644 tests/test_app/Plugin/TestTheme/webroot/favicon.ico

diff --git a/tests/TestCase/View/Helper/HtmlHelperTest.php b/tests/TestCase/View/Helper/HtmlHelperTest.php
index 5fe10cece21..a94a8730f36 100644
--- a/tests/TestCase/View/Helper/HtmlHelperTest.php
+++ b/tests/TestCase/View/Helper/HtmlHelperTest.php
@@ -1671,6 +1671,38 @@ public function testMetaIcon()
         $this->assertHtml($expected, $result);
     }
 
+    /**
+     * Test generating favicon's with meta() with theme
+     *
+     * @return void
+     */
+    public function testMetaIconWithTheme()
+    {
+        $this->Html->Url->theme = 'TestTheme';
+
+        $result = $this->Html->meta('icon', 'favicon.ico');
+        $expected = [
+            'link' => ['href' => 'preg:/.*test_theme\/favicon\.ico/', 'type' => 'image/x-icon', 'rel' => 'icon'],
+            ['link' => ['href' => 'preg:/.*test_theme\/favicon\.ico/', 'type' => 'image/x-icon', 'rel' => 'shortcut icon']]
+        ];
+        $this->assertHtml($expected, $result);
+
+        $result = $this->Html->meta('icon');
+        $expected = [
+            'link' => ['href' => 'preg:/.*test_theme\/favicon\.ico/', 'type' => 'image/x-icon', 'rel' => 'icon'],
+            ['link' => ['href' => 'preg:/.*test_theme\/favicon\.ico/', 'type' => 'image/x-icon', 'rel' => 'shortcut icon']]
+        ];
+        $this->assertHtml($expected, $result);
+
+        $this->Html->request->webroot = '/testing/';
+        $result = $this->Html->meta('icon');
+        $expected = [
+            'link' => ['href' => '/testing/test_theme/favicon.ico', 'type' => 'image/x-icon', 'rel' => 'icon'],
+            ['link' => ['href' => '/testing/test_theme/favicon.ico', 'type' => 'image/x-icon', 'rel' => 'shortcut icon']]
+        ];
+        $this->assertHtml($expected, $result);
+    }
+
     /**
      * Test the inline and block options for meta()
      *
diff --git a/tests/test_app/Plugin/TestTheme/webroot/favicon.ico b/tests/test_app/Plugin/TestTheme/webroot/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..aaac9c853a085a151ef0b2ded6f03ecd88f88899
GIT binary patch
literal 1782
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

literal 0
HcmV?d00001