euromark 12 年之前
父节点
当前提交
150cc145ef
共有 1 个文件被更改,包括 9 次插入9 次删除
  1. 9 9
      Test/Case/View/Helper/CommonHelperTest.php

+ 9 - 9
Test/Case/View/Helper/CommonHelperTest.php

@@ -21,30 +21,30 @@ class CommonHelperTest extends MyCakeTestCase {
 	public function testMetaCanonical() {
 		$is = $this->Common->metaCanonical('/some/url/param1');
 		$this->out(h($is));
-		$this->assertEquals('<link href="' . $this->Common->url('/some/url/param1', true) . '" rel="canonical" />', trim($is));
+		$this->assertEquals('<link href="' . Configure::read('App.fullBaseUrl') . $this->Common->url('/some/url/param1') . '" rel="canonical" />', trim($is));
 	}
 
 	/**
 	 */
 	public function testMetaAlternate() {
-		$is = $this->Common->metaAlternate('/some/url/param1', 'de-de');
+		$is = $this->Common->metaAlternate('/some/url/param1', 'de-de', true);
 		$this->out(h($is));
-		$this->assertEquals('<link href="' . FULL_BASE_URL . $this->Common->url('/some/url/param1') . '" rel="alternate" hreflang="de-de" />', trim($is));
+		$this->assertEquals('<link href="' . $this->Common->url('/some/url/param1', true) . '" rel="alternate" hreflang="de-de" />', trim($is));
 
 		$is = $this->Common->metaAlternate(array('controller' => 'some', 'action' => 'url'), 'de', true);
 		$this->out(h($is));
-		$this->assertEquals('<link href="' . FULL_BASE_URL . $this->Common->url('/some/url') . '" rel="alternate" hreflang="de" />', trim($is));
+		$this->assertEquals('<link href="' . $this->Common->url('/some/url', true) . '" rel="alternate" hreflang="de" />', trim($is));
 
 		$is = $this->Common->metaAlternate(array('controller' => 'some', 'action' => 'url'), array('de', 'de-ch'), true);
 		$this->out(h($is));
-		$this->assertEquals('<link href="' . FULL_BASE_URL . $this->Common->url('/some/url') . '" rel="alternate" hreflang="de" />' . PHP_EOL . '<link href="' . FULL_BASE_URL . $this->Common->url('/some/url') . '" rel="alternate" hreflang="de-ch" />', trim($is));
+		$this->assertEquals('<link href="' . $this->Common->url('/some/url', true) . '" rel="alternate" hreflang="de" />' . PHP_EOL . '<link href="' . FULL_BASE_URL . $this->Common->url('/some/url') . '" rel="alternate" hreflang="de-ch" />', trim($is));
 
 		$is = $this->Common->metaAlternate(array('controller' => 'some', 'action' => 'url'), array('de' => array('ch', 'at'), 'en' => array('gb', 'us')), true);
 		$this->out(h($is));
-		$this->assertEquals('<link href="' . FULL_BASE_URL . $this->Common->url('/some/url') . '" rel="alternate" hreflang="de-ch" />' . PHP_EOL .
-			'<link href="' . FULL_BASE_URL . $this->Common->url('/some/url') . '" rel="alternate" hreflang="de-at" />' . PHP_EOL .
-			'<link href="' . FULL_BASE_URL . $this->Common->url('/some/url') . '" rel="alternate" hreflang="en-gb" />' . PHP_EOL .
-			'<link href="' . FULL_BASE_URL . $this->Common->url('/some/url') . '" rel="alternate" hreflang="en-us" />', trim($is));
+		$this->assertEquals('<link href="' . $this->Common->url('/some/url', true) . '" rel="alternate" hreflang="de-ch" />' . PHP_EOL .
+			'<link href="' . $this->Common->url('/some/url', true) . '" rel="alternate" hreflang="de-at" />' . PHP_EOL .
+			'<link href="' . $this->Common->url('/some/url', true) . '" rel="alternate" hreflang="en-gb" />' . PHP_EOL .
+			'<link href="' . $this->Common->url('/some/url', true) . '" rel="alternate" hreflang="en-us" />', trim($is));
 	}
 
 	/**