frameworks-capybara 0.2.3 → 0.2.4

data/Gemfile

@@ -1,3 +1,7 @@
 source :rubygems
 
+platforms :jruby do
+  gem "jruby-openssl"
+end
+
 gemspec

data/Gemfile.lock

@@ -1,16 +1,19 @@
 PATH
   remote: .
   specs:
-    frameworks-capybara (0.2.3)
+    frameworks-capybara (0.2.4)
       capybara (>= 1.0.0)
       capybara-celerity
       capybara-mechanize (>= 0.3.0)
+      cucumber (>= 0.10.5)
+      json
       w3c_validators
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.7)
+    addressable (2.2.8)
+    bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
     capybara (1.1.2)
       mime-types (>= 1.16)
@@ -40,7 +43,9 @@ GEM
     ffi (1.0.11)
     gherkin (2.9.3)
       json (>= 1.4.6)
-    json (1.6.6)
+    jruby-openssl (0.7.6.1)
+      bouncy-castle-java (>= 1.5.0146.1)
+    json (1.7.0)
     libwebsocket (0.1.3)
       addressable
     mechanize (2.4)
@@ -52,7 +57,7 @@ GEM
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (~> 0.0, >= 0.0.9)
     mime-types (1.18)
-    multi_json (1.3.2)
+    multi_json (1.3.4)
     net-http-digest_auth (1.2)
     net-http-persistent (2.6)
     nokogiri (1.5.2)
@@ -88,10 +93,11 @@ GEM
       nokogiri (~> 1.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
-  cucumber (>= 0.10.5)
   frameworks-capybara!
+  jruby-openssl
   rake
   rspec (>= 1.0.0)

data/README.rdoc

@@ -36,6 +36,7 @@ The following environment variables can be set to configure your tests:
   REMOTE_BROWSER_VERSION - used when specifying remote test on a grid the provides a choice of browser versions for a given browser
   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}'
   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/frameworks-capybara.gemspec

@@ -22,9 +22,10 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency("capybara", [">=1.0.0"])
   s.add_runtime_dependency("capybara-mechanize", [">=0.3.0"])
+  s.add_runtime_dependency("json")
   s.add_runtime_dependency("capybara-celerity")
   s.add_runtime_dependency("w3c_validators")
-  s.add_development_dependency("cucumber", [">= 0.10.5"])
+  s.add_runtime_dependency("cucumber", [">= 0.10.5"])
   s.add_development_dependency("rake")
   s.add_development_dependency("rspec", [">=1.0.0"])
 

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']}
+    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']}
     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']}
 
@@ -27,6 +27,7 @@ class CapybaraSetup
     Capybara.run_server = false #Disable rack server
 
     [capybara_opts, selenium_remote_opts, custom_opts].each do |opts| #delete nil options and environment (which is only used for validation)
+    
       opts.delete_if {|k,v| (v.nil? or k == :environment)}
     end
 
@@ -64,7 +65,7 @@ class CapybaraSetup
   def register_selenium_driver(opts,remote_opts,custom_opts)
     Capybara.register_driver :selenium do |app|
 
-      opts[:profile] = create_profile(opts[:profile]) if(opts[:profile])
+      opts[:profile] = create_profile(opts[:profile],  opts[:firefox_prefs]) if(opts[:profile])
       opts[:switches] = [opts.delete(:chrome_switches)] if(opts[:chrome_switches])
 
       if opts[:browser] == :remote
@@ -80,7 +81,8 @@ class CapybaraSetup
         opts[:desired_capabilities] = caps
         opts[:http_client] = client
       end
-      clean_opts(opts, :proxy, :proxy_on)
+
+      clean_opts(opts, :proxy, :proxy_on, :firefox_prefs)
       Capybara::Selenium::Driver.new(app,opts)
     end   
     :selenium
