brynary-webrat 0.3.2.2 → 0.4.0

data/lib/webrat/merb_session.rb

@@ -0,0 +1,65 @@
+require "webrat"
+
+require "cgi"
+gem "extlib"
+require "extlib"
+require "merb-core"
+
+HashWithIndifferentAccess = Mash
+
+module Webrat
+  class MerbSession < Session #:nodoc:
+    include Merb::Test::MakeRequest
+    
+    attr_accessor :response
+    
+    def get(url, data, headers = nil)
+      do_request(url, data, headers, "GET")
+    end
+  
+    def post(url, data, headers = nil)
+      do_request(url, data, headers, "POST")
+    end
+  
+    def put(url, data, headers = nil)
+      do_request(url, data, headers, "PUT")
+    end
+  
+    def delete(url, data, headers = nil)
+      do_request(url, data, headers, "DELETE")
+    end
+    
+    def response_body
+      @response.body.to_s
+    end
+    
+    def response_code
+      @response.status
+    end
+    
+    def do_request(url, data, headers, method)
+      @response = request(url, 
+        :params => (data && data.any?) ? data : nil, 
+        :headers => headers,
+        :method => method)
+    end
+
+  end
+end
+
+module Merb #:nodoc:
+  module Test #:nodoc:
+    module RequestHelper #:nodoc:
+      def request(uri, env = {})
+        @_webrat_session ||= Webrat::MerbSession.new
+        @_webrat_session.response = @_webrat_session.request(uri, env)
+      end
+    end
+  end
+end
+
+class Merb::Test::RspecStory #:nodoc:
+  def browser
+    @browser ||= Webrat::MerbSession.new
+  end
+end

data/lib/webrat/rack.rb

@@ -22,5 +22,3 @@ module Webrat
     end
   end
 end
-
-Webrat.configuration.mode = :rack

data/lib/webrat/rails.rb

@@ -1,57 +1,75 @@
 require "webrat"
+
+require "action_controller"
 require "action_controller/integration"
+require "action_controller/record_identifier"
 
 module Webrat
   class RailsSession < Session #:nodoc:
-
+    include ActionController::RecordIdentifier
+    
+    # The Rails version of within supports passing in a model and Webrat
+    # will apply a scope based on Rails' dom_id for that model.
+    #
+    # Example:
+    #   within User.last do
+    #     click_link "Delete"
+    #   end
+    def within(selector_or_object, &block)
+      if selector_or_object.is_a?(String)
+        super
+      else
+        super('#' + dom_id(selector_or_object), &block)
+      end
+    end
+    
     def doc_root
       File.expand_path(File.join(RAILS_ROOT, 'public'))
     end
-    
+
     def saved_page_dir
       File.expand_path(File.join(RAILS_ROOT, "tmp"))
     end
-    
+
     def get(url, data, headers = nil)
       do_request(:get, url, data, headers)
     end
-    
+
     def post(url, data, headers = nil)
       do_request(:post, url, data, headers)
     end
-    
+
     def put(url, data, headers = nil)
       do_request(:put, url, data, headers)
     end
-    
+
     def delete(url, data, headers = nil)
       do_request(:delete, url, data, headers)
     end
-    
+
     def response_body
       response.body
     end
-    
+
     def response_code
       response.code.to_i
     end
-    
+
     def xml_content_type?
       response.headers["Content-Type"].to_s =~ /xml/
     end
-    
+
   protected
-    
+
     def integration_session
       @context
     end
-    
+
     def do_request(http_method, url, data, headers) #:nodoc:
       update_protocol(url)
-      url = normalize_url(url)
-      integration_session.request_via_redirect(http_method, url, data, headers)
+      integration_session.send(http_method, normalize_url(url), data, headers)
     end
-  
+
     # remove protocol, host and anchor
     def normalize_url(href) #:nodoc:
       uri = URI.parse(href)
@@ -61,7 +79,7 @@ module Webrat
       end
       normalized_url
     end
-    
+
     def update_protocol(href) #:nodoc:
       if href =~ /^https:/
         integration_session.https!(true)
@@ -69,28 +87,17 @@ module Webrat
         integration_session.https!(false)
       end
     end
-    
+
     def response #:nodoc:
       integration_session.response
     end
