Fix get_source

bootstraponline · bootstraponline · commit b71c9d4dfe5d · 2014-07-26T09:03:50.000-04:00
diff --git a/lib/appium_lib/android/helper.rb b/lib/appium_lib/android/helper.rb
@@ -106,7 +106,7 @@ def _fix_android_native_source source
         #  <android.app.ActionBar$Tab   => <android.app.ActionBar.Tab
         # </android.app.ActionBar$Tab> => </android.app.ActionBar.Tab>
         source = source.gsub(/<#{before}\s*\$\s*#{after}/, "<#{fixed}").
-                        gsub(/<\/#{before}\s*\$\s*#{after}>/, "</#{fixed}>")
+          gsub(/<\/#{before}\s*\$\s*#{after}>/, "</#{fixed}>")
       end
 
       source
@@ -115,7 +115,7 @@ def _fix_android_native_source source
     # Prints xml of the current page
     # @return [void]
     def source
-      _print_source _fix_android_native_source get_source
+      _print_source get_source
     end
 
     # Android only.
@@ -129,7 +129,6 @@ def get_android_inspect class_name=false
       if source.start_with? '<html>' # parse html from webview
         parser = @android_html_parser ||= Nokogiri::HTML::SAX::Parser.new(Common::HTMLElements.new)
       else
-        source = _fix_android_native_source source
         parser = @android_native_parser ||= Nokogiri::XML::SAX::Parser.new(AndroidElements.new)
       end
       parser.document.reset # ensure document is reset before parsing
@@ -319,5 +318,14 @@ def complex_find_exact class_name, value
     def complex_finds_exact class_name, value
       find_elements :uiautomator, string_visible_exact(class_name, value)
     end
+
+    # Returns XML string for the current page
+    # Same as driver.page_source
+    # @return [String]
+    def get_source
+      src = @driver.page_source
+      src = _fix_android_native_source src unless src && src.start_with?('<html>')
+      src
+    end
   end # module Android
 end # module Appium
diff --git a/lib/appium_lib/common/helper.rb b/lib/appium_lib/common/helper.rb
@@ -63,13 +63,6 @@ def _print_source source
       puts doc.to_xml indent: 2
     end
 
-    # Returns XML string for the current page
-    # Same as driver.page_source
-    # @return [String]
-    def get_source
-      @driver.page_source
-    end
-
     # @private
     # http://nokogiri.org/Nokogiri/XML/SAX.html
     class CountElements < Nokogiri::XML::SAX::Document
diff --git a/lib/appium_lib/ios/helper.rb b/lib/appium_lib/ios/helper.rb
@@ -425,5 +425,11 @@ def source
       _print_source get_source
     end
 
+    # Returns XML string for the current page
+    # Same as driver.page_source
+    # @return [String]
+    def get_source
+      @driver.page_source
+    end
   end # module Ios
 end # module Appium
