kbaum-webrat 0.5.1 → 0.6.1.pre

data/.gitignore

@@ -12,4 +12,7 @@ log
 results
 test_apps
 *.tmproj
-*.log
+*.log
+*.pid
+bin
+vendor/gems

data/Gemfile

@@ -0,0 +1,19 @@
+clear_sources
+source 'http://gemcutter.org'
+
+disable_system_gems
+
+gem "git",              "1.2.5"
+gem "rake",             "0.8.7"
+gem "rspec",            "1.2.9"
+gem "diff-lcs",         "1.1.2"
+gem "rack",             "1.0.1"
+gem "nokogiri",         "1.4.0"
+gem "merb-core",        "1.0.15"
+gem "selenium-client",  "1.2.17"
+gem "mechanize",        "0.9.3"
+gem "rails",            "2.3.4"
+gem "launchy",          "0.3.3"
+gem "rack-test",        "0.5.2"
+gem "sinatra",          "0.9.4"
+gem "mongrel",          "1.1.5"

data/History.txt

@@ -1,4 +1,4 @@
-== Git
+== 0.6.0 / 2009-11-28
 
 REMOVED: Support for Hpricot + REXML as an alternative to Nokogiri.
 
@@ -12,17 +12,27 @@ CHANGED: Due to a reorganization, if you're currently requiring "webrat/rspec-ra
 
 * Minor enhancements
 
+  * Support Rails 2.3.4 JavaScript form authenticity tokens in simulated mode (Jonathan Weiss)
+  * When a timeout occurs in wait_for, include the HTML from Selenium in the exception
   * Update the Merb support to be based directly on Rack (Simon Rozet)
   * Support multiple select fields (Kieran P)
   * When locating select options, always match against text, not HTML
 
 * Bug fixes
 
+  * Remove newlines from HTTP Basic authentication credentials (Michael Klett)
+  * Require nokogiri form rspec-rails.rb (David Chelimsky)
   * Fix logger issue when running inside Cucumber (Damian Janowski)
   * Fix various issues related to submitting values with HTML entities (Kieran P)
   * Call #to_i on the :count option in matchers (Michael Christenson II)
   * Fix bug where multiline param values were getting truncated
 
+== 0.5.3 / 2009-08-27
+
+* Minor enhancements
+
+  * Remove unnecessary requires which are to the wrong paths on Edge Rails
+
 == 0.5.1 / 2009-08-18
 
 * Minor enhancements

data/Rakefile

@@ -1,62 +1,26 @@
 require "rubygems"
 
 begin
-  require 'jeweler'
-
-  Jeweler::Tasks.new do |s|
-    s.name      = "kbaum-webrat"
-    s.author    = "Bryan Helmkamp"
-    s.email     = "bryan" + "@" + "brynary.com"
-    s.homepage  = "http://github.com/brynary/webrat"
-    s.summary   = "Ruby Acceptance Testing for Web applications"
-    s.description  = <<-EOS.strip
-Webrat lets you quickly write expressive and robust acceptance tests
-for a Ruby web application. It supports simulating a browser inside
-a Ruby process to avoid the performance hit and browser dependency of
-Selenium or Watir, but the same API can also be used to drive real
-Selenium tests when necessary (eg. for testing AJAX interactions).
-Most Ruby web frameworks and testing frameworks are supported.
-    EOS
-
-    s.rubyforge_project = "webrat"
-    s.extra_rdoc_files = %w[README.rdoc MIT-LICENSE.txt History.txt]
-
-    # Dependencies
-    s.add_dependency "nokogiri", ">= 1.2.0"
-    s.add_dependency "rack", ">= 1.0"
-
-    s.add_development_dependency "rails", ">= 2.3"
-    s.add_development_dependency "merb-core", ">= 1.0"
-    s.add_development_dependency "launchy"
-  end
-
-  Jeweler::RubyforgeTasks.new
+  require 'spec/rake/spectask'
 rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
