Fix replacing of  , aka   so it works on 1.9

brynary · Jun 7, 2009 · 8d2c027 · 8d2c027
1 parent 520081c
commit 8d2c027
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/webrat/core/locators/link_locator.rb b/lib/webrat/core/locators/link_locator.rb
@@ -45,10 +45,14 @@ def link_elements
       end
 
       def replace_nbsp(str)
-        if str.respond_to?(:force_encoding)
-          str.force_encoding('UTF-8').gsub(/\xc2\xa0/u, ' ')
+        if str.respond_to?(:valid_encoding?)
+          if str.valid_encoding?
+            str.gsub(/\xc2\xa0/u, ' ')
+          else
+            str.force_encoding('UTF-8').gsub(/\xc2\xa0/u, ' ')
+          end
         else
-          str.gsub("\xc2\xa0", ' ')
+          str.gsub(/\xc2\xa0/u, ' ')
         end
       end