rb - update support and specs for latest version of Edge driver

Author: titusfortner

rb/lib/selenium/webdriver/remote/bridge.rb

@@ -158,12 +158,12 @@ def getAlert
         end
 
         def acceptAlert
-          command = capabilities.browser_name == 'MicrosoftEdge' ? :acceptAlertW3C : :acceptAlert
+          command = :acceptAlert
           execute command
         end
 
         def dismissAlert
-          command = capabilities.browser_name == 'MicrosoftEdge' ? :dismissAlertW3C : :dismissAlert
+          command = :dismissAlert
           execute command
         end
 
@@ -173,7 +173,7 @@ def setAlertValue(keys)
         end
 
         def getAlertText
-          command = capabilities.browser_name == 'MicrosoftEdge' ? :getAlertTextW3C : :getAlertText
+          command = :getAlertText
           execute command
         end
 

rb/spec/integration/selenium/webdriver/driver_spec.rb

@@ -25,12 +25,9 @@
     expect(driver.title).to eq("XHTML Test Page")
   end
 
-  # Edge does not yet support {GET} /session/{sessionId}/Source
-  not_compliant_on :browser => :edge do
-    it "should get the page source" do
-      driver.navigate.to url_for("xhtmlTest.html")
-      expect(driver.page_source).to match(%r[<title>XHTML Test Page</title>]i)
-    end
+  it "should get the page source" do
+    driver.navigate.to url_for("xhtmlTest.html")
+    expect(driver.page_source).to match(%r[<title>XHTML Test Page</title>]i)
   end
 
   not_compliant_on :browser => :safari do
@@ -108,28 +105,22 @@
       expect(driver.find_element(:tag_name, 'div').attribute("class")).to eq("navigation")
     end
 
-    # Edge does not yet support {POST} /session/{sessionId}/element/{elementId}/element
-    not_compliant_on :browser => :edge do
-      it "should find child element" do
-        driver.navigate.to url_for("nestedElements.html")
+    it "should find child element" do
+      driver.navigate.to url_for("nestedElements.html")
 
-        element = driver.find_element(:name, "form2")
-        child   = element.find_element(:name, "selectomatic")
+      element = driver.find_element(:name, "form2")
+      child   = element.find_element(:name, "selectomatic")
 
-        expect(child.attribute("id")).to eq("2")
-      end
+      expect(child.attribute("id")).to eq("2")
     end
 
-    # Edge does not yet support {POST} /session/{sessionId}/element/{elementId}/elements
-    not_compliant_on :browser => :edge do
-      it "should find child element by tag name" do
-        driver.navigate.to url_for("nestedElements.html")
+    it "should find child element by tag name" do
+      driver.navigate.to url_for("nestedElements.html")
 
-        element = driver.find_element(:name, "form2")
-        child   = element.find_element(:tag_name, "select")
+      element = driver.find_element(:name, "form2")
+      child   = element.find_element(:tag_name, "select")
 
-        expect(child.attribute("id")).to eq("2")
-      end
+      expect(child.attribute("id")).to eq("2")
     end
 
     it "should raise on nonexistant element" do
@@ -161,109 +152,106 @@
       driver.find_elements(:css, 'p')
     end
 
-    # Edge does not yet support {POST} /session/{sessionId}/element/{elementId}/elements
-    not_compliant_on :browser => :edge do
-      it "should find children by field name" do
-        driver.navigate.to url_for("nestedElements.html")
-        element = driver.find_element(:name, "form2")
-        children = element.find_elements(:name, "selectomatic")
-        expect(children.size).to eq(2)
-      end
+    it "should find children by field name" do
+      driver.navigate.to url_for("nestedElements.html")
+      element = driver.find_element(:name, "form2")
+      children = element.find_elements(:name, "selectomatic")
+      expect(children.size).to eq(2)
     end
   end
 
-    describe "execute script" do
-      it "should return strings" do
-        driver.navigate.to url_for("xhtmlTest.html")
-        expect(driver.execute_script("return document.title;")).to eq("XHTML Test Page")
-      end
-
-      it "should return numbers" do
-        driver.navigate.to url_for("xhtmlTest.html")
-        expect(driver.execute_script("return document.title.length;")).to eq("XHTML Test Page".length)
-      end
+  describe "execute script" do
+    it "should return strings" do
+      driver.navigate.to url_for("xhtmlTest.html")
+      expect(driver.execute_script("return document.title;")).to eq("XHTML Test Page")
+    end
 
-      it "should return elements" do
-        driver.navigate.to url_for("xhtmlTest.html")
-        element = driver.execute_script("return document.getElementById('id1');")
-        expect(element).to be_kind_of(WebDriver::Element)
-        expect(element.text).to eq("Foo")
-      end
+    it "should return numbers" do
+      driver.navigate.to url_for("xhtmlTest.html")
+      expect(driver.execute_script("return document.title.length;")).to eq("XHTML Test Page".length)
+    end
 
