diabolo-webrat 0.4.4.2 → 0.5.1

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

data/lib/webrat/selenium/location_strategy_javascript/label.js

@@ -1,7 +1,8 @@
 var allLabels = inDocument.getElementsByTagName("label");
 var candidateLabels = $A(allLabels).select(function(candidateLabel){
+  var regExp = new RegExp('^' + locator + '\\b', 'i');
   var labelText = getText(candidateLabel).strip();
-  return labelText.toLowerCase() == locator.toLowerCase();
+  return (labelText.search(regExp) >= 0);
 });
 if (candidateLabels.length == 0) {
   return null;      

data/lib/webrat/selenium/selenium_rc_server.rb

@@ -2,7 +2,7 @@ module Webrat
   module Selenium
 
     class SeleniumRCServer
-      
+
       include Webrat::Selenium::SilenceStream
 
       def self.boot
@@ -32,9 +32,9 @@ module Webrat
       def remote_control
         return @remote_control if @remote_control
 
-        @remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", 
-                                                                       Webrat.configuration.selenium_server_port, 
-                                                                       Webrat.configuration.selenium_browser_startup_timeout)
+        @remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0",
+                                                                       Webrat.configuration.selenium_server_port,
+                                                                       :timeout => Webrat.configuration.selenium_browser_startup_timeout)
         @remote_control.jar_file = jar_path
 
         return @remote_control
@@ -74,7 +74,9 @@ module Webrat
 
       def stop
         silence_stream(STDOUT) do
-          ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", Webrat.configuration.selenium_server_port, 5).stop
+          ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", 
+                                                       Webrat.configuration.selenium_server_port, 
+                                                       :timeout => 5).stop
         end
       end
 

data/lib/webrat/selenium/selenium_session.rb

@@ -1,6 +1,9 @@
 require "webrat/core/save_and_open_page"
 require "webrat/selenium/selenium_rc_server"
-require "webrat/selenium/application_server"
+require "webrat/selenium/application_server_factory"
+require "webrat/selenium/application_servers/base"
+
+require "selenium"
 
 module Webrat
   class TimeoutError < WebratError
@@ -150,8 +153,10 @@ module Webrat
 
         begin
           value = yield
-        rescue ::Spec::Expectations::ExpectationNotMetError, ::Selenium::CommandError, Webrat::WebratError
-          value = nil
+        rescue Exception => e
+          unless is_ignorable_wait_for_exception?(e)
+            raise e
+          end
         end
 
         return value if value
@@ -182,14 +187,22 @@ module Webrat
       else
         $browser.capture_screenshot(filename)
       end
-        open_in_browser(filename)
+      open_in_browser(filename)
+
     end
 
-  protected
+    protected
+    def is_ignorable_wait_for_exception?(exception) #:nodoc:
+      if defined?(::Spec::Expectations::ExpectationNotMetError)
+        return true if exception.class == ::Spec::Expectations::ExpectationNotMetError
+      end
+      return true if [::Selenium::CommandError, Webrat::WebratError].include?(exception.class)
+      return false
+    end
 
     def setup #:nodoc:
       Webrat::Selenium::SeleniumRCServer.boot
-      Webrat::Selenium::ApplicationServer.boot
+      Webrat::Selenium::ApplicationServerFactory.app_server_instance.boot
 
       create_browser
       $browser.start
@@ -202,7 +215,7 @@ module Webrat
 
     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}")
+      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
 
       at_exit do

data/lib/webrat/selenium/silence_stream.rb

@@ -12,7 +12,7 @@ module Webrat
         ensure
           stream.reopen(old_stream)
         end
-      end      
+      end
     end
   end
 end

data/spec/fakes/{test_session.rb → test_adapter.rb}

@@ -1,12 +1,15 @@
 module Webrat #:nodoc:
-  def self.session_class #:nodoc:
-    TestSession
+  def self.adapter_class #:nodoc:
+    TestAdapter
   end
 
-  class TestSession < Session #:nodoc:
+  class TestAdapter #:nodoc:
     attr_accessor :response_body
     attr_writer :response_code
 
+    def initialize(*args)
+    end
+
     def doc_root
       File.expand_path(File.join(".", "public"))
     end

data/spec/integration/mechanize/Rakefile

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'spec/rake/spectask'
+
+Spec::Rake::SpecTask.new do |t|
+  t.spec_opts = ['--color']
+  t.spec_files = FileList['spec/**/*_spec.rb']
+end

