Changeset 4286

Timestamp:

06/20/07 14:07:41 (1 year ago)

Author:

fabien

Message:

fixed sfBrowser keeps previous Dom is response is not XHTML (closes #1853)

Files:

• branches/1.0/CHANGELOG (modified) (1 diff)
• branches/1.0/lib/util/sfBrowser.class.php (modified) (4 diffs)
• branches/1.0/test/functional/sfTestBrowserTest.php (modified) (1 diff)

branches/1.0/CHANGELOG

@@ -4 +4 @@
-This is a bug fix release.
-
+* r4286: fixed sfBrowser keeps previous Dom is response is not XHTML (#1853)
-* r4282: fixed sfValidatorManager refuses zero values as null values (#1649)
-* r4277: fixed generator themes in the project data directory do not override data in plugin directory (#1813)

branches/1.0/lib/util/sfBrowser.class.php

@@ -208 +208 @@
-      $this->domCssSelector = new sfDomCssSelector($this->dom);
-    }
+    else
+    {
+      $this->dom = null;
+      $this->domCssSelector = null;
+    }
-
-    return $this;
@@ -246 +251 @@
-  public function getResponseDomCssSelector()
-  {
+    if (is_null($this->dom))
+    {
+      throw new sfException('The DOM is not accessible because the browser response content type is not HMTL.');
+    }
+
-    return $this->domCssSelector;
-  }
@@ -251 +261 @@
-  public function getResponseDom()
-  {
+    if (is_null($this->dom))
+    {
+      throw new sfException('The DOM is not accessible because the browser response content type is not HMTL.');
+    }
+
-    return $this->dom;
-  }
@@ -295 +310 @@
-  public function click($name, $arguments = array())
-  {
-
+
+
+
-    {
-      throw new sfException('Cannot click because there is no current page in the browser');
-    }
-
-
-
+
-
-    // text link

branches/1.0/test/functional/sfTestBrowserTest.php

@@ -42 +42 @@
-  throwsException('sfException', 'sfException message')
-;
+
+$b->
+  get('/browser')->
+  responseContains('html')->
+  checkResponseElement('h1', 'html')->
+
+  get('/browser/text')->
+  responseContains('text')
+;
+
+try
+{
+  $b->checkResponseElement('h1', 'text');
+  $b->test()->fail('The DOM is not accessible if the response content type is not HTML');
+}
+catch (sfException $e)
+{
+  $b->test()->pass('The DOM is not accessible if the response content type is not HTML');
+}