frameworks-capybara 1.0.0 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGQ0MTAwMGMxNjgxNjc0MWZkYjdmNTBiYWJkOWM0N2MwMjRlNWY0Yw==
+    NmVhYjExYzE4MTljZTI0NDdlOGI2MDkxOTU2ZmRjM2U2OWVjNGRjZQ==
   data.tar.gz: !binary |-
-    ODdmYmQyZWE1NGUxODJmN2ZmZTI3YTNhNjI0NGExYzE0NGY3NWI3ZA==
+    N2QxY2MzMDI4NGEwZWIwYmI5MDU4ODQ5YzhmMzVlZmM4M2I1MGI0Ng==
 SHA512:
   metadata.gz: !binary |-
-    OTQxYjczYTljMThkMWVlZGRjNTMyNTJmZjQ2ZmY2NDQwMzhmM2NkNDMyNzg3
-    YWI2NjAyZmZmMmFjYzU2ZjIwYjk4YjNhNWZhYTBiNWJlNWNmZGU0ZWZlMDlh
-    MDkzZWRiOGU4NjBmMDQ3ODZkZmQxMTVkNTY5YTQ0ODcwZDUyMTk=
+    OTFhNjliOTY5Y2YwMzYwNjRiMDhlMWRmODc2ZmY4ZDE5YzcwNzlmYzYyYzJl
+    MjU5ZTkyYmNhNjM3NTY2OTZiMGMzMTBlNGZhNzJkMDQzNjUyNmYwOWU4YWIy
+    OTJkZGYyZjFiZGNkODNkZWY4YzIwYTk4Zjk5MGY2NTZlZDBiZTU=
   data.tar.gz: !binary |-
-    Mjc1NWU3MzIxY2MzNzI0NzFjMzc5MTkzZmMyNDU4MTg1ZTk1YWRlOTA5ZWFk
-    Y2NlMThhMmZhMTg0ODE2YWMzYzQ4NWQyNmViYTdmMzkyZmQ2N2U1NDJjMDI2
-    OWUyYjU0ZDMyOGYyNDEyNmJiMmZkYjJkNjBjZjAxN2FmZmI2NTk=
+    YTM1MmJmYjBmY2UxYWIzY2IzMmYyYTk3ZTIzZGFlZDgxYTExMzA5YTJiNGE5
+    OTc5MDNkZTNlYjRiNTAzODg1YWJlNzdkZDlkNDg4OTQ0MmNlZWVmN2I3OWE3
+    ZGZjYzdmN2IzMjc3YzgxYzQwYzdhZmU0N2ExMTFhOTYzMDU3MTU=

data/CHANGES

@@ -1,3 +1,6 @@
+1.1.0
+BBC_INTERNAL firefox profile creation now works correctly whether working behind a firewall or not.
+
 1.0.0
 Base required Ruby version now 1.9.3 or later
 Bumped gem dependency versions

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    frameworks-capybara (1.0.0)
+    frameworks-capybara (1.1.0)
       capybara (~> 1.1.2)
       capybara-celerity
       capybara-mechanize (>= 0.3.0, < 1.0.0)

data/lib/frameworks/capybara.rb

