Merged pull request #12 from raelik/capture_network_traffic.

Support for setting captureNetworkTraffic option on selenium.start_new_browser_session method
sauce-archives · Apr 29, 2011 · fc8a369 · fc8a369
2 parents af34522 + a6efdd5
commit fc8a369
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/lib/sauce/config.rb b/lib/sauce/config.rb
@@ -23,7 +23,8 @@ class Config
         :browser => "firefox",
         :browser_version => "3.6.",
         :job_name => "Unnamed Ruby job",
-        :local_application_port => "3001"
+        :local_application_port => "3001",
+        :capture_traffic => false
     }
 
     ENVIRONMENT_VARIABLES = %w{SAUCE_HOST SAUCE_PORT SAUCE_BROWSER_URL SAUCE_USERNAME

diff --git a/lib/sauce/integrations.rb b/lib/sauce/integrations.rb
@@ -21,7 +21,7 @@ def self.inherited(subclass)
             end
             if Sauce::Utilities::RailsServer.is_rails_app?
               @@server = Sauce::Utilities::RailsServer.new
-              @@server.start
+              @@server.start_new_browser_session(:captureNetworkTraffic => config.capture_traffic?)
             end
           end
         end
@@ -54,7 +54,7 @@ def execute(*args)
                 @selenium = Sauce::Selenium.new({:os => os, :browser => browser, :browser_version => version,
                                                 :job_name => "#{description}"})
               end
-              @selenium.start
+              @selenium.start_new_browser_session(:captureNetworkTraffic => config.capture_traffic?)
               super(*args)
               @selenium.stop
             end
@@ -95,7 +95,7 @@ def self.included(othermod)
                 @selenium = Sauce::Selenium.new({:os => os, :browser => browser, :browser_version => version,
                                                 :job_name => "#{description}"})
               end
-              @selenium.start
+              @selenium.start_new_browser_session(:captureNetworkTraffic => config.capture_traffic?)
               begin
                 the_test.run
               ensure
@@ -122,7 +122,7 @@ def self.included(othermod)
           if ::RSpec.configuration.settings[:files_to_run].any? {|file| file =~ /spec\/selenium\//} &&
             Sauce::Utilities::RailsServer.is_rails_app?
             @@server = Sauce::Utilities::RailsServer.new
-            @@server.start
+            @@server.start_new_browser_session(:captureNetworkTraffic => config.capture_traffic?)
           end
         end
         ::RSpec.configuration.after :suite do
@@ -162,7 +162,7 @@ def run(*args, &blk)
           unless ENV['TEST_ENV_NUMBER'].to_i > 1
             if Sauce::Utilities::RailsServer.is_rails_app?
               @@server = Sauce::Utilities::RailsServer.new
-              @@server.start
+              @@server.start_new_browser_session(:captureNetworkTraffic => config.capture_traffic?)
               at_exit do
                 @@server.stop
               end
@@ -195,9 +195,9 @@ def run(*args, &blk)
               @browser = Sauce::Selenium.new(options)
             end
             if self.class.selenium_flags
-              @browser.start_new_browser_session(self.class.selenium_flags)
+              @browser.start_new_browser_session(self.class.selenium_flags.merge(:captureNetworkTraffic => config.capture_traffic?))
             else
-              @browser.start_new_browser_session
+              @browser.start_new_browser_session(:captureNetworkTraffic => config.capture_traffic?)
             end
             super(*args, &blk)
             @browser.stop