-
-# require 'spec'
-require 'spec/rake/spectask'
-require 'spec/rake/verify_rcov'
-
-desc "Run API and Core specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
-  t.spec_files = FileList['spec/public/**/*_spec.rb'] + FileList['spec/private/**/*_spec.rb']
-end
-
-desc "Run all specs in spec directory with RCov"
-Spec::Rake::SpecTask.new(:rcov) do |t|
-  t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
-  t.spec_files = FileList['spec/public/**/*_spec.rb'] + FileList['spec/private/**/*_spec.rb']
-  t.rcov = true
-  t.rcov_opts = lambda do
-    IO.readlines(File.dirname(__FILE__) + "/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
+  desc "Run specs"
+  task(:spec) { $stderr.puts '`gem install rspec` to run specs' }
+else
+  desc "Run API and Core specs"
+  Spec::Rake::SpecTask.new do |t|
+    t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
+    t.spec_files = FileList['spec/public/**/*_spec.rb'] + FileList['spec/private/**/*_spec.rb']
   end
-end
 
-RCov::VerifyTask.new(:verify_rcov => :rcov) do |t|
-  t.threshold = 96.2 # Make sure you have rcov 0.7 or higher!
+  desc "Run all specs in spec directory with RCov"
+  Spec::Rake::SpecTask.new(:rcov) do |t|
+    t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
+    t.spec_files = FileList['spec/public/**/*_spec.rb'] + FileList['spec/private/**/*_spec.rb']
+    t.rcov = true
+    t.rcov_opts = lambda do
+      IO.readlines(File.dirname(__FILE__) + "/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
+    end
+  end
 end
 
 desc "Run everything against multiruby"
@@ -111,18 +75,18 @@ task :spec_deps do
   end
 end
 
-task :prepare do
-  system "ln -s ../../../../.. ./spec/integration/rails/vendor/plugins/webrat"
-end
-
 namespace :spec do
   desc "Run the integration specs"
-  task :integration => ["integration:rails", "integration:merb", "integration:sinatra", "integration:rack", "integration:mechanize"]
+  task :integration => [
+    "integration:rack",
+    "integration:sinatra",
+    "integration:merb",
+    "integration:mechanize",
+    "integration:rails:webrat",
+    "integration:rails:selenium",
+  ]
 
   namespace :integration do
-    desc "Run the Rails integration specs"
-    task :rails => ['rails:webrat'] #,'rails:selenium'] currently not running selenium as it doesn't pass.
-
     namespace :rails do
       task :selenium do
         Dir.chdir "spec/integration/rails" do
@@ -178,9 +142,4 @@ task :whitespace do
   sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;}
 end
 
-if defined?(Jeweler)
-  task :spec => :check_dependencies
-  task :build => :gemspec
-end
-
 task :default => :spec

data/Thorfile

@@ -0,0 +1,117 @@
+module GemHelpers
+
+  def generate_gemspec
+    $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), "lib")))
+    require "webrat"
+
+    Gem::Specification.new do |s|
+      s.name      = "webrat"
+      s.version   = Webrat::VERSION
+      s.author    = "Bryan Helmkamp"
+      s.email     = "bryan@brynary.com"
+      s.homepage  = "http://github.com/brynary/webrat"
+      s.summary   = "Ruby Acceptance Testing for Web applications"
+      s.description  = <<-EOS.strip
+Webrat lets you quickly write expressive and robust acceptance tests
+for a Ruby web application. It supports simulating a browser inside
+a Ruby process to avoid the performance hit and browser dependency of
+Selenium or Watir, but the same API can also be used to drive real
+Selenium tests when necessary (eg. for testing AJAX interactions).
+Most Ruby web frameworks and testing frameworks are supported.
+      EOS
+      s.rubyforge_project = "webrat"
+
+      require "git"
+      repo = Git.open(".")
+
+      s.files      = normalize_files(repo.ls_files.keys - repo.lib.ignored_files)
+      s.test_files = normalize_files(Dir['spec/**/*.rb'] - repo.lib.ignored_files)
+
+      s.has_rdoc = true
+      s.extra_rdoc_files = %w[README.rdoc MIT-LICENSE.txt History.txt]
+
+      s.add_dependency "nokogiri", ">= 1.2.0"
+      s.add_dependency "rack", ">= 1.0"
+    end
+  end
+
+  def normalize_files(array)
+    # only keep files, no directories, and sort
+    array.select do |path|
+      File.file?(path)
+    end.sort
+  end
+
+  # Adds extra space when outputting an array. This helps create better version
+  # control diffs, because otherwise it is all on the same line.
+  def prettyify_array(gemspec_ruby, array_name)
+    gemspec_ruby.gsub(/s\.#{array_name.to_s} = \[.+?\]/) do |match|
+      leadin, files = match[0..-2].split("[")
+      leadin + "[\n    #{files.split(",").join(",\n   ")}\n  ]"
+    end
+  end
+
+  def read_gemspec
+    @read_gemspec ||= eval(File.read("webrat.gemspec"))
+  end
+
+  def sh(command)
+    puts command
+    system command
+  end
+end
+
+class Default < Thor
+  include GemHelpers
+
+  desc "gemspec", "Regenerate webrat.gemspec"
+  def gemspec
+    File.open("webrat.gemspec", "w") do |file|
+      gemspec_ruby = generate_gemspec.to_ruby
+      gemspec_ruby = prettyify_array(gemspec_ruby, :files)
+      gemspec_ruby = prettyify_array(gemspec_ruby, :test_files)
+      gemspec_ruby = prettyify_array(gemspec_ruby, :extra_rdoc_files)
+
+      file.write gemspec_ruby
+    end
+
+    puts "Wrote gemspec to webrat.gemspec"
+    read_gemspec.validate
+  end
+
+  desc "build", "Build a webrat gem"
+  def build
+    sh "gem build webrat.gemspec"
+    FileUtils.mkdir_p "pkg"
+    FileUtils.mv read_gemspec.file_name, "pkg"
+  end
+
+  desc "install", "Install the latest built gem"
+  def install
+    sh "gem install --local pkg/#{read_gemspec.file_name}"
+  end
+
+  desc "release", "Release the current branch to GitHub and Gemcutter"
+  def release
+    gemspec
+    build
+    Release.new.tag
+    Release.new.gem
+  end
+end
+
+class Release < Thor
+  include GemHelpers
+
+  desc "tag", "Tag the gem on the origin server"
+  def tag
+    release_tag = "v#{read_gemspec.version}"
+    sh "git tag -a #{release_tag} -m 'Tagging #{release_tag}'"
+    sh "git push origin #{release_tag}"
+  end
+
+  desc "gem", "Push the gem to Gemcutter"
+  def gem
+    sh "gem push pkg/#{read_gemspec.file_name}"
+  end
+end

data/lib/webrat/adapters/rails.rb

@@ -11,21 +11,6 @@ module Webrat
       @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'))
     end
@@ -93,4 +78,4 @@ module Webrat
       integration_session.response
     end
   end
-end
+end

data/lib/webrat/core/elements/link.rb

@@ -53,7 +53,7 @@ module Webrat
 
     def authenticity_token
       return unless onclick && onclick.include?("s.setAttribute('name', 'authenticity_token');") &&
-        onclick =~ /s\.setAttribute\('value', '([a-f0-9]{40})'\);/
+        ( onclick =~ /s\.setAttribute\('value', '([a-f0-9]{40})'\);/ || onclick =~ /s\.setAttribute\('value', '(.{44})'\);/ )
       $LAST_MATCH_INFO.captures.first
     end
 

data/lib/webrat/core/session.rb

@@ -105,7 +105,7 @@ For example:
     end
 
     def basic_auth(user, pass)
-      encoded_login = ["#{user}:#{pass}"].pack("m*")
+      encoded_login = ["#{user}:#{pass}"].pack("m*").gsub(/\n/, '')
       header('HTTP_AUTHORIZATION', "Basic #{encoded_login}")
     end
 

data/lib/webrat/integrations/merb.rb

@@ -7,4 +7,4 @@ module Merb #:nodoc:
       end
     end
   end
-end
+end

data/lib/webrat/integrations/rails.rb

@@ -5,5 +5,21 @@ module ActionController #:nodoc:
   IntegrationTest.class_eval do
     include Webrat::Methods
     include Webrat::Matchers
+
+    # 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('#' + RecordIdentifier.dom_id(selector_or_object), &block)
+      end
+    end
+
   end
 end

data/lib/webrat/integrations/rspec-rails.rb

@@ -1,8 +1,9 @@
 # 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/integrations/rspec-rails'
 #
+require "nokogiri"
 require "webrat/core/matchers"
 
 Spec::Runner.configure do |config|

data/lib/webrat/integrations/selenium.rb

@@ -8,4 +8,4 @@ if defined?(ActionController::IntegrationTest)
       include Webrat::Selenium::Matchers
     end
   end
-end
+end

data/lib/webrat/rspec-rails.rb

@@ -1,2 +1,2 @@
 warn("Requiring 'webrat/rspec-rails' is deprecated. Please require 'webrat/integrations/rspec-rails' instead")
-require "webrat/integrations/rspec-rails"
+require "webrat/integrations/rspec-rails"

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

@@ -23,4 +23,4 @@ module Webrat
       end
     end
   end
-end
+end

data/lib/webrat/selenium/application_servers.rb

@@ -2,4 +2,4 @@ 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"
+require "webrat/selenium/application_servers/external"

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

@@ -1,24 +1,42 @@
+// Credit to: http://simonwillison.net/2006/Jan/20/escape/
+RegExp.escape = function(text) {
+  if (!arguments.callee.sRE) {
+    var specials = [
+      '/', '.', '*', '+', '?', '|',
+      '(', ')', '[', ']', '{', '}', '\\'
+    ];
+    arguments.callee.sRE = new RegExp(
+      '(\\' + specials.join('|\\') + ')', 'g'
+    );
+  }
+  return text.replace(arguments.callee.sRE, '\\$1');
+}
+
 var allLabels = inDocument.getElementsByTagName("label");
+var regExp = new RegExp('^\\W*' + RegExp.escape(locator) + '(\\b|$)', 'i');
+
 var candidateLabels = $A(allLabels).select(function(candidateLabel){
-  var regExp = new RegExp('^' + locator + '\\b', 'i');
   var labelText = getText(candidateLabel).strip();
   return (labelText.search(regExp) >= 0);
 });
+
 if (candidateLabels.length == 0) {
   return null;
 }
-candidateLabels = candidateLabels.sortBy(function(s) { return s.length * -1; }); //reverse length sort
+
+//reverse length sort
+candidateLabels = candidateLabels.sortBy(function(s) {
+  return s.length * -1;
+});
+
 var locatedLabel = candidateLabels.first();
-var labelFor = locatedLabel.getAttribute('for') || locatedLabel.getAttribute('htmlFor');
-if((!labelFor || labelFor == "") && (locatedLabel.hasChildNodes())) {
-  var inputTags = locatedLabel.getElementsByTagName("input");
-  var textAreaTags = locatedLabel.getElementsByTagName("textarea");
-  if(inputTags.length > 0) {
-    return inputTags[0];
-  } else if(textAreaTags.length > 0) {
-    return textAreaTags[0];
-  } else {
-    return null;
-  }
+var labelFor = locatedLabel.getAttribute('for');
+
+if ((labelFor == null) && (locatedLabel.hasChildNodes())) {
+  return locatedLabel.getElementsByTagName('button')[0]
+    || locatedLabel.getElementsByTagName('input')[0]
+    || locatedLabel.getElementsByTagName('textarea')[0]
+    || locatedLabel.getElementsByTagName('select')[0];
 }
+
 return selenium.browserbot.locationStrategies['id'].call(this, labelFor, inDocument, inWindow);

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

@@ -1,4 +1,5 @@
 var locationStrategies = selenium.browserbot.locationStrategies;
+
 return locationStrategies['id'].call(this, locator, inDocument, inWindow)
         || locationStrategies['name'].call(this, locator, inDocument, inWindow)
         || locationStrategies['label'].call(this, locator, inDocument, inWindow)

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

@@ -1,12 +1,32 @@
 var links = inDocument.getElementsByTagName('a');
+
 var candidateLinks = $A(links).select(function(candidateLink) {
-  var textMatched = PatternMatcher.matches(locator, getText(candidateLink));
-  var idMatched = PatternMatcher.matches(locator, candidateLink.id);
-  var titleMatched = PatternMatcher.matches(locator, candidateLink.title);
+  var textMatched = false;
+  var titleMatched = false;
+  var idMatched = false;
+
+  if (getText(candidateLink).toLowerCase().indexOf(locator.toLowerCase()) != -1) {
+    textMatched = true;
+  }
+
+  if (candidateLink.title.toLowerCase().indexOf(locator.toLowerCase()) != -1) {
+    titleMatched = true;
+  }
+
+  if (candidateLink.id.toLowerCase().indexOf(locator.toLowerCase()) != -1) {
+    idMatched = true;
+  }
+
   return textMatched || idMatched || titleMatched;
 });
+
 if (candidateLinks.length == 0) {
   return null;
 }
-candidateLinks = candidateLinks.sortBy(function(s) { return s.length * -1; }); //reverse length sort
+
+//reverse length sort
+candidateLinks = candidateLinks.sortBy(function(s) {
+  return s.length * -1;
+});
+
 return candidateLinks.first();

data/lib/webrat/selenium/selenium_rc_server.rb

@@ -74,8 +74,8 @@ module Webrat
 
       def stop
         silence_stream(STDOUT) do
-          ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", 
-                                                       Webrat.configuration.selenium_server_port, 
+          ::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

@@ -79,7 +79,12 @@ module Webrat
     webrat_deprecate :clicks_button, :click_button
 
     def click_link(link_text_or_regexp, options = {})
-      pattern = adjust_if_regexp(link_text_or_regexp)
+      if link_text_or_regexp.is_a?(Regexp)
+        pattern = "evalregex:#{link_text_or_regexp.inspect}"
+      else
+        pattern = link_text_or_regexp.to_s
+      end
+
       locator = "webratlink=#{pattern}"
       selenium.wait_for_element locator, :timeout_in_seconds => Webrat.configuration.selenium_response_wait_time
       selenium.click locator
@@ -164,7 +169,19 @@ module Webrat
         sleep 0.25
       end
 
-      raise Webrat::TimeoutError.new(message + " (after #{timeout} sec)")
+      error_message = "#{message} (after #{timeout} sec)"
+
+      if $browser
+        error_message += <<-EOS
+
+
+HTML of the page was:
+
+#{selenium.get_html_source}"
+EOS
+      end
+
+      raise Webrat::TimeoutError.new(error_message)
       true
     end
 

data/lib/webrat/selenium/silence_stream.rb

@@ -15,4 +15,4 @@ module Webrat
       end
     end
   end
-end
+end

data/lib/webrat.rb

@@ -2,7 +2,7 @@ require "rack"
 require "nokogiri"
 
 module Webrat
-  VERSION = "0.6pre"
+  VERSION = "0.6.1.pre"
 
   autoload :MechanizeAdapter, "webrat/adapters/mechanize"
   autoload :MerbAdapter, "webrat/adapters/merb"

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

@@ -21,7 +21,9 @@ Spec::Runner.configure do |config|
   end
 
   config.after :suite do
-    Process.kill("TERM", File.read("rack.pid").to_i)
+    if File.exists?("rack.pid")
+      Process.kill("TERM", File.read("rack.pid").to_i)
+    end
   end
 end
 

data/spec/integration/rails/app/controllers/webrat_controller.rb

@@ -40,4 +40,7 @@ class WebratController < ApplicationController
     render :text => params.to_json
   end
 
+  def within
+  end
+
 end

data/spec/integration/rails/app/views/buttons/show.html.erb

@@ -1,11 +1,9 @@
 <h1 id='form_title' class='form title'>Webrat Buttons Form</h1>
 
 <% form_tag "/buttons" do %>
-  <input type="button" id="input_button_id" value="input_button_value" />
   <input type="submit" id="input_submit_id" value="input_submit_value" />
   <input type="image" id="input_image_id" value="input_image_value" alt="input_image_alt" src="" />
 
-  <button type="button" id="button_button_id" value="button_button_value">button_button_text</button>
   <button type="submit" id="button_submit_id" value="button_submit_value">button_submit_text</button>
   <button type="image" id="button_image_id" value="button_image_value">button_image_text</button>
 <% end %>

data/spec/integration/rails/app/views/webrat/buttons.html.erb

@@ -1,11 +1,9 @@
 <h1 id='form_title' class='form title'>Webrat Buttons Form</h1>
 
 <% form_tag submit_path do %>
-  <input type="button" id="input_button_id" value="input_button_value">
   <input type="submit" id="input_submit_id" value="input_submit_value">
   <input type="image" id="input_image_id" value="input_image_value" alt="input_image_alt" src="">
 
-  <button type="button" id="button_button_id" value="button_button_value">button_button_text</button>
   <button type="submit" id="button_submit_id" value="button_submit_value">button_submit_text</button>
   <button type="image" id="button_image_id" value="button_image_value">button_image_text</button>
 <% end %>

data/spec/integration/rails/app/views/webrat/within.html.erb

@@ -0,0 +1,3 @@
+<div id="new_object">
+  <a href="/">Edit Object</a>
+</div>

data/spec/integration/rails/config/environment.rb

@@ -1,4 +1,4 @@
-RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
+# RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
 
 require File.join(File.dirname(__FILE__), 'boot')
 

data/spec/integration/rails/config/routes.rb

@@ -12,6 +12,7 @@ ActionController::Routing::Routes.draw do |map|
     webrat.before_redirect_form     "/before_redirect_form",    :action => "before_redirect_form"
     webrat.redirect_to_show_params  "/redirect_to_show_params", :action => "redirect_to_show_params"
     webrat.show_params              "/show_params",             :action => "show_params"
+    webrat.within                   "/within",                  :action => "within"
 
     webrat.root :action => "form"
   end