frameworks-capybara 0.0.9 → 0.0.10

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/frameworks-capybara.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frameworks-capybara}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcrmfc"]
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/mcrmfc/frameworks-capybara}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.0}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{gem to aid setup of Capybara for testing bbc sites}
   s.test_files = [
     "test/helper.rb",

data/lib/frameworks/capybara.rb

@@ -2,22 +2,27 @@ require 'selenium-webdriver'
 
 class CapybaraSetup
 
+  ERROR_MSG1 = 'Please ensure following environment variables are set ENVIRONMENT [int|test|stage|live], BROWSER[headless|ie|chrome|firefox] and PROXY_URL'
+  ERROR_MSG2 = 'Please ensure the following environment variables are set PLATFORM, REMOTE_URL, REMOTE_BROWSER (browser to use on remote machine), PROXY_URL (if required), REMOTE_BROWSER_PROXY (if required) and BROWSER_VERSION (if required)'
+
+
   attr_accessor :driver
 
   def initialize
+
+    capybara_opts = {:environment => ENV['ENVIRONMENT'], :proxy => ENV['PROXY_URL'], :remote_browser_proxy_url => ENV['REMOTE_BROWSER_PROXY'], :platform => ENV['PLATFORM'], :browser_name => ENV['REMOTE_BROWSER'], :version => ENV['BROWSER_VERSION'], :url => ENV['REMOTE_URL'], :profile => ENV['FIREFOX_PROFILE'], :browser => ENV['BROWSER'].intern, :javascript_enabled => ENV['CELERITY_JS_ENABLED']}
+
     #validate environment variables set using cucumber.yml or passed via command line
-    validate_env_vars
+    validate_env_vars(capybara_opts)
 
     #Disable rack server
     Capybara.run_server = false
 
-    capybara_opts = {:proxy => ENV['PROXY_URL'], :platform => ENV['PLATFORM'], :browser_name => ENV['REMOTE_BROWSER'], :version => ENV['BROWSER_VERSION'], :url => ENV['REMOTE_URL'], :profile => ENV['FIREFOX_PROFILE'], :browser => ENV['BROWSER'].intern, :javascript_enabled => ENV['CELERITY_JS_ENABLED']}
-
     #remove nil options
     capybara_opts.delete_if {|k,v| v.nil?}
-
-    case ENV['BROWSER']
-    when 'headless' then
+    
+    case capybara_opts[:browser] 
+    when :headless then
       @driver = register_celerity_driver(capybara_opts)
     else
       @driver = register_selenium_driver(capybara_opts)
@@ -26,32 +31,25 @@ class CapybaraSetup
 
   private
 
-  def validate_env_vars
-    #v basic check for correct env variables
-    env_vars = [ENV['ENVIRONMENT'],ENV['BROWSER']]
+  def validate_env_vars(opts)
+    [:environment, :browser].each do |item|
+      opts.has_key?(item) && opts[item]==nil ? abort(ERROR_MSG1) : ''
+    end
+
+    #delete environment, only add to opts for conveniance when validating 
+    opts.delete(:environment)
 
-      
-    env_vars.each { |var|
-      if(var==nil)
-        abort 'Please ensure following environment variables are set ENVIRONMENT [int|test|stage|live], BROWSER[headless|ie|chrome|firefox] and PROXY_URL'
+    if(opts[:browser]=='remote')
+      [:platform, :remote_url, :browser_name].each do |item|
+        opts.has_key?(item) && opts[item]==nil ? abort(ERROR_MSG2) : '' 
       end
-    }
-
-    #if running  remote test check for correct env variables
-    if(ENV['BROWSER']=='remote')
-      env_vars_remote = [ENV['PLATFORM'],ENV['REMOTE_URL'], ENV['REMOTE_BROWSER']]
-      env_vars_remote.each{ |var|
-        if(var==nil)
-          abort 'Please ensure the following environment variables are set PLATFORM, REMOTE_URL, REMOTE_BROWSER (browser to use on remote machine), PROXY_URL (if required), REMOTE_BROWSER_PROXY (if required) and BROWSER_VERSION (if required)'
-        end
-      }
     end
   end
 
   def register_selenium_driver(opts)
     Capybara.register_driver :selenium do |app|
 
-      if(opts[:browser] == :remote)
+      if(opts[:browser] == 'remote')
         #create remote driver client instance
         client = Selenium::WebDriver::Remote::Http::Default.new
 
@@ -62,10 +60,11 @@ class CapybaraSetup
         end
 
         #set proxy for remote browser (only supported for ff at present)
-        if(ENV['REMOTE_BROWSER_PROXY'])
-          opts[:proxy] = Selenium::WebDriver::Proxy.new(:http => ENV['REMOTE_BROWSER_PROXY'])
+        if(opts[:remote_browser_proxy_url])
+          opts[:proxy] = Selenium::WebDriver::Proxy.new(:http => opts[:remote_browser_proxy_url])
+          opts.delete :remote_browser_proxy_url
         end
-        
+
         #note, we should probably not be passing all the options to the capabilities, fragile
         caps = Selenium::WebDriver::Remote::Capabilities.new(opts)
         #remove options that would have been added to caps

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frameworks-capybara
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - mcrmfc
@@ -20,7 +20,7 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id001
-  name: shoulda
+  requirement: *id001
   prerelease: false
+  name: shoulda
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +45,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id002
-  name: bundler
+  requirement: *id002
   prerelease: false
+  name: bundler
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,12 +61,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  version_requirements: *id003
-  name: jeweler
+  requirement: *id003
   prerelease: false
+  name: jeweler
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,12 +75,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id004
-  name: rcov
+  requirement: *id004
   prerelease: false
+  name: rcov
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,9 +89,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
-  name: capybara
+  requirement: *id005
   prerelease: false
+  name: capybara
 description: gem ti aid setup of Capybara for testing bbc sites
 email: mcrobbins@gmail.com
 executables: []
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: gem to aid setup of Capybara for testing bbc sites