aslakhellesoy-webrat 0.3.2.2 → 0.4.4.1

data/lib/webrat/mechanize.rb

@@ -2,14 +2,14 @@ require "mechanize"
 
 module Webrat #:nodoc:
   class MechanizeSession < Session #:nodoc:
-    
+
     attr_accessor :response
     alias :page :response
-    
+
     def request_page(url, http_method, data) #:nodoc:
       super(absolute_url(url), http_method, data)
     end
-    
+
     def get(url, data, headers_argument_not_used = nil)
       @response = mechanize.get(url, data)
     end
@@ -26,7 +26,7 @@ module Webrat #:nodoc:
       end
       @response = mechanize.post(url, post_data)
     end
-    
+
     def response_body
       @response.content
     end
@@ -34,13 +34,13 @@ module Webrat #:nodoc:
     def response_code
       @response.code.to_i
     end
-    
+
     def mechanize
-      @mechanize = WWW::Mechanize.new
+      @mechanize ||= WWW::Mechanize.new
     end
 
     def_delegators :mechanize, :basic_auth
-    
+
     def absolute_url(url) #:nodoc:
       current_host, current_path = split_current_url
       if url =~ Regexp.new('^https?://')
@@ -53,13 +53,13 @@ module Webrat #:nodoc:
         url
       end
     end
-    
+
     private
       def split_current_url
         current_url =~ Regexp.new('^(https?://[^/]+)(/.*)?')
         [Regexp.last_match(1), Regexp.last_match(2)]
       end
-      
+
       def absolute_path(current_path, url)
         levels_up = url.split('/').find_all { |x| x == '..' }.size
         ancestor = if current_path.nil?

data/lib/webrat/merb.rb

@@ -1,65 +1,9 @@
 require "webrat"
 
-require "cgi"
-gem "extlib"
-require "extlib"
-require "merb-core"
+# This is a temporary hack to support backwards compatibility
+# with Merb 1.0.8 until it's updated to use the new Webrat.configure
+# syntax
 
-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
+Webrat.configure do |config|
+  config.mode = :merb
 end

data/lib/webrat/merb_session.rb

@@ -0,0 +1,67 @@
+require "webrat"
+
+require "cgi"
+gem "extlib"
+require "extlib"
+require "merb-core"
+
+# HashWithIndifferentAccess = Mash
+
+module Webrat
+  class MerbSession #:nodoc:
+    include Merb::Test::MakeRequest
+
+    attr_accessor :response
+
+    def initialize(context=nil); end
+
+    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

@@ -1,24 +1,55 @@
-require 'webrat'
+require "rack/test"
 
-class CGIMethods #:nodoc:
-  def self.parse_query_parameters(params)
-    hash = {}
-    params.split('&').each do |p|
-      pair = p.split('=')
-      hash[pair[0]] = pair[1]
+module Webrat
+  class RackSession
+    def initialize(context) #:nodoc:
+      @session = Rack::Test::Session.new(context.app, "www.example.com")
+    end
+
+    def get(url, data = {}, headers = {})
+      process_request(:get, url, data, headers)
+    end
+
+    def post(url, data = {}, headers = {})
+      process_request(:post, url, data, headers)
+    end
+
+    def put(url, data = {}, headers = {})
+      process_request(:put, url, data, headers)
+    end
+
+    def delete(url, data = {}, headers = {})
+      process_request(:delete, url, data, headers)
     end
-    hash
-  end
-end
 
-module Webrat
-  class RackSession < Session #:nodoc:
     def response_body
-      @response.body
+      response.body
     end
 
     def response_code
-      @response.status
+      response.status
+    end
+
+    def response
+      @session.last_response
+    end
+
+    def request
+      @session.last_request
+    end
+
+  protected
+
+    def process_request(http_method, url, data = {}, headers = {})
+      headers ||= {}
+      data    ||= {}
+
+      params = data.inject({}) { |acc, (k,v)|
+        acc.update(k => Rack::Utils.unescape(v))
+      }
+
+      env = headers.merge(:params => params, :method => http_method.to_s.upcase)
+      @session.request(url, env)
     end
   end
 end

data/lib/webrat/rails.rb

@@ -2,9 +2,32 @@ require "webrat"
 
 require "action_controller"
 require "action_controller/integration"
+require "action_controller/record_identifier"
 
 module Webrat
