Commit Graph

68 Commits

Author SHA1 Message Date
Bryan Helmkamp
00d0d7b438 Temporary shim to support Merb's require statement for Webrat 2009-01-18 16:20:58 -05:00
Bryan Helmkamp
fdb94f399c Allow multiple configuration blocks without dropping previous configuration.
If you really want to start with a default configuration use:

  Webrat.configure(Webrat::Configuration.new) do |config|
    ...
  end
2009-01-18 16:15:56 -05:00
Bryan Helmkamp
1731681e79 Merge commit 'cornel/lh_110'
Conflicts:
	History.txt
2009-01-17 16:10:34 -05:00
Bryan Helmkamp
7a7cb3f002 Support passing an ActiveRecord model to #within when in Rails mode [#68 state:resolved] (Luke Melia) 2009-01-17 13:18:42 -05:00
cornel.borcean
c79d2216b2 added selenium_browser_key to allow running on more than firefox, and completed the ability to configure to work with selenium grid."
"
2009-01-12 15:15:11 -06:00
cornel.borcean
e49c341fc0 implemented start and stop selenium server only if the selenium_server_address is nil 2009-01-12 14:17:05 -06:00
cornel.borcean
0edffe0ac4 added selenium_server port and address and application address for configuring selenium more dynamically 2009-01-12 12:50:53 -06:00
cornel.borcean
0ce92dfcd8 changed selenium_environment to application_environment and deprecated selenium_environment and selenium_port 2009-01-12 12:32:14 -06:00
cornel.borcean
33d2cdcc53 changed selenium_port to application_port to reflect what the variable is used for ... 2009-01-12 12:13:22 -06:00
Josh Knowles
9825aee47e Don't follow external redirects 2009-01-04 23:56:52 -05:00
Josh Knowles
34ea3e64b8 Sinatra integration tests for following redirects 2009-01-04 22:34:47 -05:00
Josh Knowles
c3120833b0 Merge branch 'foca/master' 2009-01-04 21:57:25 -05:00
Josh Knowles
e19b1cc323 Rails and Merb integration tests for following redirects 2008-12-29 23:14:26 -05:00
Josh Knowles
e77495bc04 Refactor redirect handling as Merb response doesn't support the redirect? method. All integration specs now passing again. 2008-12-29 22:45:55 -05:00
Josh Knowles
ce364d1663 Refactor redirect support out of RailsSession & SinatraSession and into Session#request_page 2008-12-29 21:19:13 -05:00
Nicolas Sanguinetti
25c3fd73db Rename sinatra session spec so it matches the other ones 2008-12-29 06:14:27 -02:00
Nicolas Sanguinetti
47bc51b864 Merge commit 'brynary/master' 2008-12-29 06:11:04 -02:00
Bryan Helmkamp
b4dd150250 Moving spec/webrat to spec/private and spec/api to spec/public (a la Merb) 2008-12-29 01:06:04 -05:00