-      not_compliant_on :browser => [:android] do
-        it "should unwrap elements in deep objects" do
-          driver.navigate.to url_for("xhtmlTest.html")
-          result = driver.execute_script(<<-SCRIPT)
-          var e1 = document.getElementById('id1');
-          var body = document.body;
-
-          return {
-            elements: {'body' : body, other: [e1] }
-          };
-          SCRIPT
-
-          expect(result).to be_kind_of(Hash)
-          expect(result['elements']['body']).to be_kind_of(WebDriver::Element)
-          expect(result['elements']['other'].first).to be_kind_of(WebDriver::Element)
-        end
-      end
+    it "should return elements" do
+      driver.navigate.to url_for("xhtmlTest.html")
+      element = driver.execute_script("return document.getElementById('id1');")
+      expect(element).to be_kind_of(WebDriver::Element)
+      expect(element.text).to eq("Foo")
+    end
 
-      it "should return booleans" do
+    not_compliant_on :browser => [:android] do
+      it "should unwrap elements in deep objects" do
         driver.navigate.to url_for("xhtmlTest.html")
-        expect(driver.execute_script("return true;")).to eq(true)
+        result = driver.execute_script(<<-SCRIPT)
+        var e1 = document.getElementById('id1');
+        var body = document.body;
+
+        return {
+          elements: {'body' : body, other: [e1] }
+        };
+        SCRIPT
+
+        expect(result).to be_kind_of(Hash)
+        expect(result['elements']['body']).to be_kind_of(WebDriver::Element)
+        expect(result['elements']['other'].first).to be_kind_of(WebDriver::Element)
       end
+    end
 
-      it "should raise if the script is bad" do
-        driver.navigate.to url_for("xhtmlTest.html")
-        expect { driver.execute_script("return squiggle();") }.to raise_error
-      end
+    it "should return booleans" do
+      driver.navigate.to url_for("xhtmlTest.html")
+      expect(driver.execute_script("return true;")).to eq(true)
+    end
 
-      it "should return arrays" do
-        driver.navigate.to url_for("xhtmlTest.html")
-        expect(driver.execute_script('return ["zero", "one", "two"];')).to eq(%w[zero one two])
-      end
+    it "should raise if the script is bad" do
+      driver.navigate.to url_for("xhtmlTest.html")
+      expect { driver.execute_script("return squiggle();") }.to raise_error
+    end
 
-      it "should be able to call functions on the page" do
-        driver.navigate.to url_for("javascriptPage.html")
-        driver.execute_script("displayMessage('I like cheese');")
-        expect(driver.find_element(:id, "result").text.strip).to eq("I like cheese")
-      end
+    it "should return arrays" do
+      driver.navigate.to url_for("xhtmlTest.html")
+      expect(driver.execute_script('return ["zero", "one", "two"];')).to eq(%w[zero one two])
+    end
 
-      it "should be able to pass string arguments" do
-        driver.navigate.to url_for("javascriptPage.html")
-        expect(driver.execute_script("return arguments[0] == 'fish' ? 'fish' : 'not fish';", "fish")).to eq("fish")
-      end
+    it "should be able to call functions on the page" do
+      driver.navigate.to url_for("javascriptPage.html")
+      driver.execute_script("displayMessage('I like cheese');")
+      expect(driver.find_element(:id, "result").text.strip).to eq("I like cheese")
+    end
 
-      it "should be able to pass boolean arguments" do
-        driver.navigate.to url_for("javascriptPage.html")
-        expect(driver.execute_script("return arguments[0] == true;", true)).to eq(true)
-      end
+    it "should be able to pass string arguments" do
+      driver.navigate.to url_for("javascriptPage.html")
+      expect(driver.execute_script("return arguments[0] == 'fish' ? 'fish' : 'not fish';", "fish")).to eq("fish")
+    end
 
-      it "should be able to pass numeric arguments" do
-        driver.navigate.to url_for("javascriptPage.html")
-        expect(driver.execute_script("return arguments[0] == 1 ? 1 : 0;", 1)).to eq(1)
-      end
+    it "should be able to pass boolean arguments" do
+      driver.navigate.to url_for("javascriptPage.html")
+      expect(driver.execute_script("return arguments[0] == true;", true)).to eq(true)
+    end
 
-      it "should be able to pass null arguments" do
-        driver.navigate.to url_for("javascriptPage.html")
-        expect(driver.execute_script("return arguments[0];", nil)).to eq(nil)
-      end
+    it "should be able to pass numeric arguments" do
+      driver.navigate.to url_for("javascriptPage.html")
+      expect(driver.execute_script("return arguments[0] == 1 ? 1 : 0;", 1)).to eq(1)
+    end
 
