frameworks-capybara 0.2.4 → 0.2.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    frameworks-capybara (0.2.4)
+    frameworks-capybara (0.2.5)
       capybara (>= 1.0.0)
       capybara-celerity
       capybara-mechanize (>= 0.3.0)

data/README.rdoc

@@ -37,6 +37,7 @@ The following environment variables can be set to configure your tests:
   REMOTE_URL - URL of remote Selenium-Webdriver server e.g. http://yourremotehost:4444/wd/hub
   FIREFOX_PROFILE - specify a firefox profile to use when running in-browser tests (local or remote)
   FIREFOX_PREFS - specify a json string of additional preferences e.g. FIREFOX_PREFS='{"javascript.enabled": false}'
+  CREATE_NEW_FF_PROFILE - create a new Firefox profile with name provided by FIREFOX_PROFILE 
   CELERITY_JS_ENABLED (string - 'true', 'false') - determines whether Celerity (HTMLUnit) attempts to execute javascript 
   XVFB - (string - 'true', 'false') - determines whether XVFB is used to run browser (i.e. headless Firefox on *nix platform)
   FW_CERT_LOCATION - path to client certificate (combined pem)

data/lib/frameworks/capybara.rb

@@ -14,7 +14,7 @@ class CapybaraSetup
   attr_reader :driver
 
   def initialize
-    capybara_opts = {:environment => ENV['ENVIRONMENT'], :proxy => ENV['PROXY_URL'], :profile => ENV['FIREFOX_PROFILE'], :browser => ENV['BROWSER'], :javascript_enabled => ENV['CELERITY_JS_ENABLED'], :proxy_on => ENV['PROXY_ON'],:url => ENV['REMOTE_URL'], :chrome_switches => ENV['CHROME_SWITCHES'], :firefox_prefs => ENV['FIREFOX_PREFS']}
+    capybara_opts = {:environment => ENV['ENVIRONMENT'], :proxy => ENV['PROXY_URL'], :profile => ENV['FIREFOX_PROFILE'], :browser => ENV['BROWSER'], :javascript_enabled => ENV['CELERITY_JS_ENABLED'], :proxy_on => ENV['PROXY_ON'],:url => ENV['REMOTE_URL'], :chrome_switches => ENV['CHROME_SWITCHES'], :firefox_prefs => ENV['FIREFOX_PREFS'], :create_new_ff_profile => ENV['CREATE_NEW_FF_PROFILE']}
     selenium_remote_opts = {:platform => ENV['PLATFORM'], :browser_name => ENV['REMOTE_BROWSER'], :version => ENV['REMOTE_BROWSER_VERSION'], :url => ENV['REMOTE_URL']}
     custom_opts = {:job_name => ENV['SAUCE_JOB_NAME'], :max_duration => ENV['SAUCE_MAX_DURATION']}
 
@@ -65,7 +65,10 @@ class CapybaraSetup
   def register_selenium_driver(opts,remote_opts,custom_opts)
     Capybara.register_driver :selenium do |app|
 
-      opts[:profile] = create_profile(opts[:profile],  opts[:firefox_prefs]) if(opts[:profile])
+      if opts[:create_new_ff_profile] || opts[:profile]
+        opts[:profile] = create_profile(opts[:profile],  opts[:create_new_ff_profile], opts[:firefox_prefs])
+      end
+
       opts[:switches] = [opts.delete(:chrome_switches)] if(opts[:chrome_switches])
 
       if opts[:browser] == :remote
@@ -82,7 +85,7 @@ class CapybaraSetup
         opts[:http_client] = client
       end
 
-      clean_opts(opts, :proxy, :proxy_on, :firefox_prefs)
+      clean_opts(opts, :proxy, :proxy_on, :firefox_prefs, :create_new_ff_profile)
       Capybara::Selenium::Driver.new(app,opts)
     end   
     :selenium
@@ -97,7 +100,7 @@ class CapybaraSetup
     Selenium::WebDriver::Proxy.new(:http => opts[:proxy]) if opts[:proxy] && opts[:proxy_on] != 'false' #set proxy on client connection if required, note you may use ENV['PROXY_URL'] for setting in browser (ff profile) but not for client conection, hence allow for PROXY_ON=false
   end
 
-  def create_profile(profile_name, additional_prefs)
+  def create_profile(profile_name = nil, new_profile = nil, additional_prefs = nil)
     additional_prefs = JSON.parse(additional_prefs) if additional_prefs
     if(profile_name == 'BBC_INTERNAL')
       profile = Selenium::WebDriver::Firefox::Profile.new
@@ -108,10 +111,8 @@ class CapybaraSetup
       profile["network.proxy.http_port"] = 80
       profile["network.proxy.ssl_port"] = 80
       profile.native_events = true
-    elsif(profile_name == 'DISABLED_REFERER')
+    elsif new_profile
       profile = Selenium::WebDriver::Firefox::Profile.new
-      profile["network.http.sendRefererHeader"] = 0
-      profile.native_events = true
     else
       profile = Selenium::WebDriver::Firefox::Profile.from_name profile_name
       profile.native_events = true

data/lib/version.rb

@@ -1,4 +1,4 @@
 module FrameworksCapybara
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end
 

data/spec/frameworks_capybara_spec.rb

@@ -136,24 +136,6 @@ describe CapybaraSetup do
         it_behaves_like "Selenium Driver Options Array"
       end
 
-
-      context "with Selenium driver and programtically created profile with referer disabled" do
-        before do
-          ENV['BROWSER'] = 'firefox'
-          ENV['FIREFOX_PROFILE'] = 'DISABLED_REFERER'
-        end
-
-        it "should be initialized correctly" do 
-          Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
-          Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :firefox
-          Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.http.sendRefererHeader'].should == 0
-        end
-        it_behaves_like "Selenium Driver Options Array"
-      end
-
       context "with Selenium driver and custom chrome options" do
         before do
           ENV['BROWSER'] = 'chrome'
@@ -279,7 +261,7 @@ describe CapybaraSetup do
         before do
           ENV['BROWSER'] = 'firefox'
           ENV['FIREFOX_PROFILE'] = 'default'
-          ENV['FIREFOX_PREFS'] = '{"javascript.enabled": false}'
+          ENV['FIREFOX_PREFS'] = '{"javascript.enabled":false}'
         end
 
         it "should be initialized correctly" do 
@@ -294,6 +276,24 @@ describe CapybaraSetup do
       end
       
 
+      context "with Selenium driver and new profile and custom prefs" do
+        before do
+          ENV['BROWSER'] = 'firefox'
+          ENV['CREATE_NEW_FF_PROFILE'] = 'true'
+          ENV['FIREFOX_PREFS'] = '{"javascript.enabled":false}'
+        end
+
+        it "should be initialized correctly" do 
+          Capybara.delete_session
+          CapybaraSetup.new.driver.should == :selenium
+          Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
+          Capybara.current_session.driver.options[:browser].should == :firefox
+          Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should == false
+        end
+        it_behaves_like "Selenium Driver Options Array"
+      end
+      
       context "with Remote Selenium driver and specified Chrome Switches" do
         before do
           ENV['BROWSER'] = 'remote'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frameworks-capybara
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - matt robbins
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-10 00:00:00 +01:00
+date: 2012-05-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency