spec/webrat/merb/merb_session_spec.rb
@@ -1,4 +1,6 @@
require "webrat"
+
+require "action_controller"
require "action_controller/integration"
module Webrat
lib/webrat/rails.rb
@@ -7,15 +7,24 @@ begin require "redgreen" unless ENV['TM_CURRENT_LINE']; rescue LoadError; end
webrat_path = File.expand_path(File.dirname(__FILE__) + "/../lib/")
$LOAD_PATH.unshift(webrat_path) unless $LOAD_PATH.include?(webrat_path)
-require "merb-core"
-require "webrat/merb"
-
require "webrat"
require File.expand_path(File.dirname(__FILE__) + "/fakes/test_session")
+module Webrat
+ @@previous_config = nil
+
+ def self.cache_config_for_test
+ @@previous_config = Webrat.configuration.clone
+ end
+
+ def self.reset_for_test
+ @@configuration = @@previous_config if @@previous_config
+ end
+end
+
Spec::Runner.configure do |config|
include Webrat::Methods
-
+
def with_html(html)
raise "This doesn't look like HTML. Wrap it in a <html> tag" unless html =~ /^\s*<[^Hh>]*html/i
webrat_session.response_body = html
@@ -26,22 +35,15 @@ Spec::Runner.configure do |config|
webrat_session.response_body = xml
end
-end
-
-module Webrat
- @@previous_config = nil
-
- def self.cache_config_for_test
- @@previous_config = Webrat.configuration.clone
- end
-
- def self.reset_for_test
- @@configuration = @@previous_config if @@previous_config
+ config.before :each do
+ Webrat.cache_config_for_test
end
- class Configuration
- def mode_for_test= (mode)
- @mode = mode
- end
+ config.after :each do
+ Webrat.reset_for_test
end
-end
\ No newline at end of file
+end
+
+Webrat.configure do |config|
+ config.mode = :merb
+end
spec/spec_helper.rb
@@ -4,14 +4,6 @@ describe Webrat::Configuration do
predicate_matchers[:parse_with_nokogiri] = :parse_with_nokogiri?
predicate_matchers[:open_error_files] = :open_error_files?
- before do
- Webrat.cache_config_for_test
- end
-
- after do
- Webrat.reset_for_test
- end
-
it "should have a mode" do
Webrat.configuration.should respond_to(:mode)
end
spec/webrat/core/configuration_spec.rb
@@ -87,12 +87,8 @@ describe Webrat::Session do
describe "#request_page" do
before(:each) do
- Webrat.cache_config_for_test
webrat_session = Webrat::Session.new
end
- after(:each) do
- Webrat.reset_for_test
- end
it "should raise an error if the request is not a success" do
webrat_session.stub!(:get)
spec/webrat/core/session_spec.rb
@@ -1,14 +1,11 @@
require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-describe "Webrat::MechanizeSession" do
- before :all do
- Webrat.cache_config_for_test
+require "webrat/mechanize"
+
+describe Webrat::MechanizeSession do
+ before :each do
Webrat.configuration.mode = :mechanize
end
-
- after :all do
- Webrat.reset_for_test
- end
before(:each) do
@mech = Webrat::MechanizeSession.new
spec/webrat/mechanize/mechanize_session_spec.rb
@@ -1,5 +1,4 @@
require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
-require File.expand_path(File.dirname(__FILE__) + "/helper")
describe HashWithIndifferentAccess do
it "should not update constructor when not a hash" do
spec/webrat/merb/indifferent_access_spec.rb
@@ -1,7 +1,8 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
describe "attach_file" do
before do
+ Webrat.configuration.mode = :rails
@filename = __FILE__
@uploaded_file = mock("uploaded file")
ActionController::TestUploadedFile.stub!(:new => @uploaded_file)
spec/webrat/rails/attaches_file_spec.rb
@@ -1,6 +1,12 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require "webrat/rails"
describe Webrat::RailsSession do
+ before do
+ Webrat.configuration.mode = :rails
+ end
+
it "should delegate response_body to the session response body" do
response = mock("response", :body => "<html>")
integration_session = mock("integration session", :response => response)
spec/webrat/rails/rails_session_spec.rb
spec/webrat/merb/helper.rb
spec/webrat/merb/session_spec.rb
spec/webrat/rails/helper.rb
22c7834512190c5991cd0ff9e27c750037be0405
Bryan Helmkamp
bryan@brynary.com
http://github.com/brynary/webrat/commit/0eaad5276871b4f98da56ae560fa11f4dc8ee6b1
0eaad5276871b4f98da56ae560fa11f4dc8ee6b1
2008-12-25T20:28:29-08:00
2008-12-25T20:25:27-08:00
Cleanup the way the tests switch Webrat modes
0f4a90e5dd6d0e080fb17ef5c3cef8243f55eebf
Bryan Helmkamp
bryan@brynary.com