@@ -95,7 +97,8 @@ 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)
+  def create_profile(profile_name, additional_prefs)
+    additional_prefs = JSON.parse(additional_prefs) if additional_prefs
     if(profile_name == 'BBC_INTERNAL')
       profile = Selenium::WebDriver::Firefox::Profile.new
       profile["network.proxy.type"] = 1
@@ -113,6 +116,13 @@ class CapybaraSetup
       profile = Selenium::WebDriver::Firefox::Profile.from_name profile_name
       profile.native_events = true
     end
+
+    if additional_prefs
+      additional_prefs.each do |k, v|
+        profile[k] = v
+      end
+    end
+
     profile
   end
 

data/lib/frameworks/cucumber.rb

@@ -21,21 +21,24 @@ module Frameworks
       set_scheme
       if(environment =='sandbox')
         @base_url = @sandbox + @bbc_domain 
+        @ssl_base_url = @sslsandbox + @bbc_domain
         @static_base_url = @static_sandbox + @bbc_domain
       elsif (environment =='live' && ENV['WWW_LIVE']=='false')
         @base_url = @www_prefix.chop + @bbc_domain
+        @ssl_base_url = @ssl_prefix.chop + @bbc_domain
         @static_base_url = @static_prefix.chop + @bbci_domain
         @open_base_url = @open_prefix.chop + @bbc_domain
       elsif (environment.split('.')[0].include? 'pal') #address specific box
         @base_url = "#{scheme}://#{ENV['ENVIRONMENT']}" 
       else
         @base_url = @www_prefix + environment + @bbc_domain
+        @ssl_base_url = @ssl_prefix + environment + @bbc_domain
         @static_base_url = @static_prefix + environment + @bbci_domain
         @static_base_url = @static_prefix.chop + @bbci_domain if environment == 'live'
         @open_base_url = @open_prefix + environment + @bbc_domain
       end
       proxy = ENV['http_proxy'] || ENV['HTTP_PROXY'] 
-      @proxy_host = proxy.scan(/http:\/\/(.*):80/).to_s if proxy
+      @proxy_host = proxy.scan(/http:\/\/(.*):80/)[0][0] if proxy
     end
 
     def validate_online(src)
@@ -62,11 +65,13 @@ module Frameworks
     def set_scheme  
       ENV['SCHEME']=='https' ? scheme = 'https' : scheme = 'http'
       @www_prefix = "#{scheme}://www."
+      @ssl_prefix = "https://ssl."
       @static_prefix = "#{scheme}://static."
       @open_prefix = "#{scheme}://open."
       @bbc_domain = '.bbc.co.uk'
       @bbci_domain = '.bbci.co.uk'
       @sandbox = "#{scheme}://pal.sandbox.dev"
+      @sslsandbox = "https://ssl.sandbox.dev"
       @static_sandbox = "#{scheme}://static.sandbox.dev"
     end
 

data/lib/version.rb

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

data/spec/frameworks_capybara_spec.rb

@@ -18,7 +18,6 @@ shared_examples_for "Selenium Driver Options Array" do
   it "should contain no nil values for unset options" do
     #TODO: Test for nil elements in options - there shouldn't be any that we insert
     #i.e. anything in our ENV options should not end up being nil in Selenium
-
     Capybara.current_session.driver.options[:environment].should == nil
     Capybara.current_session.driver.options[:proxy].should == nil
     Capybara.current_session.driver.options[:proxy_on].should == nil
@@ -27,6 +26,7 @@ shared_examples_for "Selenium Driver Options Array" do
     Capybara.current_session.driver.options[:version].should == nil
     Capybara.current_session.driver.options[:job_name].should == nil
     Capybara.current_session.driver.options[:chrome_switches].should == nil
+    Capybara.current_session.driver.options[:firefox_prefs].should == nil
     Capybara.current_session.driver.options[:max_duration].should == nil
     Capybara.current_session.driver.options[:profile].should_not be_a_kind_of String
     Capybara.current_session.driver.options[:browser].should_not be_a_kind_of String
