frameworks-capybara 0.0.16 → 0.0.17

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.0.17

data/frameworks-capybara.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frameworks-capybara}
-  s.version = "0.0.16"
+  s.version = "0.0.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcrmfc"]
-  s.date = %q{2011-03-25}
+  s.date = %q{2011-04-01}
   s.description = %q{gem ti aid setup of Capybara for testing bbc sites}
   s.email = %q{mcrobbins@gmail.com}
   s.extra_rdoc_files = [
@@ -28,6 +28,9 @@ Gem::Specification.new do |s|
     "lib/frameworks-capybara.rb",
     "lib/frameworks/capybara.rb",
     "lib/frameworks/cucumber.rb",
+    "lib/monkey-patches/capybara-patches.rb",
+    "lib/monkey-patches/cucumber-patches.rb",
+    "lib/monkey-patches/webdriver-patches.rb",
     "test/helper.rb",
     "test/test_frameworks-capybara.rb"
   ]

data/lib/frameworks/capybara.rb

@@ -1,3 +1,5 @@
+require 'monkey-patches/webdriver-patches'
+require 'monkey-patches/capybara-patches'
 require 'selenium-webdriver'
 
 class CapybaraSetup
@@ -10,18 +12,16 @@ class CapybaraSetup
 
   def initialize
 
-    capybara_opts = {:environment => ENV['ENVIRONMENT'], :proxy => ENV['PROXY_URL'], :remote_browser_proxy_url => ENV['REMOTE_BROWSER_PROXY_URL'], :platform => ENV['PLATFORM'], :browser_name => ENV['REMOTE_BROWSER'], :version => ENV['REMOTE_BROWSER_VERSION'], :url => ENV['REMOTE_URL'], :profile => ENV['FIREFOX_PROFILE'], :browser => ENV['BROWSER'], :javascript_enabled => ENV['CELERITY_JS_ENABLED']}
+    capybara_opts = {:environment => ENV['ENVIRONMENT'], :proxy => ENV['PROXY_URL'], :remote_browser_proxy_url => ENV['REMOTE_BROWSER_PROXY_URL'], :platform => ENV['PLATFORM'], :browser_name => ENV['REMOTE_BROWSER'], :version => ENV['REMOTE_BROWSER_VERSION'], :url => ENV['REMOTE_URL'], :profile => ENV['FIREFOX_PROFILE'], :browser => ENV['BROWSER'], :javascript_enabled => ENV['CELERITY_JS_ENABLED'], :job_name => ENV['JOB_NAME']}
 
-    #validate environment variables set using cucumber.yml or passed via command line
-    validate_env_vars(capybara_opts)
+    validate_env_vars(capybara_opts) #validate environment variables set using cucumber.yml or passed via command line
 
-    #update :browser value to be a symbol, required for Selenium
-    capybara_opts[:browser] = capybara_opts[:browser].intern
+
+    capybara_opts[:browser] = capybara_opts[:browser].intern #update :browser value to be a symbol, required for Selenium
     capybara_opts[:browser_name] = capybara_opts[:browser_name].intern if capybara_opts[:browser_name]
-    #Disable rack server
-    Capybara.run_server = false
 
-    #remove nil options
+    Capybara.run_server = false #Disable rack server
+
     capybara_opts.delete_if {|k,v| v.nil?}
 
     case capybara_opts[:browser] 
@@ -39,10 +39,10 @@ class CapybaraSetup
       opts.has_key?(item) && opts[item]==nil ? abort(ERROR_MSG1) : ''
     end
 
-    #delete environment, only add to opts for conveniance when validating 
-    opts.delete(:environment)
+    opts.delete(:environment) #delete environment, only add to opts for conveniance when validating 
 
-    if(opts[:browser]=='remote')
+
+    if opts[:browser]=='remote'
       [:platform, :remote_url, :browser_name].each do |item|
         opts.has_key?(item) && opts[item]==nil ? abort(ERROR_MSG2) : '' 
       end
@@ -52,34 +52,36 @@ class CapybaraSetup
   def register_selenium_driver(opts)
     Capybara.register_driver :selenium do |app|
 
-      if(opts[:browser] == :remote)
-        #create remote driver client instance
+      if opts[:browser] == :remote
         client = Selenium::WebDriver::Remote::Http::Default.new
 
         #set proxy on client connection if required
-        if(opts[:proxy])
+        if opts[:proxy]
           client.proxy = Selenium::WebDriver::Proxy.new(:http => opts[:proxy])
           opts.delete :proxy
         end
 
         #set proxy for remote browser (only supported for ff at present)
-        if(opts[:remote_browser_proxy_url])
+        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
-        #temp workaround - needs refactoring
+
+        #TODO: temp workaround - needs refactoring
         cap_opts = opts.clone
         cap_opts.delete :profile
         cap_opts.delete :browser
-        #note, we should probably not be passing all the options to the capabilities, fragile
+
         caps = Selenium::WebDriver::Remote::Capabilities.new(cap_opts)
