rb - change w3c references to wires in spec guards

Author: titusfortner

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

@@ -26,7 +26,7 @@
   end
 
   # Marionette BUG - AutomatedTester: "I need to add pagesource back and add it to the spec"
-  not_compliant_on :w3c => true do
+  not_compliant_on :driver => :wires 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)
@@ -215,7 +215,7 @@
     end
 
     # Marionette BUG - Not finding local javascript for execution
-    not_compliant_on :w3c => true do
+    not_compliant_on :driver => :wires do
       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');")

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

@@ -27,7 +27,7 @@
   end
 
   # Marionette BUG - AutomatedTester: "known bug with execute script"
-  not_compliant_on :w3c => true do
+  not_compliant_on :driver => :wires do
     it "should submit" do
       driver.navigate.to url_for("formPage.html")
       driver.find_element(:id, "submitButton").submit
@@ -54,7 +54,7 @@
   # PhantomJS on windows issue: https://github.com/ariya/phantomjs/issues/10993
   not_compliant_on({:browser => [:android, :iphone, :safari, :edge]},
                    {:browser => :phantomjs, :platform => :windows},
-                   {:w3c => true}) do
+                   {:driver => :wires}) do
     it "should handle file uploads" do
       driver.navigate.to url_for("formPage.html")
 
@@ -132,7 +132,7 @@
   end
 
   # Location not currently supported in Spec, but should be?
-  not_compliant_on :w3c => true do
+  not_compliant_on :driver => :wires do
     it "should get location" do
       driver.navigate.to url_for("xhtmlTest.html")
       loc = driver.find_element(:class, "header").location
@@ -155,7 +155,7 @@
   # 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 :w3c => true do
+  not_compliant_on :driver => :wires do
     it "should get size" do
       driver.navigate.to url_for("xhtmlTest.html")
       size = driver.find_element(:class, "header").size

rb/spec/integration/selenium/webdriver/keyboard_spec.rb

@@ -24,7 +24,7 @@ module WebDriver
 
     # Marionette BUG - Interactions Not Supported
     not_compliant_on({:browser => [:chrome, :android, :iphone, :safari]},
-                     {:w3c => true}) do
+                     {:driver => :wires}) do
       describe Keyboard do
         it "sends keys to the active element" do
           driver.navigate.to url_for("bodyTypingTest.html")

rb/spec/integration/selenium/webdriver/mouse_spec.rb

@@ -26,7 +26,7 @@ module WebDriver
 
       # Marionette BUG - Interactions Not Supported
       not_compliant_on({:browser => [:android, :iphone, :safari]},
-                       {:w3c => true}) do
+                       {:driver => :wires}) do
         it "clicks an element" do
           driver.navigate.to url_for("formPage.html")
           driver.mouse.click driver.find_element(:id, "imageButton")

rb/spec/integration/selenium/webdriver/options_spec.rb

@@ -24,7 +24,7 @@ module WebDriver
     describe Options do
 
       # Not supported in W3C Spec
-      not_compliant_on :w3c => true do
+      not_compliant_on :driver => :wires do
         describe 'logs' do
           compliant_on :driver => [:firefox] do
             it 'can fetch available log types' do
@@ -86,7 +86,7 @@ module WebDriver
 
           # Marionette BUG - Failed to convert expiry to Date
           not_compliant_on({:browser => [:ie, :android, :iphone, :safari]},
-                           {:w3c => true}) do
+                           {:driver => :wires}) do
             it "should use DateTime for expires" do
               driver.navigate.to url_for("xhtmlTest.html")
 

rb/spec/integration/selenium/webdriver/spec_support/guards.rb

@@ -76,8 +76,7 @@ def current_env
               :driver         => GlobalTestEnv.driver,
               :platform       => Platform.os,
               :native         => GlobalTestEnv.native_events?,
-              :window_manager => !!ENV['DESKTOP_SESSION'],
-              :w3c            => GlobalTestEnv.driver == :wires
+              :window_manager => !!ENV['DESKTOP_SESSION']
             }
           end
 

rb/spec/integration/selenium/webdriver/target_locator_spec.rb

@@ -30,7 +30,7 @@
   # Marionette Bug -
   # POST /session/f7082a32-e685-2843-ad2c-5bb6f376dac5/element/active
   # did not match a known command
-  not_compliant_on :w3c => true do
+  not_compliant_on :driver => :wires do
     it "should find the active element" do
       driver.navigate.to url_for("xhtmlTest.html")
       expect(driver.switch_to.active_element).to be_an_instance_of(WebDriver::Element)
@@ -55,7 +55,7 @@
 
   # Marionette Bug - Marionette Error: switchToParentFrame
   not_compliant_on({:browser => [:safari, :phantomjs]},
-                   {:w3c => true}) do
+                   {:driver => :wires}) do
     it "should switch to parent frame" do
       driver.navigate.to url_for("iframes.html")
 
@@ -126,7 +126,7 @@
     end
 
     # Marionette BUG: Automatically switches browsing context to new window when it opens.
-    not_compliant_on :w3c => true do
+    not_compliant_on :driver => :wires do
       it "should close current window when more than two windows exist" do
         driver.navigate.to url_for("xhtmlTest.html")
         driver.find_element(:link, "Create a new anonymous window").click
@@ -248,7 +248,7 @@
       # Says message should be an array (I think), but we're getting
       # InvalidArgumentError: 'message' not a string
       # When trying a string, error: keysToSend.join is not a function
-      not_compliant_on :w3c => true do
+      not_compliant_on :driver => :wires do
         it "allows the user to set the value of a prompt" do
           driver.navigate.to url_for("alerts.html")
           driver.find_element(:id => "prompt").click
@@ -293,7 +293,7 @@
         # Marionette BUG - Allows driver calls with alert present
         # Spec says: "If the subsequent requested command is not one listed
         # in this chapter, an unexpected alert open error will be returned."
-        not_compliant_on :w3c => true do
+        not_compliant_on :driver => :wires do
 
           it "raises an UnhandledAlertError if an alert has not been dealt with" do
             driver.navigate.to url_for("alerts.html")

rb/spec/integration/selenium/webdriver/timeout_spec.rb

@@ -63,7 +63,7 @@
       expect(driver.find_elements(:class_name => "redbox")).to be_empty
     end
 
-    not_compliant_on(:w3c => true, :platform => :windows) do
+    not_compliant_on(:driver => :wires, :platform => :windows) do
       it "should return after first attempt to find many after disabling implicit waits" do
         add = driver.find_element(:id => "adder")
 

rb/spec/integration/selenium/webdriver/window_spec.rb

@@ -50,7 +50,7 @@ module WebDriver
         # Marionette BUG -
         # GET /session/2146a9d2-690a-4844-a5f4-e38b02d670c3/window/:window_handle/position
         # did not match a known command
-        not_compliant_on :w3c => true do
+        not_compliant_on :driver => :wires do
           it "gets the position of the current window" do
             pos = driver.manage.window.position