RubyGems - diabolo-webrat - Versions diffs - 0.4.4.2 → 0.5.1 - Mend

diabolo-webrat 0.4.4.2 → 0.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (148) hide show

data/.document +4 -0
data/.gitignore +15 -0
data/History.txt +60 -9
data/Rakefile +90 -75
data/VERSION +1 -0
data/lib/webrat.rb +8 -23
data/lib/webrat/{mechanize.rb → adapters/mechanize.rb} +6 -2
data/lib/webrat/adapters/merb.rb +11 -0
data/lib/webrat/adapters/rack.rb +25 -0
data/lib/webrat/{rails.rb → adapters/rails.rb} +9 -18
data/lib/webrat/adapters/sinatra.rb +9 -0
data/lib/webrat/core.rb +0 -1
data/lib/webrat/core/configuration.rb +7 -17
data/lib/webrat/core/elements/area.rb +2 -2
data/lib/webrat/core/elements/element.rb +3 -3
data/lib/webrat/core/elements/field.rb +33 -30
data/lib/webrat/core/elements/form.rb +4 -4
data/lib/webrat/core/elements/label.rb +4 -4
data/lib/webrat/core/elements/link.rb +7 -6
data/lib/webrat/core/elements/select_option.rb +2 -2
data/lib/webrat/core/locators.rb +1 -1
data/lib/webrat/core/locators/area_locator.rb +3 -3
data/lib/webrat/core/locators/button_locator.rb +6 -6
data/lib/webrat/core/locators/field_by_id_locator.rb +3 -3
data/lib/webrat/core/locators/field_labeled_locator.rb +2 -2
data/lib/webrat/core/locators/field_named_locator.rb +3 -3
data/lib/webrat/core/locators/form_locator.rb +1 -1
data/lib/webrat/core/locators/label_locator.rb +2 -2
data/lib/webrat/core/locators/link_locator.rb +20 -12
data/lib/webrat/core/locators/select_option_locator.rb +5 -5
data/lib/webrat/core/logging.rb +1 -1
data/lib/webrat/core/matchers/have_content.rb +2 -7
data/lib/webrat/core/matchers/have_xpath.rb +2 -27
data/lib/webrat/core/methods.rb +4 -4
data/lib/webrat/core/mime.rb +11 -22
data/lib/webrat/core/save_and_open_page.rb +5 -7
data/lib/webrat/core/scope.rb +2 -2
data/lib/webrat/core/session.rb +30 -14
data/lib/webrat/core/xml.rb +41 -84
data/lib/webrat/integrations/merb.rb +10 -0
data/lib/webrat/integrations/rails.rb +9 -0
data/lib/webrat/integrations/rspec-rails.rb +10 -0
data/lib/webrat/integrations/selenium.rb +11 -0
data/lib/webrat/rspec-rails.rb +2 -13
data/lib/webrat/selenium.rb +0 -11
data/lib/webrat/selenium/application_server_factory.rb +40 -0
data/lib/webrat/selenium/application_servers.rb +5 -0
data/lib/webrat/selenium/application_servers/base.rb +46 -0
data/lib/webrat/selenium/application_servers/external.rb +26 -0
data/lib/webrat/selenium/application_servers/merb.rb +50 -0
data/lib/webrat/selenium/application_servers/rails.rb +44 -0
data/lib/webrat/selenium/application_servers/sinatra.rb +37 -0
data/lib/webrat/selenium/location_strategy_javascript/label.js +2 -1
data/lib/webrat/selenium/selenium_rc_server.rb +7 -5
data/lib/webrat/selenium/selenium_session.rb +20 -7
data/lib/webrat/selenium/silence_stream.rb +1 -1
data/spec/fakes/{test_session.rb → test_adapter.rb} +6 -3
data/spec/integration/mechanize/Rakefile +7 -0
data/spec/integration/mechanize/config.ru +2 -0
data/spec/integration/mechanize/sample_app.rb +20 -0
data/spec/integration/mechanize/spec/mechanize_spec.rb +22 -0
data/spec/integration/mechanize/spec/spec_helper.rb +27 -0
data/spec/integration/merb/.gitignore +21 -0
data/spec/integration/merb/Rakefile +35 -0
data/spec/integration/merb/app/controllers/testing.rb +9 -0
data/spec/integration/merb/app/views/exceptions/not_acceptable.html.erb +63 -0
data/spec/integration/merb/app/views/exceptions/not_found.html.erb +47 -0
data/spec/integration/merb/app/views/layout/application.html.erb +12 -0
data/spec/integration/merb/app/views/testing/show_form.html.erb +27 -0
data/spec/integration/merb/app/views/testing/upload.html.erb +9 -0
data/spec/integration/merb/config/router.rb +1 -0
data/spec/integration/merb/spec/spec.opts +1 -0
data/spec/integration/merb/spec/spec_helper.rb +2 -0
data/spec/integration/merb/spec/webrat_spec.rb +7 -0
data/spec/integration/merb/tasks/merb.thor/main.thor +150 -0
data/spec/integration/rack/Rakefile +5 -0
data/spec/integration/rack/app.rb +89 -0
data/spec/integration/rack/test/helper.rb +21 -0
data/spec/integration/rack/test/webrat_rack_test.rb +57 -51
data/spec/integration/rails/.gitignore +3 -0
data/spec/integration/rails/Rakefile +30 -0
data/spec/integration/rails/app/controllers/webrat_controller.rb +13 -9
data/spec/integration/rails/app/views/buttons/show.html.erb +11 -0
data/spec/integration/rails/app/views/fields/show.html.erb +9 -0
data/spec/integration/rails/app/views/links/show.html.erb +5 -0
data/spec/integration/rails/app/views/webrat/before_redirect_form.html.erb +4 -0
data/spec/integration/rails/app/views/webrat/buttons.html.erb +11 -0
data/spec/integration/rails/app/views/webrat/form.html.erb +28 -0
data/spec/integration/rails/config/locales/en.yml +5 -0
data/spec/integration/rails/config/routes.rb +1 -0
data/spec/integration/rails/public/404.html +30 -0
data/spec/integration/rails/public/422.html +30 -0
data/spec/integration/rails/public/500.html +33 -0
data/spec/integration/rails/script/about +4 -0
data/spec/integration/rails/script/console +3 -0
data/spec/integration/rails/script/dbconsole +3 -0
data/spec/integration/rails/script/destroy +3 -0
data/spec/integration/rails/script/generate +3 -0
data/spec/integration/rails/script/performance/benchmarker +3 -0
data/spec/integration/rails/script/performance/profiler +3 -0
data/spec/integration/rails/script/performance/request +3 -0
data/spec/integration/rails/script/plugin +3 -0
data/spec/integration/rails/script/process/inspector +3 -0
data/spec/integration/rails/script/process/reaper +3 -0
data/spec/integration/rails/script/process/spawner +3 -0
data/spec/integration/rails/script/runner +3 -0
data/spec/integration/rails/script/server +3 -0
data/spec/integration/rails/test/integration/button_click_test.rb +2 -2
data/spec/integration/rails/test/integration/link_click_test.rb +7 -1
data/spec/integration/rails/test/integration/webrat_test.rb +22 -0
data/spec/integration/rails/test/test_helper.rb +6 -5
data/spec/integration/sinatra/Rakefile +5 -0
data/spec/integration/sinatra/test/test_helper.rb +3 -2
data/spec/private/core/configuration_spec.rb +8 -27
data/spec/private/core/field_spec.rb +7 -7
data/spec/private/core/link_spec.rb +1 -1
data/spec/private/core/session_spec.rb +23 -21
data/spec/private/mechanize/{mechanize_session_spec.rb → mechanize_adapter_spec.rb} +4 -12
data/spec/private/nokogiri_spec.rb +2 -2
data/spec/private/rails/{rails_session_spec.rb → rails_adapter_spec.rb} +16 -16
data/spec/private/selenium/application_servers/rails_spec.rb +26 -0
data/spec/public/matchers/contain_spec.rb +4 -4
data/spec/public/matchers/have_selector_spec.rb +2 -2
data/spec/public/matchers/have_xpath_spec.rb +3 -3
data/spec/public/save_and_open_spec.rb +25 -6
data/spec/public/selenium/application_server_factory_spec.rb +49 -0
data/spec/public/selenium/application_servers/external_spec.rb +12 -0
data/spec/public/selenium/selenium_session_spec.rb +37 -0
data/spec/rcov.opts +1 -0
data/spec/spec.opts +2 -0
data/spec/spec_helper.rb +5 -1
data/vendor/selenium-server.jar +0 -0
data/webrat.gemspec +348 -0
metadata +176 -23
data/lib/webrat/core/xml/hpricot.rb +0 -19
data/lib/webrat/core/xml/nokogiri.rb +0 -76
data/lib/webrat/core/xml/rexml.rb +0 -24
data/lib/webrat/merb_session.rb +0 -65
data/lib/webrat/rack.rb +0 -24
data/lib/webrat/rack_test.rb +0 -32
data/lib/webrat/selenium/application_server.rb +0 -73
data/lib/webrat/selenium/merb_application_server.rb +0 -48
data/lib/webrat/selenium/rails_application_server.rb +0 -42
data/lib/webrat/selenium/sinatra_application_server.rb +0 -35
data/lib/webrat/sinatra.rb +0 -44
data/spec/integration/rack/rack_app.rb +0 -16
data/spec/integration/rack/test/test_helper.rb +0 -20
data/spec/private/merb/merb_session_spec.rb +0 -42