-    
+
   end
 end
 
 module ActionController #:nodoc:
-  module Integration #:nodoc:
-    Session.class_eval do
-      unless instance_methods.include?("put_via_redirect")
-        require "webrat/rails/redirect_actions"
-        include Webrat::RedirectActions
-      end
-    end
-  end
-  
   IntegrationTest.class_eval do
     include Webrat::Methods
     include Webrat::Matchers
   end
 end
-
-Webrat.configuration.mode = :rails

data/lib/webrat/selenium.rb

@@ -4,50 +4,45 @@ require "selenium/client"
 require "webrat/selenium/selenium_session"
 require "webrat/selenium/matchers"
 
-Webrat.configuration.mode = :selenium
-
 module Webrat
-  
+
   def self.with_selenium_server #:nodoc:
     start_selenium_server
     yield
     stop_selenium_server
   end
-  
+
   def self.start_selenium_server #:nodoc:
-    remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", 4444, 5)
-    remote_control.jar_file = File.expand_path(__FILE__ + "../../../../vendor/selenium-server.jar")
-    remote_control.start :background => true
-    TCPSocket.wait_for_service :host => "0.0.0.0", :port => 4444
+    unless Webrat.configuration.selenium_server_address
+      remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", Webrat.configuration.selenium_server_port, 5)
+      remote_control.jar_file = File.expand_path(__FILE__ + "../../../../vendor/selenium-server.jar")
+      remote_control.start :background => true
+    end
+    TCPSocket.wait_for_service :host => (Webrat.configuration.selenium_server_address || "0.0.0.0"), :port => Webrat.configuration.selenium_server_port
   end
-  
+
   def self.stop_selenium_server #:nodoc:
-    remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", 4444, 5)
-    remote_control.stop
+    ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", Webrat.configuration.selenium_server_port, 5).stop unless Webrat.configuration.selenium_server_address
   end
-  
+
   def self.start_app_server #:nodoc:
     pid_file = File.expand_path(RAILS_ROOT + "/tmp/pids/mongrel_selenium.pid")
-    system("mongrel_rails start -d --chdir=#{RAILS_ROOT} --port=3001 --environment=selenium --pid #{pid_file} &")
-    TCPSocket.wait_for_service :host => "0.0.0.0", :port => 3001
+    system("mongrel_rails start -d --chdir=#{RAILS_ROOT} --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &")
+    TCPSocket.wait_for_service :host => Webrat.configuration.application_address, :port => Webrat.configuration.application_port.to_i
   end
-  
+
   def self.stop_app_server #:nodoc:
     pid_file = File.expand_path(RAILS_ROOT + "/tmp/pids/mongrel_selenium.pid")
     system "mongrel_rails stop -c #{RAILS_ROOT} --pid #{pid_file}"
   end
-  
+
   # To use Webrat's Selenium support, you'll need the selenium-client gem installed.
   # Activate it with (for example, in your <tt>env.rb</tt>):
   #
-  #   require "webrat/selenium"
-  # 
-  # Then, if you're using Cucumber, configure it to use a 
-  # <tt>Webrat::Selenium::Rails::World</tt> as the scenario context by adding
-  # the following to <tt>env.rb</tt>:
+  #   require "webrat"
   #
-  #   World do
-  #     Webrat::Selenium::Rails::World.new
+  #   Webrat.configure do |config|
+  #     config.mode = :selenium
   #   end
   #
   # == Dropping down to the selenium-client API
@@ -74,34 +69,26 @@ module Webrat
   # your Webrat::Selenium tests ignoring the concurrency issues that can plague in-browser
   # testing, so long as you're using the Webrat API.
   module Selenium
-    
-    module Rails #:nodoc:
-      class World < ::ActionController::IntegrationTest
-        include Webrat::Selenium::Matchers
-        
-        def initialize #:nodoc:
-          @_result = Test::Unit::TestResult.new
-        end
-        
-        def response
-          webrat_session.response
-        end
-        
-        def wait_for(*args, &block)
-          webrat_session.wait_for(*args, &block)
-        end
+    module Methods
+      def response
+        webrat_session.response
+      end
+
+      def wait_for(*args, &block)
+        webrat_session.wait_for(*args, &block)
+      end
 