-  class RailsSession < Session #:nodoc:
+  class RailsSession #:nodoc:
+    include ActionController::RecordIdentifier
+
+    attr_reader :integration_session
+
+    def initialize(session)
+      @integration_session = session
+    end
+
+    # 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'))
@@ -44,10 +67,6 @@ module Webrat
 
   protected
 
-    def integration_session
-      @context
-    end
-
     def do_request(http_method, url, data, headers) #:nodoc:
       update_protocol(url)
       integration_session.send(http_method, normalize_url(url), data, headers)
@@ -56,11 +75,13 @@ module Webrat
     # remove protocol, host and anchor
     def normalize_url(href) #:nodoc:
       uri = URI.parse(href)
-      normalized_url = uri.path
-      if uri.query
-        normalized_url += "?" + uri.query
-      end
-      normalized_url
+      normalized_url = []
+      normalized_url << "#{uri.scheme}://" if uri.scheme
+      normalized_url << uri.host if uri.host
+      normalized_url << ":#{uri.port}" if uri.port && ![80,443].include?(uri.port)
+      normalized_url << uri.path if uri.path
+      normalized_url << "?#{uri.query}" if uri.query
+      normalized_url.join
     end
 
     def update_protocol(href) #:nodoc:
@@ -74,7 +95,6 @@ module Webrat
     def response #:nodoc:
       integration_session.response
     end
-
   end
 end
 

data/lib/webrat/rspec-rails.rb

@@ -1,6 +1,6 @@
 # Supports using the matchers in controller, helper, and view specs if you're
 # using rspec-rails. Just add a require statement to spec/spec_helper.rb or env.rb:
-# 
+#
 #   require 'webrat/rspec-rails'
 #
 require "webrat/core/matchers"
@@ -10,4 +10,4 @@ Spec::Runner.configure do |config|
   config.include(Webrat::Matchers, :type => :controller)
   config.include(Webrat::Matchers, :type => :helper)
   config.include(Webrat::Matchers, :type => :view)
-end
+end

data/lib/webrat/selenium.rb

@@ -1,45 +1,17 @@
 require "webrat"
-gem "selenium-client", ">=1.2.9"
+gem "selenium-client", ">=1.2.14"
 require "selenium/client"
+require "webrat/selenium/silence_stream"
 require "webrat/selenium/selenium_session"
 require "webrat/selenium/matchers"
+require "webrat/core_extensions/tcp_socket"
 
 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
-  end
-  
-  def self.stop_selenium_server #:nodoc:
-    remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", 4444, 5)
-    remote_control.stop
-  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=#{Webrat.configuration.selenium_port} --environment=#{Webrat.configuration.selenium_environment} --pid #{pid_file} &")
-    TCPSocket.wait_for_service :host => "0.0.0.0", :port => Webrat.configuration.selenium_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"
-  #   
+  #
   #   Webrat.configure do |config|
   #     config.mode = :selenium
   #   end
@@ -54,11 +26,25 @@ module Webrat
   #     selenium.dragdrop("id=photo_123", "+350, 0")
   #   end
   #
-  # == Auto-starting of the mongrel and java server
+  # == Choosing the underlying framework to test
+  #
+  # Webrat assumes you're using rails by default but it can also work with sinatra
+  # and merb.  To take advantage of this you can use the configuration block to
+  # set the application_framework variable.
+  #   require "webrat"
+  #
+  #   Webrat.configure do |config|
+  #     config.mode = :selenium
+  #     config.application_port = 4567
+  #     config.application_framework = :sinatra  # could also be :merb
+  #   end
+  #
+  # == Auto-starting of the appserver and java server
   #
   # Webrat will automatically start the Selenium Java server process and an instance
   # of Mongrel when a test is run. The Mongrel will run in the "selenium" environment
-  # instead of "test", so ensure you've got that defined, and will run on port 3001.
+  # instead of "test", so ensure you've got that defined, and will run on port
+  # Webrat.configuration.application_port.
   #
   # == Waiting
   #
@@ -84,10 +70,12 @@ module Webrat
   end
 end
 
-module ActionController #:nodoc:
-  IntegrationTest.class_eval do
-    include Webrat::Methods
-    include Webrat::Selenium::Methods
-    include Webrat::Selenium::Matchers
+if defined?(ActionController::IntegrationTest)
+  module ActionController #:nodoc:
+    IntegrationTest.class_eval do
+      include Webrat::Methods
+      include Webrat::Selenium::Methods
+      include Webrat::Selenium::Matchers
+    end
   end
 end