data/spec/integration/merb/app/views/layout/application.html.erb ADDED Viewed

@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
+  <head>
+    <title>Fresh Merb App</title>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <link rel="stylesheet" href="/stylesheets/master.css" type="text/css" media="screen" charset="utf-8" />
+  </head>
+  <body>
+    <%#= message[:notice] %>
+    <%= catch_content :for_layout %>
+  </body>
+</html>

data/spec/integration/merb/app/views/testing/show_form.html.erb ADDED Viewed

@@ -0,0 +1,27 @@
+<h1>Webrat Form</h1>
+<form action="/testing/submit_form" method="post">
+  <label>
+    Text field
+    <input type="text" name="text_field" />
+  </label>
+  <label>
+    TOS <input type="checkbox" name="tos" />
+  </label>
+  <label>
+    Prefilled
+    <input type="text" name="prefilled" value="text" />
+  </label>
+  <label>
+    Month
+    <select name="month">
+      <option>None</option>
+      <option>January</option>
+    </select>
+  </label>
+  <input type="submit" value="Test">
+</form>

data/spec/integration/merb/app/views/testing/upload.html.erb ADDED Viewed

@@ -0,0 +1,9 @@
+<h1>Webrat Form</h1>
+<form action="/upload" method="post">
+  <label>
+    File
+    <input type="file" name="uploaded_file" />
+  </label>
+  <input type="submit" value="Upload">
+</form>