-        def save_and_open_screengrab
-          webrat_session.save_and_open_screengrab
-        end
+      def save_and_open_screengrab
+        webrat_session.save_and_open_screengrab
       end
     end
   end
-    
 end
 
 module ActionController #:nodoc:
   IntegrationTest.class_eval do
     include Webrat::Methods
+    include Webrat::Selenium::Methods
+    include Webrat::Selenium::Matchers
   end
 end

data/lib/webrat/selenium/matchers.rb

@@ -30,6 +30,16 @@ module Webrat
         HaveXpath.new(xpath)
       end
       
+      def assert_have_xpath(expected)
+        hs = HaveXpath.new(expected)
+        assert hs.matches?(response), hs.failure_message
+      end
+
+      def assert_have_no_xpath(expected)
+        hs = HaveXpath.new(expected)
+        assert !hs.matches?(response), hs.negative_failure_message
+      end
+      
       class HaveSelector
         def initialize(expected)
           @expected = expected
@@ -58,6 +68,20 @@ module Webrat
         HaveSelector.new(content)
       end
       
+      # Asserts that the body of the response contains
+      # the supplied selector
+      def assert_have_selector(expected)
+        hs = HaveSelector.new(expected)
+        assert hs.matches?(response), hs.failure_message
+      end
+
+      # Asserts that the body of the response
+      # does not contain the supplied string or regepx
+      def assert_have_no_selector(expected)
+        hs = HaveSelector.new(expected)
+        assert !hs.matches?(response), hs.negative_failure_message
+      end
+      
       class HasContent #:nodoc:
         def initialize(content)
           @content = content
@@ -103,6 +127,20 @@ module Webrat
         HasContent.new(content)
       end
       
+      # Asserts that the body of the response contain
+      # the supplied string or regexp
+      def assert_contain(content)
+        hc = HasContent.new(content)
+       assert hc.matches?(response), hc.failure_message
+      end
+
+      # Asserts that the body of the response
+      # does not contain the supplied string or regepx
+      def assert_not_contain(content)
+        hc = HasContent.new(content)
+        assert !hc.matches?(response), hc.negative_failure_message
+      end
+      
     end
   end
 end

data/lib/webrat/selenium/selenium_session.rb

@@ -3,56 +3,56 @@ require "webrat/core/save_and_open_page"
 module Webrat
   class TimeoutError < WebratError
   end
-  
+
   class SeleniumResponse
     attr_reader :body
     attr_reader :session
-    
+
     def initialize(session, body)
       @session = session
       @body = body
     end
-    
+
     def selenium
       session.selenium
     end
   end
-  
+
   class SeleniumSession
     include Webrat::SaveAndOpenPage
-    
+
     def initialize(*args) # :nodoc:
     end
-    
+
     def simulate
     end
-    
+
     def automate
       yield
     end
-    
+
     def visit(url)
       selenium.open(url)
     end
-    
+
     webrat_deprecate :visits, :visit
-    
+
     def fill_in(field_identifier, options)
       locator = "webrat=#{Regexp.escape(field_identifier)}"
       selenium.wait_for_element locator, 5
       selenium.type(locator, "#{options[:with]}")
     end
-    
+
     webrat_deprecate :fills_in, :fill_in
-    
+
     def response
       SeleniumResponse.new(self, response_body)
     end
-    
+
     def response_body #:nodoc:
       selenium.get_html_source
     end
-    
+
     def click_button(button_text_or_regexp = nil, options = {})
       if button_text_or_regexp.is_a?(Hash) && options == {}
         pattern, options = nil, button_text_or_regexp
@@ -61,11 +61,11 @@ module Webrat
       end
       pattern ||= '*'
       locator = "button=#{pattern}"
-      
+
       selenium.wait_for_element locator, 5
       selenium.click locator
     end
-    
+
     webrat_deprecate :clicks_button, :click_button
 
     def click_link(link_text_or_regexp, options = {})
@@ -74,53 +74,53 @@ module Webrat
       selenium.wait_for_element locator, 5
       selenium.click locator
     end
-    
+
     webrat_deprecate :clicks_link, :click_link
-    
+
     def click_link_within(selector, link_text, options = {})
       locator = "webratlinkwithin=#{selector}|#{link_text}"
       selenium.wait_for_element locator, 5
       selenium.click locator
     end
