frameworks-capybara 0.0.43 → 0.1.1

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -10,4 +10,9 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
+  gem "rspec", ">= 0"
+  gem "capybara", "< 1.0.0"
+  gem "capybara-mechanize", ">=0"
+  gem "cucumber", ">= 0"
+  gem "selenium-webdriver", ">= 0"
 end

data/Gemfile.lock

@@ -1,20 +1,78 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    builder (3.0.0)
+    capybara (0.4.1.2)
+      celerity (>= 0.7.9)
+      culerity (>= 0.2.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (>= 0.0.27)
+      xpath (~> 0.1.3)
+    capybara-mechanize (0.2.7)
+      capybara (~> 0.4.0)
+      mechanize (~> 1.0.0)
+    celerity (0.9.0)
+    childprocess (0.2.2)
+      ffi (~> 1.0.6)
+    cucumber (1.1.0)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.5.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    culerity (0.2.15)
+    diff-lcs (1.1.3)
+    ffi (1.0.9)
+    gherkin (2.5.1)
+      json (>= 1.4.6)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    json (1.6.1)
+    json_pure (1.6.1)
+    mechanize (1.0.0)
+      nokogiri (>= 1.2.1)
+    mime-types (1.16)
+    nokogiri (1.5.0)
+    rack (1.3.3)
+    rack-test (0.6.1)
+      rack (>= 1.0)
     rake (0.8.7)
     rcov (0.9.9)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    rubyzip (0.9.4)
+    selenium-webdriver (2.7.0)
+      childprocess (>= 0.2.1)
+      ffi (>= 1.0.7)
+      json_pure
+      rubyzip
     shoulda (2.11.3)
+    term-ansicolor (1.0.6)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  capybara (< 1.0.0)
+  capybara-mechanize
+  cucumber
   jeweler (~> 1.5.2)
   rcov
+  rspec
+  selenium-webdriver
   shoulda

data/Rakefile

@@ -24,26 +24,10 @@ Jeweler::Tasks.new do |gem|
   gem.add_runtime_dependency 'capybara', '>=0'
   gem.add_runtime_dependency 'capybara-mechanize', '>=0'
   gem.add_runtime_dependency 'headless', '>=0'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+  gem.add_development_dependency 'rspec', '>=2.6.0'
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-task :default => :test
-
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
@@ -53,3 +37,8 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.0.43
+0.1.1

data/frameworks-capybara.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frameworks-capybara}
-  s.version = "0.0.43"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcrmfc"]
-  s.date = %q{2011-09-26}
+  s.date = %q{2011-10-10}
   s.description = %q{gem to aid setup of Capybara for testing bbc sites}
   s.email = %q{mcrobbins@gmail.com}
   s.extra_rdoc_files = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rspec",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -40,8 +41,9 @@ Gem::Specification.new do |s|
     "schemas/xhtml-symbol.ent",
     "schemas/xhtml1-strict.dtd",
     "schemas/xhtml1-transitional.dtd",
-    "test/helper.rb",
-    "test/test_frameworks-capybara.rb"
+    "spec/frameworks_capybara_spec.rb",
+    "spec/frameworks_cucumber_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/mcrmfc/frameworks-capybara}
   s.licenses = ["MIT"]
