rb - update w3c commands and specs for element size & location

Author: titusfortner

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

@@ -567,19 +567,18 @@ def getElementText(element)
         end
 
         def getElementLocation(element)
-          data = execute :getElementLocation, :id => element
+          data = execute :getElementRect, :id => element
 
           Point.new data['x'], data['y']
         end
 
         def getElementLocationOnceScrolledIntoView(element)
-          data = execute :getElementLocationOnceScrolledIntoView, :id => element
-
-          Point.new data['x'], data['y']
+          sendKeysToElement(element, [''])
+          getElementLocation(element)
         end
 
         def getElementSize(element)
-          data = execute :getElementSize, :id => element
+          data = execute :getElementRect, :id => element
 
           Dimension.new data['width'], data['height']
         end

rb/spec/integration/selenium/webdriver/element_spec.rb

@@ -141,38 +141,30 @@
     expect(driver.find_element(:class, "header")).to be_displayed
   end
 
-  # Location not currently supported in Spec, but should be?
-  not_compliant_on :browser => :marionette do
-    it "should get location" do
-      driver.navigate.to url_for("xhtmlTest.html")
-      loc = driver.find_element(:class, "header").location
+  it "should get location" do
+    driver.navigate.to url_for("xhtmlTest.html")
+    loc = driver.find_element(:class, "header").location
 
-      expect(loc.x).to be >= 1
-      expect(loc.y).to be >= 1
-    end
+    expect(loc.x).to be >= 1
+    expect(loc.y).to be >= 1
+  end
 
-    not_compliant_on :browser => [:iphone] do
-      it "should get location once scrolled into view" do
-        driver.navigate.to url_for("javascriptPage.html")
-        loc = driver.find_element(:id, 'keyUp').location_once_scrolled_into_view
+  not_compliant_on :browser => :iphone do
+    it "should get location once scrolled into view" do
+      driver.navigate.to url_for("javascriptPage.html")
+      loc = driver.find_element(:id, 'keyUp').location_once_scrolled_into_view
 
-        expect(loc.x).to be >= 1
-        expect(loc.y).to be >= 0 # can be 0 if scrolled to the top
-      end
+      expect(loc.x).to be >= 1
+      expect(loc.y).to be >= 0 # can be 0 if scrolled to the top
     end
   end
 
-  # Marionette BUG:
-  # GET /session/f7082a32-e685-2843-ad2c-5bb6f376dac5/element/b6ff4468-ed6f-7c44-be4b-ca5a3ea8bf26/size
-  # did not match a known command"
-  not_compliant_on :browser => :marionette do
-    it "should get size" do
-      driver.navigate.to url_for("xhtmlTest.html")
-      size = driver.find_element(:class, "header").size
+  it "should get size" do
+    driver.navigate.to url_for("xhtmlTest.html")
+    size = driver.find_element(:class, "header").size
 
-      expect(size.width).to be > 0
-      expect(size.height).to be > 0
-    end
+    expect(size.width).to be > 0
+    expect(size.height).to be > 0
   end
 
   compliant_on :driver => [:ie, :chrome, :edge] do # Firefox w/native events: issue 1771
@@ -243,5 +235,4 @@
 
     expect(body.hash).to eq(xbody.hash)
   end
-
 end