data/spec/integration/merb/config/router.rb CHANGED Viewed

@@ -28,6 +28,7 @@
 Merb.logger.info("Compiling routes...")
 Merb::Router.prepare do
   match("/").to(:controller => "testing", :action => "show_form")
+  match("/upload").to(:controller => "testing", :action => "upload")
   match("/internal_redirect").to(:controller => "testing", :action => "internal_redirect")
   match("/external_redirect").to(:controller => "testing", :action => "external_redirect")
 end

data/spec/integration/merb/spec/spec.opts ADDED Viewed

	@@ -0,0 +1 @@
1	+ --color

data/spec/integration/merb/spec/spec_helper.rb CHANGED Viewed

@@ -1,5 +1,7 @@
 require "rubygems"
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../../../lib"
 # Add the local gems dir if found within the app root; any dependencies loaded
 # hereafter will try to load from the local gems before loading system gems.
 if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil?

data/spec/integration/merb/spec/webrat_spec.rb CHANGED Viewed

@@ -29,4 +29,11 @@ describe "Webrat" do
     response = visit "/external_redirect"
     response.status.should == 302
   end
+  it "should upload files" do
+    visit "/upload"
+    attach_file "File", __FILE__
+    response = click_button "Upload"
+    response.should contain(%(["webrat_spec.rb", "Tempfile"]))
+  end
 end