@@ -49,8 +51,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.6.0}
   s.summary = %q{gem to aid setup of Capybara for testing bbc sites}
   s.test_files = [
-    "test/helper.rb",
-    "test/test_frameworks-capybara.rb"
+    "spec/frameworks_capybara_spec.rb",
+    "spec/frameworks_cucumber_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -61,26 +64,44 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<capybara>, ["< 1.0.0"])
+      s.add_development_dependency(%q<capybara-mechanize>, [">= 0"])
+      s.add_development_dependency(%q<cucumber>, [">= 0"])
+      s.add_development_dependency(%q<selenium-webdriver>, [">= 0"])
       s.add_runtime_dependency(%q<capybara>, [">= 0"])
       s.add_runtime_dependency(%q<capybara-mechanize>, [">= 0"])
       s.add_runtime_dependency(%q<headless>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.6.0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<capybara>, ["< 1.0.0"])
+      s.add_dependency(%q<capybara-mechanize>, [">= 0"])
+      s.add_dependency(%q<cucumber>, [">= 0"])
+      s.add_dependency(%q<selenium-webdriver>, [">= 0"])
       s.add_dependency(%q<capybara>, [">= 0"])
       s.add_dependency(%q<capybara-mechanize>, [">= 0"])
       s.add_dependency(%q<headless>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 2.6.0"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<capybara>, ["< 1.0.0"])
+    s.add_dependency(%q<capybara-mechanize>, [">= 0"])
+    s.add_dependency(%q<cucumber>, [">= 0"])
+    s.add_dependency(%q<selenium-webdriver>, [">= 0"])
     s.add_dependency(%q<capybara>, [">= 0"])
     s.add_dependency(%q<capybara-mechanize>, [">= 0"])
     s.add_dependency(%q<headless>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 2.6.0"])
   end
 end
 

data/lib/frameworks/capybara.rb

@@ -9,25 +9,24 @@ require 'capybara/mechanize/cucumber'
 
 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
+  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']}
+    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']}
 
-    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['SAUCE_JOB_NAME'], :max_duration => ENV['SAUCE_MAX_DURATION'], :proxy_on => ENV['PROXY_ON']}
-
-    validate_env_vars(capybara_opts) #validate environment variables set using cucumber.yml or passed via command line
+    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?
     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]
+    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
 
     Capybara.run_server = false #Disable rack server
 
-    capybara_opts.delete_if {|k,v| v.nil?}
+    [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
 
     case capybara_opts[:browser] 
     when :headless then
@@ -35,82 +34,81 @@ class CapybaraSetup
     when :mechanize then
       @driver = register_mechanize_driver(capybara_opts)
     else
-      @driver = register_selenium_driver(capybara_opts)
+      @driver = register_selenium_driver(capybara_opts, selenium_remote_opts, custom_opts)
     end
 
-    Capybara.default_driver = @driver
 
-    if capybara_opts[:browser] == :mechanize
-      Capybara.current_session.driver.agent.set_proxy(@proxy_host, 80) if capybara_opts[:proxy]
-      Capybara.current_session.driver.agent.set_ssl_client_certification(ENV['CERT_LOCATION'], ENV['CERT_LOCATION'], ENV['CA_CERT_LOCATION']) if ENV['CERT_LOCATION']
-    end
+    Capybara.default_driver = @driver
   end
 
   private
 
   def validate_env_vars(opts)
-    [:environment, :browser].each do |item|
-      opts.has_key?(item) && opts[item]==nil ? abort(ERROR_MSG1) : ''
-    end
 
-    opts.delete(:environment) #delete environment, only add to opts for conveniance when validating 
+    msg1 = 'Please ensure following environment variables are set ENVIRONMENT [int|test|stage|live], BROWSER[headless|ie|chrome|firefox] and PROXY_URL (if required)'
+    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)'
 
+    [:environment, :browser].each do |item|
+      !opts.has_key?(item) or opts[item]==nil ? raise(msg1) : '' 
+    end
 
     if opts[:browser]=='remote'
-      [:remote_url, :browser_name].each do |item|
-        opts.has_key?(item) && opts[item]==nil ? abort(ERROR_MSG2) : '' 
+      [:url, :browser_name].each do |item|
+        !opts.has_key?(item) or opts[item]==nil ? raise(msg2) : '' 
       end
     end
   end
 
-  def register_selenium_driver(opts)
+  def register_selenium_driver(opts,remote_opts,custom_opts)
     Capybara.register_driver :selenium do |app|
 
-      if(opts[:profile] == 'BBC_INTERNAL')
-        profile = Selenium::WebDriver::Firefox::Profile.new
-        profile["network.proxy.type"] = 1
-        profile["network.proxy.no_proxies_on"] = "*.sandbox.dev.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
-        profile.native_events = true
-        opts[:profile] = profile
-      elsif(opts[:profile])
-        profile = Selenium::WebDriver::Firefox::Profile.from_name opts[:profile]
-        profile.native_events = true
-        opts[:profile] = profile
-      end
+      opts[:profile] = create_profile(opts[:profile]) if(opts[:profile])
 
       if opts[:browser] == :remote
         client = Selenium::WebDriver::Remote::Http::Default.new
+        client.proxy = set_client_proxy(opts)
 
-        #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
-        if opts[:proxy] && opts[:proxy_on] != 'false'
-          client.proxy = Selenium::WebDriver::Proxy.new(:http => opts[:proxy])
-        end
-        opts.delete_if {|k,v| [:proxy, :proxy_on].include? k} 
-
-        #TODO: temp workaround - needs refactoring
-        cap_opts = opts.clone
-        cap_opts[:firefox_profile] = cap_opts.delete :profile
-        cap_opts.delete :browser
-        caps = Selenium::WebDriver::Remote::Capabilities.new(cap_opts)
-        caps.custom_capabilities({:'job-name' => opts.delete(:job_name) || 'frameworks-unamed-job', :'max-duration' => opts.delete(:max_duration) || 1800}) if opts[:url].include? 'saucelabs' #set sauce specific parameters - will this scupper other on sauce remote jobs? 
+        remote_opts[:firefox_profile] = opts.delete :profile
+        caps = Selenium::WebDriver::Remote::Capabilities.new(remote_opts)
 
-        opts.delete_if {|k,v| [:browser_name, :platform, :profile, :version].include? k}  #remove options that would have been added to caps
+        add_custom_caps(caps, custom_opts) if remote_opts[:url].include? 'saucelabs' #set sauce specific parameters - will this scupper other on sauce remote jobs? 
 
         opts[:desired_capabilities] = caps
         opts[:http_client] = client
-      else
-        opts.delete_if {|k,v| [:proxy, :proxy_on].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
+      clean_opts(opts, :proxy, :proxy_on)
       Capybara::Driver::Selenium.new(app,opts)
     end   
     :selenium
   end
 
-  def register_celerity_driver (opts)
+  def add_custom_caps(caps, custom_opts)
+    sauce_time_limit = custom_opts.delete(:max_duration).to_i #note nil.to_i == 0 
+    caps.custom_capabilities({:'job-name' => (custom_opts[:job_name] or 'frameworks-unamed-job'), :'max-duration' => ((sauce_time_limit if sauce_time_limit != 0) or 1800)}) 
+  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['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)
+    if(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"
+      profile["network.proxy.http"] = @proxy_host 
+      profile["network.proxy.ssl"] = @proxy_host 
+      profile["network.proxy.http_port"] = 80
+      profile["network.proxy.ssl_port"] = 80
+      profile.native_events = true
+    else
+      profile = Selenium::WebDriver::Firefox::Profile.from_name profile_name
+      profile.native_events = true
+    end
+    profile
+  end
+
+  def register_celerity_driver(opts)
     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
@@ -120,13 +118,21 @@ class CapybaraSetup
     :celerity
   end
 
-  def register_mechanize_driver (opts)
+  def register_mechanize_driver(opts)
     Capybara.register_driver :mechanize do |app|
-      opts.delete :browser #delete browser from options as value with  be 'headless'
       Capybara.app_host = "http://www.int.bbc.co.uk"
-      Capybara::Driver::Mechanize.new(app)
+      driver = Capybara::Driver::Mechanize.new(app)
+      driver.agent.set_proxy(@proxy_host, 80) unless opts[:proxy].nil?
+      driver.agent.set_ssl_client_certification(ENV['CERT_LOCATION'], ENV['CERT_LOCATION'], ENV['CA_CERT_LOCATION']) if ENV['CERT_LOCATION']
+      driver 
     end
     :mechanize
   end
 
+  def clean_opts(opts, *args)
+    args.each do |arg|
+      opts.delete arg
+    end
+  end
+
 end

data/lib/frameworks/cucumber.rb

@@ -13,39 +13,38 @@ end
 
 module Frameworks
   module EnvHelper
-
-    ENV['SCHEME']=='https' ? scheme = 'https' : scheme = 'http'
-
-    WWW_PREFIX = "#{scheme}://www."
-    STATIC_PREFIX = "#{scheme}://static."
-    OPEN_PREFIX = "#{scheme}://open."
-    BBC_DOMAIN = '.bbc.co.uk'
-    STATIC_BBC_DOMAIN = '.bbc.co.uk'
-    SANDBOX = "#{scheme}://pal.sandbox.dev"
-    STATIC_SANDBOX = "#{scheme}://static.sandbox.dev"
-
     #Generate base urls to use in Cucumber step defs
     def generate_base_urls 
+      set_scheme
       if(ENV['ENVIRONMENT']=='sandbox')
-        @base_url = SANDBOX + BBC_DOMAIN 
-        @static_base_url = STATIC_SANDBOX + BBC_DOMAIN
+        @base_url = @sandbox + @bbc_domain 
+        @static_base_url = @static_sandbox + @bbc_domain
       elsif (ENV['ENVIRONMENT']=='live' && ENV['WWW_LIVE']=='false')
-        @base_url = WWW_PREFIX + BBC_DOMAIN
-        @static_base_url = STATIC_PREFIX + BBC_DOMAIN
-        @open_base_url = OPEN_PREFIX + BBC_DOMAIN
+        @base_url = @www_prefix.chop + @bbc_domain
+        @static_base_url = @static_prefix.chop + @bbc_domain
+        @open_base_url = @open_prefix.chop + @bbc_domain
       elsif (ENV['ENVIRONMENT'].split('.')[0].include? 'pal') #address specific box
         @base_url = "#{scheme}://#{ENV['ENVIRONMENT']}" 
       else
-        @base_url = WWW_PREFIX + ENV['ENVIRONMENT'] + BBC_DOMAIN
-        @static_base_url = STATIC_PREFIX + ENV['ENVIRONMENT'] + BBC_DOMAIN
-        @open_base_url = OPEN_PREFIX + ENV['ENVIRONMENT'] + BBC_DOMAIN
+        @base_url = @www_prefix + ENV['ENVIRONMENT'] + @bbc_domain
+        @static_base_url = @static_prefix + ENV['ENVIRONMENT'] + @bbc_domain
+        @open_base_url = @open_prefix + ENV['ENVIRONMENT'] + @bbc_domain
       end
     end
 
+    def set_scheme  
+      ENV['SCHEME']=='https' ? scheme = 'https' : scheme = 'http'
+      @www_prefix = "#{scheme}://www."
+      @static_prefix = "#{scheme}://static."
+      @open_prefix = "#{scheme}://open."
+      @bbc_domain = '.bbc.co.uk'
+      @sandbox = "#{scheme}://pal.sandbox.dev"
+      @static_sandbox = "#{scheme}://static.sandbox.dev"
+    end
+
   end #EnvHelper
 end #Frameworks
 
-CapybaraSetup.new unless ENV['CAPYBARA_DISABLED']
 
 #Add module into world to ensure visibility of instance variables within Cucumber
 World(Frameworks::EnvHelper)

data/lib/frameworks-capybara.rb

@@ -1,2 +1,4 @@
 require 'frameworks/cucumber'
 require 'frameworks/capybara'
+
+CapybaraSetup.new unless ENV['CAPYBARA_DISABLED']

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

@@ -1,6 +1,7 @@
 require 'selenium-webdriver'
 require 'capybara/cucumber'
 
+
 ##
 #Monkey Patch's - Use with care!
 #

data/spec/frameworks_capybara_spec.rb

@@ -0,0 +1,336 @@
+require 'spec_helper'
+##
+#Monkey Patch
+#This is required because Capybara has module methods (singletons) which create
+#a session and then re-use this whenever Capybara is referenced in the current process. 
+#Therefore even creating new instances of CapybaraSetup will use the same session and driver instance
+#...not picking up changes in the different tests below.  
+#Hence the only option is to clean out the session before each test.
+module Capybara
+  class << self
+    def delete_session
+      @session_pool = {}
+    end
+  end
+end
+
+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
+    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
+    Capybara.current_session.driver.options[:job_name].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
+  end
+end
+
+describe CapybaraSetup do
+
+  before(:each) do
+    home = ENV['HOME']
+    ENV.clear
+    ENV['HOME'] = home #Want to clear some env variables but HOME is used by Webdriver, therefore need to preserve it
+  end
+
+  describe "should validate options" do
+    before(:each) do
+      Capybara.delete_session
+    end
+
+    it "should require as a minimum ENVIRONMENT and BROWSER" do
+      lambda {CapybaraSetup.new}.should raise_error(RuntimeError,'Please ensure following environment variables are set ENVIRONMENT [int|test|stage|live], BROWSER[headless|ie|chrome|firefox] and PROXY_URL (if required)')
+    end
+
+    it "should require as a minimum ENVIRONMENT, BROWSER and REMOTE_BROWSER if running a Remote Selenium Instance" do
+      ENV['BROWSER'] = 'remote'
+      ENV['ENVIRONMENT'] = 'test'
+      lambda {CapybaraSetup.new}.should raise_error(RuntimeError,'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
+
+    it "should not error if ENVIRONMENT and BROWSER are provided" do
+      ENV['BROWSER'] = 'headless'
+      ENV['ENVIRONMENT'] = 'test'
+      lambda {CapybaraSetup.new}.should_not raise_error
+    end
+
+    it "should not error if ENVIRONMENT, BROWSER and REMOTE_BROSWER are provided if running a Remote Selenium Instance" do
+      ENV['BROWSER'] = 'remote'
+      ENV['ENVIRONMENT'] = 'test'
+      ENV['REMOTE_BROWSER'] = 'test'
+      ENV['REMOTE_URL'] = 'test'
+      lambda {CapybaraSetup.new}.should_not raise_error
+    end
+  end
+
+  describe "should allow Capybara drivers to be created" do
+    before do
+      ENV['ENVIRONMENT'] = 'test'
+    end
+
+    describe "should allow Selenium driver to be created" do
+      context "with minimal Selenium driver" do
+        before do
+          ENV['BROWSER'] = 'firefox'
+        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::Driver::Selenium
+          Capybara.current_session.driver.options[:browser].should == :firefox
+        end
+
+        it_behaves_like "Selenium Driver Options Array"
+      end
+
+      context "with Selenium driver and default firefox profile (from profiles.ini)" do
+        before do
+          ENV['BROWSER'] = 'firefox'
+          ENV['FIREFOX_PROFILE'] = 'default'
+        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::Driver::Selenium
+          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(:@model).should include "default"
+        end
+        it_behaves_like "Selenium Driver Options Array"
+
+      end
+
+      context "with Selenium driver and programtically cretated profile" do
+        before do
+          ENV['BROWSER'] = 'firefox'
+          ENV['FIREFOX_PROFILE'] = 'BBC_INTERNAL'
+          ENV['PROXY_URL'] = 'http://example.cache.co.uk:80'
+          ENV['PROXY_ON'] = '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::Driver::Selenium
+          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.proxy.type'].should == '1'
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should == '"*.sandbox.dev.bbc.co.uk"'
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.http'].should == '"example.cache.co.uk"'
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.http_port'].should == '80'
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl'].should == '"example.cache.co.uk"'
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl_port'].should == '80'
+        end
+        it_behaves_like "Selenium Driver Options Array"
+      end
+
+
+      context "with Remote Selenium driver" do
+        before do
+          ENV['BROWSER'] = 'remote'
+          ENV['REMOTE_BROWSER'] = 'firefox'
+          ENV['FIREFOX_PROFILE'] = 'default'
+          ENV['REMOTE_URL'] = 'http://example.com'
+        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::Driver::Selenium
+          Capybara.current_session.driver.options[:browser].should == :remote
+          Capybara.current_session.driver.options[:url].should == 'http://example.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
+          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities 
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :firefox
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@model).should include 'default'
+        end
+        it_behaves_like "Selenium Driver Options Array"
+      end
+
+      context "with Remote Selenium driver and client proxy" do
+        before do
+          ENV['BROWSER'] = 'remote'
+          ENV['REMOTE_BROWSER'] = 'firefox'
+          ENV['FIREFOX_PROFILE'] = 'default'
+          ENV['REMOTE_URL'] = 'http://example.com'
+          ENV['PROXY_URL'] = 'http://example.cache.co.uk:80'
+        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::Driver::Selenium
+          Capybara.current_session.driver.options[:browser].should == :remote
+          Capybara.current_session.driver.options[:url].should == 'http://example.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should be_a_kind_of Selenium::WebDriver::Proxy
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).instance_variable_get(:@http).should == 'http://example.cache.co.uk:80'
+        end
+        it_behaves_like "Selenium Driver Options Array"
+      end
+
+      context "with Remote Selenium driver, programtically cretated Firefox profile using proxy but client not using proxy" do
+        before do
+          ENV['BROWSER'] = 'remote'
+          ENV['REMOTE_BROWSER'] = 'firefox'
+          ENV['FIREFOX_PROFILE'] = 'BBC_INTERNAL'
+          ENV['REMOTE_URL'] = 'http://example.cache.co.uk:80'
+          ENV['PROXY_URL'] = 'http://example.cache.co.uk:80'
+          ENV['PROXY_ON'] = '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::Driver::Selenium
+          Capybara.current_session.driver.options[:browser].should == :remote
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.type'].should == '1'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should == '"*.sandbox.dev.bbc.co.uk"'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.http'].should == '"example.cache.co.uk"'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.http_port'].should == '80'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl'].should == '"example.cache.co.uk"'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl_port'].should == '80'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
+        end
+        it_behaves_like "Selenium Driver Options Array"
+      end
+
+      context "with Remote Selenium driver (specifying platform and browser version) and default Custom Capabilites (e.g. for Sauce Labs)" do
+        before do
+          ENV['BROWSER'] = 'remote'
+          ENV['REMOTE_BROWSER'] = 'firefox'
+          ENV['PLATFORM'] = 'windows'
+          ENV['REMOTE_BROWSER_VERSION'] = '4'
+          ENV['FIREFOX_PROFILE'] = 'default'
+          ENV['REMOTE_URL'] = 'http://saucelabs.com'
+        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::Driver::Selenium
+          Capybara.current_session.driver.options[:browser].should == :remote
+          Capybara.current_session.driver.options[:url].should == 'http://saucelabs.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
+          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities 
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'job-name'].should == 'frameworks-unamed-job' 
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'max-duration'].should == 1800 
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :firefox
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:version].should == '4' 
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:platform].should == 'windows'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@model).should include 'default'
+        end
+        it_behaves_like "Selenium Driver Options Array"
+      end
+
+      context "with Remote Selenium driver and specified Custom Capabilites (e.g. for Sauce Labs)" do
+        before do
+          ENV['BROWSER'] = 'remote'
+          ENV['REMOTE_BROWSER'] = 'firefox'
+          ENV['SAUCE_JOB_NAME'] = 'myjobname'
+          ENV['SAUCE_MAX_DURATION'] = '2000'
+          ENV['REMOTE_BROWSER_VERSION'] = '4'
+          ENV['FIREFOX_PROFILE'] = 'default'
+          ENV['REMOTE_URL'] = 'http://saucelabs.com'
+        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::Driver::Selenium
+          Capybara.current_session.driver.options[:browser].should == :remote
+          Capybara.current_session.driver.options[:url].should == 'http://saucelabs.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
+          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities 
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'job-name'].should == 'myjobname' 
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'max-duration'].should == 2000 
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :firefox
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@model).should include 'default'
+        end
+        it_behaves_like "Selenium Driver Options Array"
+      end
+    end
+
+    describe "should allow Mechanize driver to be created" do
+      context "with minimal Mechanize driver" do
+        before do
+          ENV['BROWSER'] = 'mechanize'
+        end
+
+        it "should be initialized correctly" do 
+          Capybara.delete_session
+          CapybaraSetup.new.driver.should == :mechanize
+          Capybara.current_session.driver.should be_a_kind_of Capybara::Driver::Mechanize
+        end
+        context "with maximal Mechanize driver" do
+          before do
+            ENV['BROWSER'] = 'mechanize'
+            ENV['ENVIRONMENT'] = 'test'
+            ENV['PROXY_URL'] = 'http://example.cache.co.uk:80'
+          end
+
+          it "should be initialized correctly" do
+            Capybara.delete_session
+            CapybaraSetup.new.driver.should == :mechanize
+            Capybara.current_session.driver.should be_a_kind_of Capybara::Driver::Mechanize
+            Capybara.current_session.driver.agent.proxy_addr.should == 'example.cache.co.uk'
+            Capybara.current_session.driver.agent.proxy_port.should == 80
+          end
+        end
+      end
+
+      describe "should allow Celerity driver to be created" do
+
+        context "with minimal Celerity driver" do
+          before do
+            ENV['BROWSER'] = 'headless'
+          end
+
+          it "should be initialized correctly" do
+            Capybara.delete_session
+            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 == false
+            Capybara.current_session.driver.options[:environment].should == nil
+            Capybara.current_session.driver.options[:browser].should == nil
+          end
+        end
+
+        context "with maximal Celerity driver" do
+          before do
+            ENV['BROWSER'] = 'headless'
+            ENV['CELERITY_JS_ENABLED'] = 'true'
+            ENV['PROXY_URL'] = 'http://example.cache.co.uk:80'
+          end
+
+          it "should be initialized correctly" do
+            Capybara.delete_session
+            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[:environment].should == nil
+            Capybara.current_session.driver.options[:browser].should == nil
+          end
+        end
+      end
+    end
+  end
+end

