From 8527ced253449d1186d9154a87ba57f7ee859ada Mon Sep 17 00:00:00 2001
From: Titus Fortner <titusfortner@gmail.com>
Date: Sun, 13 Mar 2016 20:42:54 -0500
Subject: [PATCH] rb - un-guard marionette tests

---
 .../webdriver/firefox/marionette_spec.rb      | 48 +++++++++----------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/rb/spec/integration/selenium/webdriver/firefox/marionette_spec.rb b/rb/spec/integration/selenium/webdriver/firefox/marionette_spec.rb
index a928bf087fb19..0b54269492906 100644
--- a/rb/spec/integration/selenium/webdriver/firefox/marionette_spec.rb
+++ b/rb/spec/integration/selenium/webdriver/firefox/marionette_spec.rb
@@ -141,35 +141,33 @@ def restart_remote_server(path = nil)
 
       compliant_on :browser => :marionette do
         # These pass in isolation, but can not run in suite due to https://github.com/SeleniumHQ/selenium/issues/1150
-        not_compliant_on :driver => :remote do
-          context "when designated firefox binary does not include Marionette" do
-            let(:message) { /Marionette is not supported in Firefox Version \d\d/ }
-
-            before do
-              unless ENV['PRE_MARIONETTE_BINARY']
-                pending "Set ENV['PRE_MARIONETTE_BINARY'] to test features on firefox versions without marionette"
-              end
+        context "when designated firefox binary does not include Marionette" do
+          let(:message) { /Marionette is not supported in Firefox Version \d\d/ }
+
+          before do
+            unless ENV['PRE_MARIONETTE_BINARY']
+              pending "Set ENV['PRE_MARIONETTE_BINARY'] to test features on firefox versions without marionette"
             end
+          end
 
-            it "Raises Wires Exception when setting marionette option in capabilities" do
-              begin
-                caps = Selenium::WebDriver::Remote::Capabilities.firefox(:marionette => true,
-                                                                         :firefox_binary => ENV['PRE_MARIONETTE_BINARY'])
-                @opt.merge!(:desired_capabilities => caps)
-                expect { Selenium::WebDriver.for :firefox, @opt }.to raise_exception Error::WebDriverError, message
-              ensure
-                Firefox::Binary.reset_path!
-              end
+          it "Raises Wires Exception when setting marionette option in capabilities" do
+            begin
+              caps = Selenium::WebDriver::Remote::Capabilities.firefox(:marionette => true,
+                                                                       :firefox_binary => ENV['PRE_MARIONETTE_BINARY'])
+              @opt.merge!(:desired_capabilities => caps)
+              expect { Selenium::WebDriver.for :firefox, @opt }.to raise_exception Error::WebDriverError, message
+            ensure
+              Firefox::Binary.reset_path!
             end
+          end
 
-            it "Raises Wires Exception when setting marionette option in driver initialization" do
-              begin
-                caps = Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_binary => ENV['PRE_MARIONETTE_BINARY'])
-                @opt.merge!(:marionette => true, :desired_capabilities => caps)
-                expect { Selenium::WebDriver.for :firefox, @opt }.to raise_exception Error::WebDriverError, message
-              ensure
-                Firefox::Binary.reset_path!
-              end
+          it "Raises Wires Exception when setting marionette option in driver initialization" do
+            begin
+              caps = Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_binary => ENV['PRE_MARIONETTE_BINARY'])
+              @opt.merge!(:marionette => true, :desired_capabilities => caps)
+              expect { Selenium::WebDriver.for :firefox, @opt }.to raise_exception Error::WebDriverError, message
+            ensure
+              Firefox::Binary.reset_path!
             end
           end
         end