-      it "should be able to pass array arguments" do
-        driver.navigate.to url_for("javascriptPage.html")
-        expect(driver.execute_script("return arguments[0];", [1, '2', 3])).to eq([1, '2', 3])
-      end
+    it "should be able to pass null arguments" do
+      driver.navigate.to url_for("javascriptPage.html")
+      expect(driver.execute_script("return arguments[0];", nil)).to eq(nil)
+    end
 
-      it "should be able to pass element arguments" do
-        driver.navigate.to url_for("javascriptPage.html")
-        button = driver.find_element(:id, "plainButton")
-        expect(driver.execute_script("arguments[0]['flibble'] = arguments[0].getAttribute('id'); return arguments[0]['flibble'];", button)).to eq("plainButton")
-      end
+    it "should be able to pass array arguments" do
+      driver.navigate.to url_for("javascriptPage.html")
+      expect(driver.execute_script("return arguments[0];", [1, '2', 3])).to eq([1, '2', 3])
+    end
 
-      it "should be able to pass in multiple arguments" do
-        driver.navigate.to url_for("javascriptPage.html")
-        expect(driver.execute_script("return arguments[0] + arguments[1];", "one", "two")).to eq("onetwo")
-      end
+    it "should be able to pass element arguments" do
+      driver.navigate.to url_for("javascriptPage.html")
+      button = driver.find_element(:id, "plainButton")
+      expect(driver.execute_script("arguments[0]['flibble'] = arguments[0].getAttribute('id'); return arguments[0]['flibble'];", button)).to eq("plainButton")
+    end
+
+    it "should be able to pass in multiple arguments" do
+      driver.navigate.to url_for("javascriptPage.html")
+      expect(driver.execute_script("return arguments[0] + arguments[1];", "one", "two")).to eq("onetwo")
+    end
   end
 
   not_compliant_on :browser => [:iphone, :android, :phantomjs] do
@@ -283,7 +271,7 @@
         expect(result).to eq(3)
       end
 
-      # TODO - File bug with Microsoft; this command returns status 21, should return status 28
+      # TODO - File Edge bug; this command returns status 21, should return status 28
       it "times out if the callback is not invoked" do
         expect {
           # Script is expected to be async and explicitly callback, so this should timeout.

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

@@ -26,8 +26,6 @@
     driver.find_element(:id, "imageButton").click
   end
 
-  # TODO: File bug with Microsoft Edge documentation says this isn't supported, but it is
-  # {POST} /session/{sessionId}/element/{id}/submit
   it "should submit" do
     driver.navigate.to url_for("formPage.html")
     driver.find_element(:id, "submitButton").submit
@@ -71,7 +69,7 @@
     expect(driver.find_element(:id, "withText").attribute("rows")).to eq("5")
   end
 
-  # TODO - File bug with Microsoft, this should return nil, but throws an error
+  # TODO - File Edge bug, this should return nil, but throws an error
   # Selenium::WebDriver::Error::UnknownError: unknown error
   it "should return nil for non-existent attributes" do
     driver.navigate.to url_for("formPage.html")
@@ -135,19 +133,15 @@
     end
   end
 
-  # TODO - File bug with Microsoft, this command hangs
-  # GET session/22A56752-2F60-45FB-B721-0CEB42CA77DF/element/4c3ee8d6-4ed4-492d-98c7-d8538366f7be/size
-  not_compliant_on :browser => :edge 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] do # Firefox w/native events: issue 1771
+  compliant_on :driver => [:ie, :chrome, :edge] do # Firefox w/native events: issue 1771
     it "should drag and drop" do
       driver.navigate.to url_for("dragAndDropTest.html")
 
@@ -207,16 +201,13 @@
     expect(body.hash).to eq(xbody.hash)
   end
 
-  # Edge does not yet support xpath location for {POST} /session/{sessionId}/elements
-  not_compliant_on :browser => :edge do
-    it "should return the same #hash for equal elements when found by Driver#find_elements" do
-      driver.navigate.to url_for("simpleTest.html")
+  it "should return the same #hash for equal elements when found by Driver#find_elements" do
+    driver.navigate.to url_for("simpleTest.html")
 
-      body = driver.find_elements(:tag_name, 'body').fetch(0)
-      xbody = driver.find_elements(:xpath, "//body").fetch(0)
+    body = driver.find_elements(:tag_name, 'body').fetch(0)
+    xbody = driver.find_elements(:xpath, "//body").fetch(0)
 
-      expect(body.hash).to eq(xbody.hash)
-    end
+    expect(body.hash).to eq(xbody.hash)
   end
 
 end