data/spec/frameworks_cucumber_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Frameworks::EnvHelper do
+
+  before do
+    ENV['BROWSER'] = 'test' #mandatory data to prevent validation exception
+  end
+
+  describe "set base url correctly" do
+    include Frameworks::EnvHelper
+
+    it "should be able to set a local url" do
+      ENV['ENVIRONMENT'] = 'sandbox'
+      generate_base_urls
+      @base_url.should == 'http://pal.sandbox.dev.bbc.co.uk'
+      @static_base_url.should == 'http://static.sandbox.dev.bbc.co.uk'
+    end
+
+    it "should be able to set a base url" do
+      ENV['ENVIRONMENT'] = 'foo'
+      generate_base_urls
+      @base_url.should == 'http://www.foo.bbc.co.uk'
+      @static_base_url.should == 'http://static.foo.bbc.co.uk'
+      @open_base_url.should == 'http://open.foo.bbc.co.uk'
+    end
+
+    it "should be able to set a 'classic' live url" do
+      ENV['ENVIRONMENT'] = 'live'
+      ENV['WWW_LIVE'] = 'false' 
+      generate_base_urls
+      @base_url.should == 'http://www.bbc.co.uk'
+      @static_base_url.should == 'http://static.bbc.co.uk'
+      @open_base_url.should == 'http://open.bbc.co.uk'
+    end
+
+    it "should be able to set scheme to ssl" do
+      ENV['SCHEME'] = 'https'
+      ENV['ENVIRONMENT'] = 'foo'
+      generate_base_urls
+      @base_url.should == 'https://www.foo.bbc.co.uk'
+      @static_base_url.should == 'https://static.foo.bbc.co.uk'
+      @open_base_url.should == 'https://open.foo.bbc.co.uk'
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'gherkin'
+require 'cucumber/language_support/language_methods'
+require 'cucumber/rb_support/rb_language'
+require 'cucumber/runtime'
+require 'rspec'
+require 'capybara'
+
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift "#{dir}/../lib"
+Cucumber::RbSupport::RbLanguage.new(Cucumber::Runtime.new) #Need to load Cucumber runtime, so World is available 
+
+require 'frameworks/capybara'
+require 'frameworks/cucumber'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frameworks-capybara
 version: !ruby/object:Gem::Version 
