rb - update w3c getElementAttribute

Author: titusfortner

rb/lib/selenium/webdriver/remote/w3c_bridge.rb

@@ -31,6 +31,13 @@ module Remote
       class W3CBridge
         include BridgeHelper
 
+        BOOLEAN_ATTRIBUTES = %i[async autofocus autoplay checked compact complete controls
+            declare defaultchecked defaultselected defer disabled draggable ended
+            formnovalidate hidden indeterminate iscontenteditable ismap itemscope
+            loop multiple muted nohref noresize noshade novalidate nowrap open
+            paused pubdate readonly required reversed scoped seamless seeking
+            selected truespeed willvalidate].freeze
+
         # TODO: constant shouldn't be modified in class
         COMMANDS = {}
 
@@ -518,12 +525,37 @@ def element_tag_name(element)
           execute :getElementTagName, id: element.values.first
         end
 
+        # TODO - Replace implementation with atom
         def element_attribute(element, name)
-          execute :getElementAttribute, id: element.values.first, name: name
+          name = name.to_sym
+
+          if name == :style
+            return execute_script("return arguments[0].style.cssText", element)
+          end
+
+          if BOOLEAN_ATTRIBUTES.include? name
+            return execute :getElementAttribute, id: element.values.first, name: name
+          end
+
+          property_value = execute :getElementProperty, id: element.values.first, name: name
+g          return property_value if name == :value
+          return property_value if property_value &&
+            !(property_value.respond_to?(:empty?) && property_value.empty?)
+
+          attribute_value = execute :getElementAttribute, id: element.values.first, name: name
+          return nil if attribute_value.nil?
+
+          # Verify attribute not the browser default
+          has_attribute = execute_script("return arguments[0].hasAttribute(arguments[1])", element, name)
+          attribute_value if has_attribute
+        end
+
+        def element_property(element, name)
+          execute :getElementProperty, id: element.values.first, name: name
         end
 
         def element_value(element)
-          execute :getElementProperty, id: element.values.first, name: 'value'
+          element_property element, 'value'
         end
 
         def element_text(element)

rb/spec/integration/selenium/webdriver/spec_helper.rb

@@ -36,7 +36,7 @@ class Object
 RSpec.configure do |c|
   c.include(WebDriver::SpecSupport::Helpers)
   c.before(:suite) do
-    $DEBUG = ENV['DEBUG'] == 'true'
+    $DEBUG ||= ENV['DEBUG'] == 'true'
     GlobalTestEnv.remote_server.start if GlobalTestEnv.driver == :remote
   end