-    
+
     webrat_deprecate :clicks_link_within, :click_link_within
-    
+
     def select(option_text, options = {})
       id_or_name_or_label = options[:from]
-      
+
       if id_or_name_or_label
         select_locator = "webrat=#{id_or_name_or_label}"
       else
         select_locator = "webratselectwithoption=#{option_text}"
       end
-      
+
       selenium.wait_for_element select_locator, 5
       selenium.select(select_locator, option_text)
     end
-    
+
     webrat_deprecate :selects, :select
-    
+
     def choose(label_text)
       locator = "webrat=#{label_text}"
       selenium.wait_for_element locator, 5
       selenium.click locator
     end
-    
+
     webrat_deprecate :chooses, :choose
-        
+
     def check(label_text)
       locator = "webrat=#{label_text}"
       selenium.wait_for_element locator, 5
       selenium.check locator
     end
-    
+
     webrat_deprecate :checks, :check
 
     def fire_event(field_identifier, event)
       locator = "webrat=#{Regexp.escape(field_identifier)}"
       selenium.fire_event(locator, "#{event}")
     end
-    
+
     def key_down(field_identifier, key_code)
       locator = "webrat=#{Regexp.escape(field_identifier)}"
       selenium.key_down(locator, key_code)
@@ -130,7 +130,7 @@ module Webrat
       locator = "webrat=#{Regexp.escape(field_identifier)}"
       selenium.key_up(locator, key_code)
     end
-    
+
     def wait_for(params={})
       timeout = params[:timeout] || 5
       message = params[:message] || "Timeout exceeded"
@@ -154,21 +154,21 @@ module Webrat
       raise Webrat::TimeoutError.new(message + " (after #{timeout} sec)")
       true
     end
-    
+
     def selenium
       return $browser if $browser
       setup
       $browser
     end
-    
+
     webrat_deprecate :browser, :selenium
-    
-    
+
+
     def save_and_open_screengrab
       return unless File.exist?(saved_page_dir)
-      
+
       filename = "#{saved_page_dir}/webrat-#{Time.now.to_i}.png"
-         
+
       if $browser.chrome_backend?
         $browser.capture_entire_page_screenshot(filename, '')
       else
@@ -176,25 +176,31 @@ module Webrat
       end
         open_in_browser(filename)
     end
-    
+
   protected
-    
+
     def setup #:nodoc:
       silence_stream(STDOUT) do
         Webrat.start_selenium_server
         Webrat.start_app_server
       end
-      
-      $browser = ::Selenium::Client::Driver.new("localhost", 4444, "*firefox", "http://0.0.0.0:3001")
-      $browser.set_speed(0)
+
+      create_browser
       $browser.start
       teardown_at_exit
-      
+
       extend_selenium
       define_location_strategies
       $browser.window_maximize
     end
-    
+
+
+    def create_browser
+      $browser = ::Selenium::Client::Driver.new(Webrat.configuration.selenium_server_address || "localhost",
+          Webrat.configuration.selenium_server_port, Webrat.configuration.selenium_browser_key, "http://#{Webrat.configuration.application_address}:#{Webrat.configuration.application_port}")
+      $browser.set_speed(0) unless Webrat.configuration.selenium_server_address
+    end
+
     def teardown_at_exit #:nodoc:
       at_exit do
         silence_stream(STDOUT) do
@@ -204,21 +210,21 @@ module Webrat
         end
       end
     end
-    
+
     def adjust_if_regexp(text_or_regexp) #:nodoc:
       if text_or_regexp.is_a?(Regexp)
         "evalregex:#{text_or_regexp.inspect}"
       else
         "evalregex:/#{text_or_regexp}/"
-      end 
+      end
     end
-    
+
     def extend_selenium #:nodoc:
       extensions_file = File.join(File.dirname(__FILE__), "selenium_extensions.js")
       extenions_js = File.read(extensions_file)
       selenium.get_eval(extenions_js)
     end
-    
+
     def define_location_strategies #:nodoc:
       Dir[File.join(File.dirname(__FILE__), "location_strategy_javascript", "*.js")].sort.each do |file|
         strategy_js = File.read(file)