data/spec/integration/mechanize/config.ru

@@ -0,0 +1,2 @@
+require "sample_app"
+run SampleApp

data/spec/integration/mechanize/sample_app.rb

@@ -0,0 +1,20 @@
+require "rubygems"
+require "sinatra/base"
+
+class SampleApp < Sinatra::Default
+  get "/" do
+    "Hello World"
+  end
+
+  get "/internal_redirect" do
+    redirect URI.join(request.url, "redirected").to_s
+  end
+
+  get "/external_redirect" do
+    redirect "http://example.tst/"
+  end
+
+  get "/redirected" do
+    "Redirected"
+  end
+end

data/spec/integration/mechanize/spec/mechanize_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe "Webrat's Mechanize mode" do
+  it "should work" do
+    response = visit("http://localhost:9292/")
+    response.should contain("Hello World")
+  end
+
+  it "should follow redirects" do
+    response = visit("http://localhost:9292/internal_redirect")
+    response.should contain("Redirected")
+  end
+
+  it "should follow links"
+  it "should submit forms"
+  it "should not follow external redirects" do
+    pending do
+      response = visit("http://localhost:9292/external_redirect")
+      response.should contain("Foo")
+    end
+  end
+end

data/spec/integration/mechanize/spec/spec_helper.rb

@@ -0,0 +1,27 @@
+require "rubygems"
+require "spec"
+
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../../../lib"
+require "webrat"
+
+Webrat.configure do |config|
+  config.mode = :mechanize
+end
+
+Spec::Runner.configure do |config|
+  config.include Webrat::Methods
+  config.include Webrat::Matchers
+
+  config.before :suite do
+    if File.exists?("rack.pid")
+      Process.kill("TERM", File.read("rack.pid").to_i)
+    end
+
+    system "rackup --daemonize --pid rack.pid config.ru"
+  end
+
+  config.after :suite do
+    Process.kill("TERM", File.read("rack.pid").to_i)
+  end
+end
+

data/spec/integration/merb/.gitignore