-        #remove options that would have been added to caps
-        opts.delete_if {|k,v| [:browser_name, :platform, :profile, :version].include? k}
+
+        if opts[:job_name] then caps.custom_capabilities({:'job-name' => opts.delete(:job_name)}) end #set custom job name for sauce-labs 
+
+        opts.delete_if {|k,v| [:browser_name, :platform, :profile, :version].include? k}  #remove options that would have been added to caps
+
         opts[:desired_capabilities] = caps
         opts[:http_client] = client
       else
-        #may want to pass env variables that are not relevant for in browser 'non-remote' tests e.g. proxy, so delete these before setting up driver
-        opts.delete_if {|k,v| [:proxy].include? k}
+        opts.delete_if {|k,v| [:proxy].include? k} #may want to pass env variables that are not relevant for in browser 'non-remote' tests e.g. proxy, so delete these before setting up driver
       end
       Capybara::Driver::Selenium.new(app,opts)
     end   
@@ -88,12 +90,9 @@ class CapybaraSetup
 
   def register_celerity_driver (opts)
     Capybara.register_driver :celerity do |app|
-      #delete browser from options as value with  be 'headless'
-      opts.delete :browser
-      #set boolean for js_enabled
+      opts.delete :browser #delete browser from options as value with  be 'headless'
       opts[:javascript_enabled] == 'true' ? opts[:javascript_enabled] = true : opts[:javascript_enabled] = false
-      #remove http:// from proxy URL for Celerity
-      if(opts[:proxy])
+      if opts[:proxy]
         opts[:proxy] = opts[:proxy].gsub(/http:\/\//,'')
       end
       Capybara::Driver::Celerity.new(app,opts)

data/lib/frameworks/cucumber.rb

@@ -1,4 +1,5 @@
 require 'frameworks/capybara'
+require 'monkey-patches/cucumber-patches'
 
 module Frameworks
   module EnvHelper

data/lib/monkey-patches/capybara-patches.rb

@@ -0,0 +1,23 @@
+require 'selenium-webdriver'
+require 'capybara/cucumber'
+
+#Monkey Patch's - Use with care!
+#
+class Capybara::Driver::Selenium::Node
+  def style(prop)
+    native.style(prop)
+  end
+end
+
+class Capybara::Node::Element
+  def style(prop)
+    base.style(prop)
+  end
+end
+
+class Capybara::Driver::Node
+  def style(prop)
+    raise NotImplementedError
+  end
+end
+

data/lib/monkey-patches/cucumber-patches.rb

@@ -0,0 +1,47 @@
+require 'cucumber/formatter/html.rb'
+module Cucumber
+  module Formatter
+    class Html
+      TEAM_NAME = 'BBC Frameworks'
+      def before_features(features)
+        @project_name = ENV['PROJECT_NAME'] || ''
+        unless @project_name.empty? then @project_name += ' - ' end
+
+        @step_count = get_step_count(features)
+
+        # <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+        @builder.declare!(
+          :DOCTYPE,
+          :html,
+          :PUBLIC,
+          '-//W3C//DTD XHTML 1.0 Strict//EN',
+          'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
+        )
+
+        @builder << '<html xmlns ="http://www.w3.org/1999/xhtml">'
+        @builder.head do
+          @builder.meta(:content => 'text/html;charset=utf-8')
+          @builder.title 'Cucumber'
+          inline_css
+          inline_js
+        end
+        @builder << '<body>'
+        @builder << "<!-- Step count #{@step_count}-->"
+        @builder << '<div class="cucumber">'
+        @builder.div(:id => 'cucumber-header') do
+          @builder.div(:id => 'label') do
+            @builder.h1("#{@project_name}#{TEAM_NAME} - #{Time.now.strftime('%d/%m/%y-%H:%M:%S')}")
+          end
+          @builder.div(:id => 'summary') do
+            @builder.p('',:id => 'totals')
+            @builder.p('',:id => 'duration')
+            @builder.div(:id => 'expand-collapse') do
+              @builder.p('Expand All', :id => 'expander')
+              @builder.p('Collapse All', :id => 'collapser')
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/monkey-patches/webdriver-patches.rb

@@ -0,0 +1,31 @@
+require 'selenium-webdriver'
+
+#Monkey Patch's - Use with care!
+#
+module Selenium
+  module WebDriver
+    module Remote
+      class Capabilities
+
+        def custom_capabilities(opts)
+          @custom_capabilities = opts
+        end
+
+        #hopefuly this alias approach will mean we capture changes in the webdriver method
+        alias_method :old_as_json, :as_json
+        def as_json(opts = nil)
+
+          hash = old_as_json
+          if @custom_capabilities 
+            @custom_capabilities.each do |key, value|
+              hash[key] = value
+            end
+          end
+          hash
+        end
+
+      end
+    end
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frameworks-capybara
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 0
-  - 16
-  version: 0.0.16
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - mcrmfc
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 +00:00
+date: 2011-04-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,6 +113,9 @@ files:
 - lib/frameworks-capybara.rb
 - lib/frameworks/capybara.rb
 - lib/frameworks/cucumber.rb
+- lib/monkey-patches/capybara-patches.rb
+- lib/monkey-patches/cucumber-patches.rb
+- lib/monkey-patches/webdriver-patches.rb
 - test/helper.rb
 - test/test_frameworks-capybara.rb
 has_rdoc: true