@@ -275,6 +275,25 @@ describe CapybaraSetup do
         it_behaves_like "Selenium Driver Options Array"
       end
 
+      context "with Selenium driver and additional firefox preferences" do
+        before do
+          ENV['BROWSER'] = 'firefox'
+          ENV['FIREFOX_PROFILE'] = 'default'
+          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'

data/spec/frameworks_cucumber_spec.rb

@@ -13,6 +13,7 @@ describe Frameworks::EnvHelper do
       ENV['ENVIRONMENT'] = 'sandbox'
       generate_base_urls
       @base_url.should == 'http://pal.sandbox.dev.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.sandbox.dev.bbc.co.uk'
       @static_base_url.should == 'http://static.sandbox.dev.bbc.co.uk'
     end
 
@@ -20,6 +21,7 @@ describe Frameworks::EnvHelper do
       ENV['ENVIRONMENT'] = 'foo'
       generate_base_urls
       @base_url.should == 'http://www.foo.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
       @static_base_url.should == 'http://static.foo.bbci.co.uk'
       @open_base_url.should == 'http://open.foo.bbc.co.uk'
     end
@@ -28,6 +30,7 @@ describe Frameworks::EnvHelper do
       ENV['ENVIRONMENT'] = 'live'
       generate_base_urls
       @base_url.should == 'http://www.live.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.live.bbc.co.uk'
       @static_base_url.should == 'http://static.bbci.co.uk'
       @open_base_url.should == 'http://open.live.bbc.co.uk'
     end
@@ -36,6 +39,7 @@ describe Frameworks::EnvHelper do
       ENV['ENVIRONMENT'] = 'fOo'
       generate_base_urls
       @base_url.should == 'http://www.foo.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
       @static_base_url.should == 'http://static.foo.bbci.co.uk'
       @open_base_url.should == 'http://open.foo.bbc.co.uk'
     end
@@ -44,6 +48,7 @@ describe Frameworks::EnvHelper do
       ENV['ENVIRONMENT'] = 'LiVe'
       generate_base_urls
       @base_url.should == 'http://www.live.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.live.bbc.co.uk'
       @static_base_url.should == 'http://static.bbci.co.uk'
       @open_base_url.should == 'http://open.live.bbc.co.uk'
     end
@@ -54,6 +59,7 @@ describe Frameworks::EnvHelper do
       ENV['WWW_LIVE'] = 'false' 
       generate_base_urls
       @base_url.should == 'http://www.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.bbc.co.uk'
       @static_base_url.should == 'http://static.bbci.co.uk'
       @open_base_url.should == 'http://open.bbc.co.uk'
     end
@@ -63,6 +69,7 @@ describe Frameworks::EnvHelper do
       ENV['ENVIRONMENT'] = 'foo'
       generate_base_urls
       @base_url.should == 'https://www.foo.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
       @static_base_url.should == 'https://static.foo.bbci.co.uk'
       @open_base_url.should == 'https://open.foo.bbc.co.uk'
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frameworks-capybara
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - matt robbins
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-30 00:00:00 +01:00
+date: 2012-05-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: capybara-celerity
+  name: json
   version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -75,12 +75,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: w3c_validators
+  name: capybara-celerity
   version_requirements: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: w3c_validators
+  version_requirements: *id005
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -92,11 +106,11 @@ dependencies:
         - 5
         version: 0.10.5
   name: cucumber
-  version_requirements: *id005
+  version_requirements: *id006
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -106,11 +120,11 @@ dependencies:
         - 0
         version: "0"
   name: rake
-  version_requirements: *id006
+  version_requirements: *id007
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -122,7 +136,7 @@ dependencies:
         - 0
         version: 1.0.0
   name: rspec
-  version_requirements: *id007
+  version_requirements: *id008
   prerelease: false
 description: Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches
 email: