webrat 0.4.4 → 0.4.5

data/lib/webrat/merb.rb

@@ -6,4 +6,4 @@ require "webrat"
 
 Webrat.configure do |config|
   config.mode = :merb
-end
+end

data/lib/webrat/merb_multipart_support.rb

@@ -0,0 +1,27 @@
+module Webrat
+
+  # These methods are copied from merb-core/two-oh.rb which defines new
+  # multipart_post and multipart_put methods for Merb::Test::MultipartRequestHelper.
+  # We can't require two-oh.rb because it alters Merb's own behavior, causing
+  # failing specs in Merb when Webrat is required.
+  module MerbMultipartSupport
+    def multipart_request(path, params = {}, env = {})
+      multipart = Merb::Test::MultipartRequestHelper::Post.new(params)
+      body, head = multipart.to_multipart
+      env["CONTENT_TYPE"] = head
+      env["CONTENT_LENGTH"] = body.size
+      env[:input] = StringIO.new(body)
+      request(path, env)
+    end
+
+    def multipart_post(path, params = {}, env = {})
+      env[:method] = "POST"
+      multipart_request(path, params, env)
+    end
+
+    def multipart_put(path, params = {}, env = {}, &block)
+      env[:method] = "PUT"
+      multipart_request(path, params, env)
+    end
+  end
+end

data/lib/webrat/merb_session.rb

@@ -1,49 +1,70 @@
 require "webrat"
-
-require "cgi"
-gem "extlib"
-require "extlib"
 require "merb-core"
-
-# HashWithIndifferentAccess = Mash
+require "webrat/merb_multipart_support"
 
 module Webrat
   class MerbSession < Session #:nodoc:
     include Merb::Test::MakeRequest
-    
+
+    # Include Webrat's own version of multipart_post/put because the officially
+    # supported methods in Merb don't perform the request correctly.
+    include MerbMultipartSupport
+
     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)
+      if method == "POST" && has_file?(data)
+        @response = multipart_post(url, data, :headers => headers)
+
+      elsif method == "PUT" && has_file?(data)
+        @response = multipart_put(url, data, :headers => headers)
+
+      else
+        @response = request(url,
+          :params => (data && data.any?) ? data : nil,
+          :headers => headers,
+          :method => method)
+      end
     end
 
+    protected
+
+      # Recursively search the data for a file attachment.
+      def has_file?(data)
+        data.each do |key, value|
+          if value.is_a?(Hash)
+            return has_file?(value)
+          else
+            return true if value.is_a?(File)
+          end
+        end
+        return false
+      end
+
   end
 end
 
@@ -57,9 +78,3 @@ module Merb #:nodoc:
     end
   end
 end
-
-class Merb::Test::RspecStory #:nodoc:
-  def browser
-    @browser ||= Webrat::MerbSession.new
-  end
-end

data/lib/webrat/rack_test.rb

@@ -0,0 +1,32 @@
+module Webrat
+  class RackTestSession < Session
+
+    def initialize(rack_test_session) #:nodoc:
+      super()
+      @rack_test_session = rack_test_session
+    end
+
+    def response_body
+      response.body
+    end
+
+    def response_code
+      response.status
+    end
+
+    def response
+      @rack_test_session.last_response
+    end
+
+  protected
+
+    def process_request(http_method, url, data = {}, headers = {})
+      headers ||= {}
+      data    ||= {}
+
+      env = headers.merge(:params => data, :method => http_method.to_s.upcase)
+      @rack_test_session.request(url, env)
+    end
+
+  end
+end

data/lib/webrat/rails.rb

@@ -7,7 +7,7 @@ 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.
     #
@@ -22,7 +22,7 @@ module Webrat
         super('#' + dom_id(selector_or_object), &block)
       end
     end
-    
+
     def doc_root
       File.expand_path(File.join(RAILS_ROOT, 'public'))
     end

data/lib/webrat/rspec-rails.rb

@@ -1,13 +1,10 @@
 # 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"
 
 Spec::Runner.configure do |config|
-  # rspec should support :type => [:controller, :helper, :view] - but until it does ...
-  config.include(Webrat::Matchers, :type => :controller)
-  config.include(Webrat::Matchers, :type => :helper)
-  config.include(Webrat::Matchers, :type => :view)
-end
+  config.include(Webrat::Matchers, :type => [:controller, :helper, :view])
+end

data/lib/webrat/selenium.rb

@@ -1,6 +1,7 @@
 require "webrat"
-gem "selenium-client", ">=1.2.14"
+gem "selenium-client", ">=1.2.16"
 require "selenium/client"
+require "webrat/selenium/silence_stream"
 require "webrat/selenium/selenium_session"
 require "webrat/selenium/matchers"
 require "webrat/core_extensions/tcp_socket"

data/lib/webrat/selenium/application_server_factory.rb

@@ -0,0 +1,40 @@
+module Webrat
+  module Selenium
+
+    class ApplicationServerFactory
+
+      def self.app_server_instance
+        case Webrat.configuration.application_framework
+        when :sinatra
+          require "webrat/selenium/application_servers/sinatra"
+          return Webrat::Selenium::ApplicationServers::Sinatra.new
+        when :merb
+          require "webrat/selenium/application_servers/merb"
+          return Webrat::Selenium::ApplicationServers::Merb.new
+        when :rails
+          require "webrat/selenium/application_servers/rails"
+          return Webrat::Selenium::ApplicationServers::Rails.new
+        when :external
+          require "webrat/selenium/application_servers/external"
+          return Webrat::Selenium::ApplicationServers::External.new
+        else
+          raise WebratError.new(<<-STR)
+Unknown Webrat application_framework: #{Webrat.configuration.application_framework.inspect}
+
+Please ensure you have a Webrat configuration block that specifies an application_framework
+in your test_helper.rb, spec_helper.rb, or env.rb (for Cucumber).
+
+For example:
+
+  Webrat.configure do |config|
+    # ...
+    config.application_framework = :rails
+  end
+      STR
+        end
+      end
+
+    end
+
+  end
+end

data/lib/webrat/selenium/application_servers.rb

@@ -0,0 +1,5 @@
+require "webrat/selenium/application_servers/base"
+require "webrat/selenium/application_servers/sinatra"
+require "webrat/selenium/application_servers/merb"
+require "webrat/selenium/application_servers/rails"
+require "webrat/selenium/application_servers/external"

data/lib/webrat/selenium/application_servers/base.rb

@@ -0,0 +1,46 @@
+require "webrat/selenium/silence_stream"
+
+module Webrat
+  module Selenium
+    module ApplicationServers
+      class Base
+        include Webrat::Selenium::SilenceStream
+
+        def boot
+          start
+          wait
+          stop_at_exit
+        end
+
+        def stop_at_exit
+          at_exit do
+            stop
+          end
+        end
+
+        def wait
+          $stderr.print "==> Waiting for #{Webrat.configuration.application_framework} application server on port #{Webrat.configuration.application_port}... "
+          wait_for_socket
+          $stderr.print "Ready!\n"
+        end
+
+        def wait_for_socket
+          silence_stream(STDOUT) do
+            TCPSocket.wait_for_service_with_timeout \
+              :host     => "0.0.0.0",
+              :port     => Webrat.configuration.application_port.to_i,
+              :timeout  => 30 # seconds
+          end
+          rescue SocketError
+          fail
+        end
+
+        def prepare_pid_file(file_path, pid_file_name)
+          FileUtils.mkdir_p File.expand_path(file_path)
+          File.expand_path("#{file_path}/#{pid_file_name}")
+        end
+
+      end
+    end
+  end
+end

data/lib/webrat/selenium/application_servers/external.rb

@@ -0,0 +1,26 @@
+require "webrat/selenium/application_servers/base"
+
+module Webrat
+  module Selenium
+    module ApplicationServers
+      class External < Webrat::Selenium::ApplicationServers::Base
+        def start
+          warn "Webrat Ignoring Start Of Application Server Due to External Mode"
+        end
+
+        def stop
+        end
+
+        def fail
+        end
+
+        def pid_file
+        end
+
+        def wait
+        end
+
+      end
+    end
+  end
+end

data/lib/webrat/selenium/application_servers/merb.rb

@@ -0,0 +1,50 @@
+require "webrat/selenium/application_servers/base"
+
+module Webrat
+  module Selenium
+    module ApplicationServers
+      class Merb < Webrat::Selenium::ApplicationServers::Base
+
+        def start
+          system start_command
+        end
+
+        def stop
+          silence_stream(STDOUT) do
+            pid = File.read(pid_file)
+            system("kill -9 #{pid}")
+            FileUtils.rm_f pid_file
+          end
+        end
+
+        def fail
+          $stderr.puts
+          $stderr.puts
+          $stderr.puts "==> Failed to boot the Merb application server... exiting!"
+          $stderr.puts
+          $stderr.puts "Verify you can start a Merb server on port #{Webrat.configuration.application_port} with the following command:"
+          $stderr.puts
+          $stderr.puts "    #{start_command}"
+          exit
+        end
+
+        def pid_file
+        "log/merb.#{Webrat.configuration.application_port}.pid"
+        end
+
+        def start_command
+        "#{merb_command} -d -p #{Webrat.configuration.application_port} -e #{Webrat.configuration.application_environment}"
+        end
+
+        def merb_command
+          if File.exist?('bin/merb')
+            merb_cmd = 'bin/merb'
+          else
+            merb_cmd = 'merb'
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/webrat/selenium/application_servers/rails.rb

@@ -0,0 +1,44 @@
+require "webrat/selenium/application_servers/base"
+
+module Webrat
+  module Selenium
+    module ApplicationServers
+      class Rails < Webrat::Selenium::ApplicationServers::Base
+
+        def start
+          system start_command
+        end
+
+        def stop
+          silence_stream(STDOUT) do
+            system stop_command
+          end
+        end
+
+        def fail
+          $stderr.puts
+          $stderr.puts
+          $stderr.puts "==> Failed to boot the Rails application server... exiting!"
+          $stderr.puts
+          $stderr.puts "Verify you can start a Rails server on port #{Webrat.configuration.application_port} with the following command:"
+          $stderr.puts
+          $stderr.puts "    #{start_command}"
+          exit
+        end
+
+        def pid_file
+          prepare_pid_file("#{RAILS_ROOT}/tmp/pids", "mongrel_selenium.pid")
+        end
+
+        def start_command
+        "mongrel_rails start -d --chdir='#{RAILS_ROOT}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &"
+        end
+
+        def stop_command
+        "mongrel_rails stop -c #{RAILS_ROOT} --pid #{pid_file}"
+        end
+
+      end
+    end
+  end
+end

data/lib/webrat/selenium/application_servers/sinatra.rb

@@ -0,0 +1,37 @@
+require "webrat/selenium/application_servers/base"
+
+module Webrat
+  module Selenium
+    module ApplicationServers
+      class Sinatra < Webrat::Selenium::ApplicationServers::Base
+
+        def start
+          fork do
+            File.open('rack.pid', 'w') { |fp| fp.write Process.pid }
+            exec 'rackup', File.expand_path(Dir.pwd + '/config.ru'), '-p', Webrat.configuration.application_port.to_s
+          end
+        end
+
+        def stop
+          silence_stream(STDOUT) do
+            pid = File.read(pid_file)
+            system("kill -9 #{pid}")
+            FileUtils.rm_f pid_file
+          end
+        end
+
+        def fail
+          $stderr.puts
+          $stderr.puts
+          $stderr.puts "==> Failed to boot the Sinatra application server... exiting!"
+          exit
+        end
+
+        def pid_file
+          prepare_pid_file(Dir.pwd, 'rack.pid')
+        end
+
+      end
+    end
+  end
+end