@@ -18,11 +18,11 @@ class CapybaraSetup
     http_proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
 
     capybara_opts = {:environment => ENV['ENVIRONMENT'],
-      :proxy => http_proxy,
+      :http_proxy => http_proxy,
       :profile => ENV['FIREFOX_PROFILE'],
       :browser => ENV['BROWSER'],
       :javascript_enabled => ENV['CELERITY_JS_ENABLED'],
-      :proxy_on => ENV['PROXY_ON'],
+      :webdriver_proxy_on => ENV['PROXY_ON'],
       :url => ENV['REMOTE_URL'],
       :chrome_switches => ENV['CHROME_SWITCHES'],
       :firefox_prefs => ENV['FIREFOX_PREFS'],
@@ -43,7 +43,11 @@ class CapybaraSetup
 
     validate_env_vars(capybara_opts.merge(selenium_remote_opts)) #validate environment variables set using cucumber.yml or passed via command line
 
-    @proxy_host =  capybara_opts[:proxy].gsub(/http:\/\//,'').gsub(/:80.*/,'') unless capybara_opts[:proxy].nil?
+    if(capybara_opts[:http_proxy])
+      proxy_uri = URI(capybara_opts[:http_proxy])
+      @proxy_host = proxy_uri.host
+      @proxy_port = proxy_uri.port
+    end
     capybara_opts[:browser] = capybara_opts[:browser].intern #update :browser value to be a symbol, required for Selenium
     selenium_remote_opts[:browser_name] = selenium_remote_opts[:browser_name].intern if selenium_remote_opts[:browser_name]#update :browser value to be a symbol, required for Selenium
 
@@ -135,7 +139,7 @@ class CapybaraSetup
         opts[:http_client] = client
       end
 
-      clean_opts(opts, :proxy, :proxy_on, :firefox_prefs)
+      clean_opts(opts, :http_proxy, :webdriver_proxy_on, :firefox_prefs)
       Capybara::Selenium::Driver.new(app,opts)
     end   
     :selenium
@@ -147,7 +151,7 @@ class CapybaraSetup
   end
 
   def set_client_proxy(opts)
-    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['HTTP_PROXY'] for setting in browser (ff profile) but not for client conection, hence allow for PROXY_ON=false
+    Selenium::WebDriver::Proxy.new(:http => opts[:http_proxy]) if opts[:http_proxy] && opts[:webdriver_proxy_on] != 'false' #set proxy on client connection if required, note you may use ENV['HTTP_PROXY'] for setting in browser (ff profile) but not for client conection, hence allow for PROXY_ON=false
   end
 
   def create_profile(profile_name = nil, additional_prefs = nil)
@@ -157,12 +161,14 @@ class CapybaraSetup
       profile.native_events = true
     elsif(profile_name == 'BBC_INTERNAL')
       profile = Selenium::WebDriver::Firefox::Profile.new
-      profile["network.proxy.type"] = 1
-      profile["network.proxy.no_proxies_on"] = "*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk"
-      profile["network.proxy.http"] = @proxy_host 
-      profile["network.proxy.ssl"] = @proxy_host 
-      profile["network.proxy.http_port"] = 80
-      profile["network.proxy.ssl_port"] = 80
+      if(@proxy_host && @proxy_port) 
+        profile["network.proxy.type"] = 1
+        profile["network.proxy.no_proxies_on"] = "*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk"
+        profile["network.proxy.http"] = @proxy_host 
+        profile["network.proxy.ssl"] = @proxy_host 
+        profile["network.proxy.http_port"] = @proxy_port
+        profile["network.proxy.ssl_port"] = @proxy_port
+      end
       profile.native_events = true
     else
       profile = Selenium::WebDriver::Firefox::Profile.from_name profile_name
@@ -182,7 +188,7 @@ class CapybaraSetup
     Capybara.register_driver :celerity do |app|
       opts.delete :browser #delete browser from options as value with  be 'headless'
       opts[:javascript_enabled] == 'true' ? opts[:javascript_enabled] = true : opts[:javascript_enabled] = false
-      opts[:proxy] = "#{@proxy_host}:80" unless opts[:proxy].nil?
+      opts[:http_proxy] = "#{@proxy_host}:80" unless opts[:http_proxy].nil?
       Capybara::Driver::Celerity.new(app,opts)
     end
     :celerity

data/lib/version.rb

@@ -1,3 +1,3 @@
 module FrameworksCapybara
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/frameworks_capybara_spec.rb

@@ -20,8 +20,8 @@ shared_examples_for "Selenium Driver Options Array" 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
+    Capybara.current_session.driver.options[:http_proxy].should == nil
+    Capybara.current_session.driver.options[:webdriver_proxy_on].should == nil
     Capybara.current_session.driver.options[:platform].should == nil
     Capybara.current_session.driver.options[:browser_name].should == nil
     Capybara.current_session.driver.options[:version].should == nil
@@ -430,7 +430,7 @@ describe CapybaraSetup do
             CapybaraSetup.new.driver.should == :celerity
             Capybara.current_session.driver.should be_a_kind_of Capybara::Driver::Celerity
             Capybara.current_session.driver.options[:javascript_enabled].should == true
-            Capybara.current_session.driver.options[:proxy].should == 'example.cache.co.uk:80'
+            Capybara.current_session.driver.options[:http_proxy].should == 'example.cache.co.uk:80'
             Capybara.current_session.driver.options[:environment].should == nil
             Capybara.current_session.driver.options[:browser].should == nil
           end
@@ -445,7 +445,7 @@ describe CapybaraSetup do
 
           it "should cope with http_proxy and HTTP_PROXY " do
             Capybara.delete_session
-            Capybara.current_session.driver.options[:proxy].should == 'example.cache.co.uk:80'
+            Capybara.current_session.driver.options[:http_proxy].should == 'example.cache.co.uk:80'
           end
         end
 
@@ -579,7 +579,47 @@ describe CapybaraSetup do
 
       end
 
-    
+      describe "The BBC-INTERNAL firefox profile should be set up with the correct proxy settings whether working behind a proxy or not" do
+
+        context "no proxy settings provided" do
+          before do
+            ENV['BROWSER'] = 'firefox'
+            ENV['ENVIRONMENT'] = 'test'
+          end
+
+          it "should create the firefox profile settings correctly" do
+            setup = CapybaraSetup.new
+            profile = setup.instance_exec('BBC_INTERNAL', nil) { |profile_name, additional_prefs|
+              create_profile(profile_name, additional_prefs)
+            }
+
+            profile.instance_variable_get('@additional_prefs')['network.proxy.type'].should be_nil
+            profile.instance_variable_get('@additional_prefs')['network.proxy.http'].should be_nil
+            profile.instance_variable_get('@additional_prefs')['network.proxy.http_port'].should be_nil
+          end
+        end
+
+        context "proxy settings provided" do
+          before do
+            @proxy_host = 'example.cache.co.uk'
+            @proxy_port = 6789
+            ENV['BROWSER'] = 'firefox'
+            ENV['ENVIRONMENT'] = 'test'
+            ENV['HTTP_PROXY'] = "http://#{@proxy_host}:#{@proxy_port}"
+          end
+
+          it "should create the firefox profile correctly" do
+            setup = CapybaraSetup.new
+            profile = setup.instance_exec('BBC_INTERNAL', nil) { |profile_name, additional_prefs|
+              create_profile(profile_name, additional_prefs)
+            }
+
+            profile.instance_variable_get('@additional_prefs')['network.proxy.type'].should == 1    
+            profile.instance_variable_get('@additional_prefs')['network.proxy.http'].should == @proxy_host
+            profile.instance_variable_get('@additional_prefs')['network.proxy.http_port'].should == @proxy_port
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frameworks-capybara
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - matt robbins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types