data/spec/integration/merb/tasks/merb.thor/main.thor ADDED Viewed

@@ -0,0 +1,150 @@
+require "rubygems"
+require "rubygems/source_index"
+require "rubygems/dependency_installer"
+require "rubygems/uninstaller"
+require "fileutils"
+require File.join(File.dirname(__FILE__), "utils")
+require File.join(File.dirname(__FILE__), "gem_ext")
+require File.join(File.dirname(__FILE__), "ops")
+$INSTALLING = []
+module Merb
+  class Gem < Thor
+    extend ColorfulMessages
+    def initialize
+      dirs = [Dir.pwd, File.dirname(__FILE__) / ".."]
+      root = dirs.find {|d| File.file?(d / "config" / "dependencies.rb")}
+      if root
+        @depsrb = root / "config" / "dependencies.rb"
+      else
+        self.class.error "dependencies.rb was not found"
+        exit!
+      end
+      FileUtils.mkdir_p(Dir.pwd / "gems")
+      @list = Collector.collect(File.read(@depsrb))
+      @idx = ::Gem::SourceIndex.new.load_gems_in("gems/specifications")
+    end
+    def list
+      require "pp"
+      pp @list
+    end
+    desc "redeploy", "Syncs up gems/cache with gems/gems. All gems in the cache " \
+                     "that are not already installed will be installed from the " \
+                     "cache. All installed gems that are not in the cache will " \
+                     "be uninstalled."
+    def redeploy
+      gem_dir = Dir.pwd / "gems" / "gems"
+      cache_dir = Dir.pwd / "gems" / "cache"
+      gems  = Dir[gem_dir / "*"].map!  {|n| File.basename(n)}
+      cache = Dir[cache_dir / "*.gem"].map! {|n| File.basename(n, ".gem")}
+      new_gems = cache - gems
+      outdated = gems - cache
+      idx = ::Gem::SourceIndex.new
+      idx.load_gems_in(Dir.pwd / "gems" / "specifications")
+      new_gems.each do |g|
+        installer = ::Gem::Installer.new(cache_dir / "#{g}.gem",
+          :bin_dir => Dir.pwd / "bin",
+          :install_dir => Dir.pwd / "gems",
+          :ignore_dependencies => true,
+          :user_install => false,
+          :wrappers => true,
+          :source_index => idx)
+        installer.install
+      end
+      outdated.each do |g|
+        /(.*)\-(.*)/ =~ g
+        name, version = $1, $2
+        uninstaller = ::Gem::Uninstaller.new(name,
+          :version => version,
+          :bin_dir => Dir.pwd / "bin",
+          :install_dir => Dir.pwd / "gems",
+          :ignore => true,
+          :executables => true
+        )
+        uninstaller.uninstall
+      end
+    end
+    desc "confirm", "Confirm the current setup. merb:gem:install will " \
+                    "automatically run this task before committing the " \
+                    "changes it makes."
+    def confirm(gems = @list)
+      ::Gem.path.replace([Dir.pwd / "gems"])
+      ::Gem.source_index.load_gems_in(Dir.pwd / "gems" / "specifications")
+      self.class.info "Confirming configuration..."
+      ::Gem.loaded_specs.clear
+      begin
+        gems.each do |name, versions|
+          versions ||= []
+          ::Gem.activate name, *versions
+        end
+      rescue ::Gem::LoadError => e
+        self.class.error "Configuration could not be confirmed: #{e.message}"
+        self.class.rollback_trans
+      end
+      self.class.info "Confirmed"
+    end
+    desc 'install', 'Sync up your bundled gems with the list in config/dependencies.rb'
+    def install(*gems)
+      if gems.empty?
+        gems = @list
+      else
+        gems = gems.map {|desc| name, *versions = desc.split(" ") }
+      end
+      $GEMS = gems
+      self.class.begin_trans
+      gems.each do |name, versions|
+        dep = ::Gem::Dependency.new(name, versions || [])
+        unless @idx.search(dep).empty?
+          next
+        end
+        rescue_failures do
+          $INSTALLING = []
+          _install(dep)
+        end
+      end
+      gem_dir = Dir.pwd / "gems" / "gems"
+      installed_gems  = Dir[gem_dir / "*"].map!  {|n| File.basename(n)}
+      list = full_list.map {|x| x.full_name}.compact
+      (installed_gems - list).each do |g|
+        /^(.*)\-(.*)$/ =~ g
+        name, version = $1, $2
+        uninstaller = ::Gem::Uninstaller.new(name,
+          :version => version,
+          :bin_dir => (Dir.pwd / "bin").to_s,
+          :install_dir => (Dir.pwd / "gems").to_s,
+          :ignore => true,
+          :executables => true
+        )
+        uninstaller.uninstall
+      end
+      confirm(gems)
+      self.class.commit_trans
+    end
+  end
+end