-  hash: 73
+  hash: 25
   prerelease: 
   segments: 
   - 0
-  - 0
-  - 43
-  version: 0.0.43
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - mcrmfc
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-26 00:00:00 +01:00
+date: 2011-10-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,7 @@ dependencies:
   name: rcov
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -90,11 +90,83 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id005
+  name: rspec
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  version_requirements: *id006
+  name: capybara
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id007
+  name: capybara-mechanize
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id008
+  name: cucumber
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id009
+  name: selenium-webdriver
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id010
   name: capybara
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,12 +175,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id006
+  version_requirements: *id011
   name: capybara-mechanize
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -117,9 +189,25 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
+  version_requirements: *id012
   name: headless
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  version_requirements: *id013
+  name: rspec
+  prerelease: false
 description: gem to aid setup of Capybara for testing bbc sites
 email: mcrobbins@gmail.com
 executables: []
@@ -131,6 +219,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
+- .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -153,8 +242,9 @@ files:
 - schemas/xhtml-symbol.ent
 - schemas/xhtml1-strict.dtd
 - schemas/xhtml1-transitional.dtd
-- test/helper.rb
-- test/test_frameworks-capybara.rb
+- spec/frameworks_capybara_spec.rb
+- spec/frameworks_cucumber_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/mcrmfc/frameworks-capybara
 licenses: 
@@ -190,5 +280,6 @@ signing_key:
 specification_version: 3
 summary: gem to aid setup of Capybara for testing bbc sites
 test_files: 
-- test/helper.rb
-- test/test_frameworks-capybara.rb
+- spec/frameworks_capybara_spec.rb
+- spec/frameworks_cucumber_spec.rb
+- spec/spec_helper.rb

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'frameworks-capybara'
-
-class Test::Unit::TestCase
-end

data/test/test_frameworks-capybara.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestFrameworksCapybara < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end