github-migration
/
webrat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'foca/master'

This commit is contained in:
Josh Knowles 2009-01-04 21:57:25 -05:00
parent e19b1cc323 499dcefefe
commit c3120833b0
8 changed files with 120 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Rakefile
View File

@ -105,14 +105,14 @@ end
namespace :spec do namespace :spec do
desc "Run the integration specs" desc "Run the integration specs"
task :integration => ["integration:rails", "integration:merb"] task :integration => ["integration:rails", "integration:merb", "integration:sinatra"]
namespace :integration do namespace :integration do
desc "Run the Rails integration specs" desc "Run the Rails integration specs"
task :rails do task :rails do
Dir.chdir "spec/integration/rails" do Dir.chdir "spec/integration/rails" do
result = system "rake test:integration" result = system "rake test:integration"
raise "Tests failed" unless result raise "Rails integration tests failed" unless result
end end
end end
@ -120,7 +120,15 @@ namespace :spec do
task :merb do task :merb do
Dir.chdir "spec/integration/merb" do Dir.chdir "spec/integration/merb" do
result = system "rake spec" result = system "rake spec"
raise "Tests failed" unless result raise "Merb integration tests failed" unless result
end
end
desc "Run the Sinatra integration specs"
task :sinatra do
Dir.chdir "spec/integration/sinatra" do
result = system "rake test"
raise "Sinatra tntegration tests failed" unless result
end end
end end
end end

14
lib/webrat/sinatra.rb
View File

@ -2,15 +2,27 @@ require 'webrat/rack'
require 'sinatra' require 'sinatra'
require 'sinatra/test/methods' require 'sinatra/test/methods'
class Sinatra::Application
# Override this to prevent Sinatra from barfing on the options passed from RSpec
def self.load_default_options_from_command_line!
end
end
disable :run
disable :reload
module Webrat module Webrat
class SinatraSession < RackSession #:nodoc: class SinatraSession < RackSession #:nodoc:
include Sinatra::Test::Methods include Sinatra::Test::Methods
attr_reader :request, :response
%w(get head post put delete).each do |verb| %w(get head post put delete).each do |verb|
define_method(verb) do |*args| # (path, data, headers = nil) define_method(verb) do |*args| # (path, data, headers = nil)
path, data, headers = *args path, data, headers = *args
params = data.merge({:env => headers || {}}) params = data.merge(:env => headers || {})
self.__send__("#{verb}_it", path, params) self.__send__("#{verb}_it", path, params)
request_page(response.location, :get, {}) while response.redirect?
end end
end end
end end

5
spec/integration/sinatra/Rakefile Normal file
View File

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

41
spec/integration/sinatra/app.rb Normal file
View File

@ -0,0 +1,41 @@
require "rubygems"
require "sinatra"
use_in_file_templates!
get "/" do
erb :home
end
get "/go" do
erb :go
end
post "/go" do
@user = params[:name]
erb :hello
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>
@@ go
<form method="post" action="/go">
<label for="name">Name</label>
<input type="text" name="name" id="name">
<input type="submit" value="Submit" />
</form>
@@ hello
<p>Hello, <%= @user %></p>

17
spec/integration/sinatra/test/test_helper.rb Normal file
View File

@ -0,0 +1,17 @@
require "rubygems"
require "test/unit"
require "redgreen"
require "sinatra"
require File.dirname(__FILE__) + "/../app"
require File.dirname(__FILE__) + "/../../../../lib/webrat"
Webrat.configure do |config|
config.mode = :sinatra
end
class Test::Unit::TestCase
include Webrat::Methods
Webrat::Methods.delegate_to_session :response_code, :response_body
end

19
spec/integration/sinatra/test/webrat_test.rb Normal file
View File

@ -0,0 +1,19 @@
require File.dirname(__FILE__) + "/test_helper"
class WebratTest < Test::Unit::TestCase
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"
click_button "Submit"
assert response_body.include?("Hello, World")
end
end

13
spec/private/sinatra/helper.rb
View File

@ -1,15 +1,2 @@
require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
require "webrat/sinatra" require "webrat/sinatra"
class Sinatra::Application
# Override this to prevent Sinatra from barfing on the options passed from RSpec
def self.load_default_options_from_command_line!
end
end
Sinatra::Application.default_options.merge!(
:env => :test,
:run => false,
:raise_errors => true,
:logging => false
)

14
spec/private/sinatra/sinatra_spec.rb → spec/private/sinatra/sinatra_session_spec.rb
View File

@ -1,9 +1,11 @@
require File.expand_path(File.dirname(__FILE__) + '/helper') require File.expand_path(File.dirname(__FILE__) + '/helper')
describe Webrat::SinatraSession do describe Webrat::SinatraSession, "API" do
before :each do before :each do
Webrat.configuration.mode = :sinatra Webrat.configuration.mode = :sinatra
@sinatra_session = Webrat::SinatraSession.new @sinatra_session = Webrat::SinatraSession.new
@response = mock("response", :redirect? => false)
@sinatra_session.stub!(:response => @response)
end end
it "should delegate get to get_it" do it "should delegate get to get_it" do
@ -25,4 +27,14 @@ describe Webrat::SinatraSession do
@sinatra_session.should_receive(:delete_it).with("url", { :env => "headers" }) @sinatra_session.should_receive(:delete_it).with("url", { :env => "headers" })
@sinatra_session.delete("url", {}, "headers") @sinatra_session.delete("url", {}, "headers")
end end
it "should use Session#request_page to handle redirects" do
@response.should_receive(:redirect?).twice.and_return(true, false)
@response.should_receive(:location).and_return("redirect url")
@sinatra_session.should_receive(:get_it).with("original url", { :env => "headers" })
@sinatra_session.should_receive(:request_page).with("redirect url", :get, {})
@sinatra_session.get("original url", {}, "headers")
end
end end