From 378f161143b6c4dfa77b26135ee735c0a5ae2c8a Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Wed, 11 Apr 2012 21:00:15 +0400
Subject: [PATCH] fix failing test

---
 lib/ace/layer/text.js       |  6 +++++-
 lib/ace/test/all_browser.js | 12 ++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js
index 4394aee5..d71417b1 100644
--- a/lib/ace/layer/text.js
+++ b/lib/ace/layer/text.js
@@ -170,8 +170,12 @@ var Text = function(parentEl) {
             measureNode.innerHTML = "X";
 
             var container = this.element.parentNode;
-            while (!dom.hasCssClass(container, "ace_editor"))
+            while (container && !dom.hasCssClass(container, "ace_editor"))
                 container = container.parentNode;
+
+            if (!container)
+                return this.$measureNode = null;
+
             container.appendChild(measureNode);
         }
         
diff --git a/lib/ace/test/all_browser.js b/lib/ace/test/all_browser.js
index 90eab310..eefc725b 100644
--- a/lib/ace/test/all_browser.js
+++ b/lib/ace/test/all_browser.js
@@ -22,21 +22,21 @@ var tests = [
      require("ace/layer/text_test"),
      require("ace/lib/event_emitter_test"),
      require("ace/mode/coffee/parser_test"),
-     require("ace/mode/coffee_tokenizer_test"),
+     require("ace/mode/coffee_highlight_rules_test"),
      require("ace/mode/coldfusion_test"),
      require("ace/mode/css_test"),
-     require("ace/mode/css_tokenizer_test"),
+     require("ace/mode/css_highlight_rules_test"),
      require("ace/mode/css_worker"),
      require("ace/mode/html_test"),
-     require("ace/mode/html_tokenizer_test"),
+     require("ace/mode/html_highlight_rules_test"),
      require("ace/mode/javascript_test"),
-     require("ace/mode/javascript_tokenizer_test"),
+     require("ace/mode/javascript_highlight_rules_test"),
      require("ace/mode/javascript_worker_test"),
      require("ace/mode/python_test"),
-     require("ace/mode/ruby_tokenizer_test"),
+     require("ace/mode/ruby_highlight_rules_test"),
      require("ace/mode/text_test"),
      require("ace/mode/xml_test"),
-     require("ace/mode/xml_tokenizer_test"),
+     require("ace/mode/xml_highlight_rules_test"),
      require("ace/mode/folding/cstyle_test"),
      require("ace/mode/folding/html_test"),
      require("ace/mode/folding/pythonic_test"),