lib/backseat/helpers.rb lib/backseat/helpers/by_helper.rb @@ -1,5 +1,5 @@ require 'backseat' -include Backseat +include Backseat::Helpers Backseat.load! examples/firefox_example.rb @@ -1,5 +1,5 @@ require 'backseat' -include Backseat +include Backseat::Helpers Backseat.load! examples/htmlunit_example.rb @@ -1,7 +1,8 @@ require 'rubygems' require 'spec' require 'backseat' -include Backseat + +include Backseat::Helpers describe 'a simple test' do before(:all) do examples/rspec_example.rb @@ -5,16 +5,19 @@ $:.unshift(File.dirname(__FILE__)) require 'backseat/wrappers/abstract_wrapper' require 'backseat/wrappers/element_wrapper' require 'backseat/wrappers/driver_wrapper' +require 'backseat/helpers' require 'backseat/helpers/xpath_helper' require 'backseat/helpers/wait_helper' - +require 'backseat/helpers/by_helper' module Backseat + (class << self; self; end).class_eval do + attr_accessor :loaded + end + class WaitTimeoutError < StandardError; end class ConfigurationError < StandardError; end - - include Helpers::XpathHelper - include Helpers::WaitHelper + class BridgeLoadError < StandardError; end module Bridged (class << self; self; end).class_eval do @@ -45,12 +48,13 @@ module Backseat Bridged.htmlunit = Rjb::import('org.openqa.selenium.htmlunit.HtmlUnitDriver') Bridged.firefox = Rjb::import('org.openqa.selenium.firefox.FirefoxDriver') Bridged.rendered_web_element = Rjb::import('org.openqa.selenium.RenderedWebElement') - end - - class_eval do - def by - Rjb::import('org.openqa.selenium.By') + + if Bridged.htmlunit.nil? + raise ConfigurationError.new('The htmlunit Java library could not be loaded!') end + + self.loaded = true + end end lib/backseat.rb @@ -1,7 +1,7 @@ module Backseat module Helpers module WaitHelper - # Expects to be passed a proc that will a boolean as :until + # Expects to be passed a proc that will return a boolean as :until def wait(options={}) proc = options[:until] || lambda { true } max = options[:max] || 10 lib/backseat/helpers/wait_helper.rb @@ -33,8 +33,8 @@ module Backseat end end - def appear(expected) - Appear.new(expected) + def appear + Appear.new(@driver) end end end lib/backseat/spec/matchers/appear.rb @@ -3,11 +3,16 @@ module Backseat class DriverWrapper < AbstractWrapper def initialize(driver=:htmlunit) + unless Backseat.loaded + raise BridgeLoadError.new('The Java libraries are not loaded. Did you call Backseat.load?') + end + @driver = case driver when :firefox: Bridged.firefox.new when :safari: Bridged.safari.new else Bridged.htmlunit.new end + @element = @driver @identifier = nil end lib/backseat/wrappers/driver_wrapper.rb f6a3e620d0372591764fa8155dce7fd630226914 Jim Benton jim@autonomousmachine.com http://github.com/jim/backseat/commit/eb5ef93fa37eff6b4396789b99f47fd02e3243ae eb5ef93fa37eff6b4396789b99f47fd02e3243ae 2009-03-03T21:43:46-08:00 2009-03-03T21:43:46-08:00 Committing changes from last commit. Also added an error message when a Driver is instantiated before Backseat.load! has been called. bd53d5573ebecf0d844efbd8cee7992a2a507188 Jim Benton jim@autonomousmachine.com