data/spec/integration/rack/Rakefile ADDED Viewed

@@ -0,0 +1,5 @@
+require "rake/testtask"
+Rake::TestTask.new do |t|
+  t.test_files = FileList["test/*_test.rb"]
+end

data/spec/integration/rack/app.rb ADDED Viewed

@@ -0,0 +1,89 @@
+require "rubygems"
+require "sinatra/base"
+class RackApp < Sinatra::Base
+  use_in_file_templates!
+  get "/" do
+    erb :home
+  end
+  get "/go" do
+    erb :go
+  end
+  get "/internal_redirect" do
+    redirect "/"
+  end
+  get "/external_redirect" do
+    redirect "http://google.com"
+  end
+  get "/absolute_redirect" do
+    redirect URI.join(request.url, "foo").to_s
+  end
+  get "/foo" do
+    "spam"
+  end
+  post "/go" do
+    @user = params[:name]
+    @email = params[:email]
+    erb :hello
+  end
+  get "/upload" do
+    erb :uploader
+  end
+  post "/upload" do
+    params[:uploaded_file].to_yaml
+  end
+end
+__END__
+@@ layout
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <title>sinatra testing with webrat</title>
+  <body>
+    <%= yield %>
+  </body>
+</html>
+@@ home
+<p> visit <a href="/go">there</a></p>
+<form>
+  <label>
+    Prefilled
+    <input type="text" name="prefilled" value="text" />
+  </label>
+</form>
+@@ go
+<form method="post" action="/go">
+  <div>
+    <label for="name">Name</label>
+    <input type="text" name="name" id="name">
+  </div>
+  <div>
+    <label for="email">Email</label>
+    <input type="text" name="email" id="email">
+  </div>
+  <input type="submit" value="Submit" />
+</form>
+@@ hello
+<p>Hello, <%= @user %></p>
+<p>Your email is: <%= @email %></p>
+@@ uploader
+<form action="/upload" method="post">
+  <label>
+    File <input type="file" name="uploaded_file" />
+  </label>
+  <input type="submit" value="Upload">
+</form>

data/spec/integration/rack/test/helper.rb ADDED Viewed

@@ -0,0 +1,21 @@
+require "rubygems"
+require "test/unit"
+require "rack/test"
+# require "redgreen"
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../../../lib"
+require "webrat"
+require File.dirname(__FILE__) + "/../app"
+Webrat.configure do |config|
+  config.mode = :rack
+end
+class Test::Unit::TestCase
+  def app
+    Rack::Builder.new {
+      use Rack::Lint
+      run RackApp.new
+    }
+  end
+end