@@ -0,0 +1,21 @@
+.DS_Store
+log/*
+tmp/*
+TAGS
+*~
+.#*
+schema/schema.rb
+schema/*_structure.sql
+schema/*.sqlite3
+schema/*.sqlite
+schema/*.db
+*.sqlite
+*.sqlite3
+*.db
+src/*
+.hgignore
+.hg/*
+.svn/*
+gems/gems/*
+gems/specifications/*
+merb_profile_results

data/spec/integration/merb/Rakefile

@@ -0,0 +1,35 @@
+require 'rubygems'
+require 'rake/rdoctask'
+
+require 'merb-core'
+require 'merb-core/tasks/merb'
+
+include FileUtils
+
+# Load the basic runtime dependencies; this will include 
+# any plugins and therefore plugin rake tasks.
+init_env = ENV['MERB_ENV'] || 'rake'
+Merb.load_dependencies(:environment => init_env)
+     
+# Get Merb plugins and dependencies
+Merb::Plugins.rakefiles.each { |r| require r } 
+
+# Load any app level custom rakefile extensions from lib/tasks
+tasks_path = File.join(File.dirname(__FILE__), "lib", "tasks")
+rake_files = Dir["#{tasks_path}/*.rake"]
+rake_files.each{|rake_file| load rake_file }
+
+desc "Start runner environment"
+task :merb_env do
+  Merb.start_environment(:environment => init_env, :adapter => 'runner')
+end
+
+require 'spec/rake/spectask'
+require 'merb-core/test/tasks/spectasks'
+desc 'Default: run spec examples'
+task :default => 'spec'
+
+##############################################################################
+# ADD YOUR CUSTOM TASKS IN /lib/tasks
+# NAME YOUR RAKE FILES file_name.rake
+##############################################################################

data/spec/integration/merb/app/controllers/testing.rb

@@ -4,6 +4,15 @@ class Testing < Application
     render
   end
 
+  def upload
+    case request.method
+    when :get then render
+    when :post then
+      uploaded_file = params[:uploaded_file]
+      render [uploaded_file[:filename], uploaded_file[:tempfile].class.name].inspect
+    end
+  end
+
   def submit_form
   end
 

data/spec/integration/merb/app/views/exceptions/not_acceptable.html.erb

@@ -0,0 +1,63 @@
+<div id="container">
+  <div id="header-container">
+    <img src="/images/merb.jpg" />
+    <!-- <h1>Mongrel + Erb</h1> -->
+    <h2>pocket rocket web framework</h2>
+    <hr />
+  </div>
+
+  <div id="left-container">
+    <h3>Exception:</h3>
+    <p><%= request.exceptions.first.message %></p>
+  </div>
+
+  <div id="main-container">
+    <h3>Why am I seeing this page?</h3>
+    <p>Merb couldn't find an appropriate content_type to return,
+      based on what you said was available via provides() and
+      what the client requested.</p>
+
+    <h3>How to add a mime-type</h3>
+    <pre><code>
+      Merb.add_mime_type :pdf, :to_pdf, %w[application/pdf], &quot;Content-Encoding&quot; =&gt; &quot;gzip&quot;
+    </code></pre>
+    <h3>What this means is:</h3>
+    <ul>
+      <li>Add a mime-type for :pdf</li>
+      <li>Register the method for converting objects to PDF as <code>#to_pdf</code>.</li>
+      <li>Register the incoming mime-type "Accept" header as <code>application/pdf</code>.</li>
+      <li>Specify a new header for PDF types so it will set <code>Content-Encoding</code> to gzip.</li>
+    </ul>
+
+    <h3>You can then do:</h3>
+    <pre><code>
+      class Foo &lt; Application
+        provides :pdf
+      end
+    </code></pre>
+
+    <h3>Where can I find help?</h3>
+    <p>If you have any questions or if you can't figure something out, please take a
+      look at our <a href="http://merbivore.com/"> project page</a>,
+      feel free to come chat at irc.freenode.net, channel #merb,
+      or post to <a href="http://groups.google.com/group/merb">merb mailing list</a>
+      on Google Groups.</p>
+      
+    <h3>What if I've found a bug?</h3>
+    <p>If you want to file a bug or make your own contribution to Merb,
+      feel free to register and create a ticket at our
+      <a href="http://merb.lighthouseapp.com/">project development page</a>
+      on Lighthouse.</p>
+
+    <h3>How do I edit this page?</h3>
+    <p>You can change what people see when this happens by editing <tt>app/views/exceptions/not_acceptable.html.erb</tt>.</p> 
+
+  </div>
+
+  <div id="footer-container">
+    <hr />
+    <div class="left"></div>
+    <div class="right">&copy; 2008 the merb dev team</div>
+    <p>&nbsp;</p>
+  </div>
+</div>

data/spec/integration/merb/app/views/exceptions/not_found.html.erb

@@ -0,0 +1,47 @@
+<div id="container">
+  <div id="header-container">
+    <img src="/images/merb.jpg" />
+    <!-- <h1>Mongrel + Erb</h1> -->
+    <h2>pocket rocket web framework</h2>
+    <hr />
+  </div>
+
+  <div id="left-container">
+    <h3>Exception:</h3>
+    <p><%= request.exceptions.first.message %></p>
+  </div>
+
+  <div id="main-container">
+    <h3>Welcome to Merb!</h3>
+    <p>Merb is a light-weight MVC framework written in Ruby.  We hope you enjoy it.</p>
+    
+    <h3>Where can I find help?</h3>
+    <p>If you have any questions or if you can't figure something out, please take a
+      look at our <a href="http://merbivore.com/"> project page</a>,
+      feel free to come chat at irc.freenode.net, channel #merb,
+      or post to <a href="http://groups.google.com/group/merb">merb mailing list</a>
+      on Google Groups.</p>
+      
+    <h3>What if I've found a bug?</h3>
+    <p>If you want to file a bug or make your own contribution to Merb,
+      feel free to register and create a ticket at our
+      <a href="http://merb.lighthouseapp.com/">project development page</a>
+      on Lighthouse.</p>
+
+    <h3>How do I edit this page?</h3>
+    <p>You're seeing this page because you need to edit the following files:
+      <ul>
+        <li>config/router.rb <strong><em>(recommended)</em></strong></li>
+        <li>app/views/exceptions/not_found.html.erb <strong><em>(recommended)</em></strong></li>
+        <li>app/views/layout/application.html.erb <strong><em>(change this layout)</em></strong></li>
+      </ul>
+    </p>
+  </div>
+
+  <div id="footer-container">
+    <hr />
+    <div class="left"></div>
+    <div class="right">&copy; 2008 the merb dev team</div>
+    <p>&nbsp;</p>
+  </div>
+</div>