data/spec/integration/rack/test/webrat_rack_test.rb CHANGED Viewed

@@ -1,67 +1,73 @@
-require File.dirname(__FILE__) + "/test_helper"
-require File.dirname(__FILE__) + "/../rack_app"
+require File.dirname(__FILE__) + "/helper"
 class WebratRackTest < Test::Unit::TestCase
-  def test_visit_returns_response
-    response = visit "/"
-    assert response.ok?
+  include Rack::Test::Methods
+  include Webrat::Methods
+  include Webrat::Matchers
+  include Webrat::HaveTagMatcher
+  def build_rack_mock_session
+    Rack::MockSession.new(app, "www.example.com")
   end
-  def test_last_response_is_available
-    visit "/"
-    assert last_response.ok?
+  def test_visits_pages
+     visit "/"
+     click_link "there"
+     assert_have_tag("form[@method='post'][@action='/go']")
   end
-  def test_last_request_is_available
+  def test_submits_form
+    visit "/go"
+    fill_in "Name", :with => "World"
+    fill_in "Email", :with => "world@example.org"
+    click_button "Submit"
+    assert_contain "Hello, World"
+    assert_contain "Your email is: world@example.org"
+  end
+  def test_check_value_of_field
     visit "/"
-    assert_equal "/", last_request.env["PATH_INFO"]
+    assert_equal field_labeled("Prefilled").value, "text"
   end
-  def test_redirects
-    visit "/redirect_absolute_url"
-    assert_equal "spam", response_body
+  def test_follows_internal_redirects
+    visit "/internal_redirect"
+    assert_contain "visit"
   end
-  def test_assertions_after_visit
-    visit "/"
-    assert_contain "Hello World"
+  def test_does_not_follow_external_redirects
+    visit "/external_redirect"
+    assert last_response.redirect?
   end
-  def test_assertions_after_visit
-    get "/"
-    assert_contain "Hello World"
+  def test_absolute_url_redirect
+    visit "/absolute_redirect"
+    assert_contain "spam"
   end
-  # def test_visits_pages
-  #   visit "/"
-  #   assert response_body.include?("visit")
-  #
-  #   click_link "there"
-  #   assert response_body.include?('<form method="post" action="/go">')
-  # end
-  #
-  # def test_submits_form
-  #   visit "/go"
-  #   fill_in "Name", :with => "World"
-  #   fill_in "Email", :with => "world@example.org"
-  #   click_button "Submit"
-  #
-  #   assert response_body.include?("Hello, World")
-  #   assert response_body.include?("Your email is: world@example.org")
-  # end
-  #
-  # def test_check_value_of_field
-  #   visit "/"
-  #   assert field_labeled("Prefilled").value, "text"
-  # end
-  #
-  # def test_follows_internal_redirects
-  #   visit "/internal_redirect"
-  #   assert response_body.include?("visit")
-  # end
-  #
-  # def test_does_not_follow_external_redirects
-  #   visit "/external_redirect"
-  #   assert response_code == 302
-  # end
+  def test_upload_file
+    visit "/upload"
+    attach_file "File", __FILE__, "text/ruby"
+    click_button "Upload"
+    upload = YAML.load(response_body)
+    assert_equal "text/ruby", upload[:type]
+    assert_equal "webrat_rack_test.rb", upload[:filename]
+    assert upload[:tempfile].respond_to?(:read)
+  end
+end
+class WebratRackSetupTest < Test::Unit::TestCase
+  def test_usable_without_mixin
+    rack_test_session = Rack::Test::Session.new(Rack::MockSession.new(app))
+    adapter = Webrat::RackAdapter.new(rack_test_session)
+    session = Webrat::Session.new(adapter)
+    session.visit "/foo"
+    assert_equal "spam", session.response_body
+    assert_equal "spam", rack_test_session.last_response.body
+  end
 end