Commit Graph

503 Commits

Author SHA1 Message Date
Simon Rozet 7d7c32256d Support for "modular" Sinatra app style
Since Sinatra 0.9, apps can be ancapsulated in a class ("modular" style)
or be on the top level, just like before ("classic" style)

* http://wiki.github.com/brynary/webrat/sinatra
* http://www.sinatrarb.com/extensions.html
2009-02-28 03:30:25 +01:00
Bryan Helmkamp 4115c99c9b Merge branch 'master' into atmos 2009-02-27 20:41:05 -05:00
Bryan Helmkamp b7e0d6f8e6 Prep for 0.4.2 release 2009-02-24 12:29:05 -05:00
Bryan Helmkamp e32a208b7f Fix warning caused by Nokogiri deprecating CSS::Parser.parse (Aaron Patterson) [#176 state:resolved] 2009-02-23 22:19:02 -05:00
Bryan Helmkamp aec889a14d Always deal with one query selector (a String, not an Array) 2009-02-23 22:14:58 -05:00
Bryan Helmkamp 18c60f4e51 Refactoring XPath manipulation 2009-02-23 20:52:17 -05:00
Bryan Helmkamp 29c40bd73c Pulling attribute conditions up from have_selector to have_xpath 2009-02-23 20:47:02 -05:00
Bryan Helmkamp 1625e3e9ba Pulling :content functionality up from have_selector into have_xpath 2009-02-23 20:22:36 -05:00
Bryan Helmkamp a688c28b19 Extracting xpath_escape method 2009-02-23 20:21:23 -05:00
Bryan Helmkamp 9761b64b60 Pulling :count option up from have_selector to have_xpath 2009-02-23 20:18:36 -05:00
Bryan Helmkamp 66d39b851c Allow have_xpath to accept options 2009-02-23 20:15:29 -05:00
Bryan Helmkamp 2296cadb93 Pulling features up from have_tag into have_selector 2009-02-23 20:11:25 -05:00
Corey Donohoe 120a53dced small doc fixup to explain how to use different application frameworks with selenium 2009-02-23 14:21:42 -07:00
Bryan Helmkamp d96899be8c Remove extra whitespace from contain failure message 2009-02-23 11:19:09 -05:00
Corey Donohoe ec06c76b91 use bin/merb if it's available for appserver startup 2009-02-18 12:31:52 -07:00
Corey Donohoe 92565d3bc4 use application_environment in merb also 2009-02-18 12:16:19 -07:00
Bryan Helmkamp 17a8bc7b66 Adding :count option to have_tag 2009-02-15 19:41:44 -05:00
Bryan Helmkamp 932fdab884 Get quoting working for content 2009-02-15 19:32:25 -05:00
Corey Donohoe 63337d4476 it helps if i make sure the spec suite still passes :\ 2009-02-15 14:41:54 -07:00
Corey Donohoe 69dfa5022a Webrat.configuration.application_type => Webrat.configuration.application_framework 2009-02-15 14:40:17 -07:00
Corey Donohoe 7692930769 clean up constant definitions for rails and fix merb port fubar on selenium appserver stop 2009-02-15 14:37:38 -07:00
Corey Donohoe 4bf49a5163 allow picking your appserver type via a configuration option, not discovering framework specific files in the current working directory. also start rack apps with the application port parameter 2009-02-11 11:17:43 -07:00
Corey Donohoe 8fbcbef180 better handling for starting/stopping the server 2009-02-11 10:09:23 -07:00
Corey Donohoe 82eabc31ee small fixup for sinatra + selenium, use rackup instead of mongrel_rails if config.ru exists 2009-02-11 09:25:39 -07:00
Peter Jaros 24eab77ecd Accept do/end blocks in matchers. [#157 state:resolved] 2009-02-09 00:31:17 -05:00
Bryan Helmkamp 7fe667da73 Removing HashWithIndifferentAccess
Doesn't seem to be required, according to our integraton specs
2009-02-09 00:13:41 -05:00
Bryan Helmkamp 7fc6a79bee Merge commit 'teejayvanslyke/master' into lh_159 2009-02-08 21:03:40 -05:00
Bryan Helmkamp 4769a5f90b Detect infinite redirects and raise a Webrat::InfiniteRedirectError (Daniel Lucraft) 2009-02-08 20:54:00 -05:00
Bryan Helmkamp e5ae16367c Prep for 0.4.1 release 2009-01-31 17:58:17 -05:00
Lee Bankewitz 56e6d15811 add uncheck to selenium_session 2009-01-30 15:15:22 -05:00
T.J. VanSlyke ea8e1910d1 Added single-quotes around --chdir argument to mongrel_rails call, as
webrat bombs with a file not found error if RAILS_ROOT contains a space.
2009-01-30 11:37:43 -08:00
Noah Davis 49e86d103f comment out have_tag from selenium matcher which overrides rails' have_tag
partially reverts 483559f279
2009-01-28 14:34:24 -05:00
Bryan Helmkamp 7f9df54838 Merge commit 'lenalena/master' into lh_139 2009-01-27 19:13:53 -05:00
Bryan Helmkamp 33509ef575 Remove stray require of ruby-debug 2009-01-25 19:50:58 -05:00
Mike Gaffney 8d9d907e73 have_tag is built into rails and rspec and we don't want to overload those.
Please use assert_contain or assert_select
Revert "Make have_tag work in rails as well as Merb"

This reverts commit 6e7609e01c.
2009-01-24 13:01:41 -06:00
Noah Davis f956bea7dd Adding rescue from Webrat::TimeoutError in selenium matchers which allows NegativeMatchers to behave correctly 2009-01-24 01:44:05 -05:00
Mike Gaffney f4f0e3b6a7 Merge branch 'master' of git@github.com:brynary/webrat 2009-01-23 22:35:46 -06:00
Amos King 483559f279 Makes have_tag work outside of Merb. 2009-01-23 21:32:54 -06:00
Amos King 6e7609e01c Make have_tag work in rails as well as Merb 2009-01-23 21:13:13 -06:00
Amos King 118b522662 moved have content 2009-01-23 21:03:19 -06:00
Amos King 3a5d34e759 Moved have selector 2009-01-23 21:01:21 -06:00
Amos King 5a91f10a99 Began moving selenium matchers to their own files to be consistent with core matchers and for maintainability. 2009-01-23 20:59:30 -06:00
mike.gaffney cbddebd01c Merge branch 'lh_82' of git@github.com:gaffo/webrat 2009-01-23 16:23:12 -06:00
Noah Davis 996eedb0d2 Switch to using selenium.click instead of .check when checking a checkbox 2009-01-23 17:08:04 -05:00
Amos King 8c0facc5af cleanup and tests closes LH #82 2009-01-23 16:05:33 -06:00
Amos King da59584cdf add the ability for selenium mode to create pids dirs 2009-01-23 15:34:51 -06:00
Amos King 2c9b546a83 Merge branch 'lh_120_tests_with_selenium' of git@github.com:gaffo/webrat into lh_82
Conflicts:
	spec/integration/rails/test/integration/webrat_test.rb
2009-01-23 15:11:16 -06:00
Zach Dennis 0272e81847 Fixed issue where webrat was only using relative paths when making requests for Rails apps. This borked Rails apps that use subdomains [John Hwang/Zach Dennis] 2009-01-20 21:48:48 -05:00
Josh Knowles 7a59353c78 Unfortunately this commit breaks any Rails specs which pass anchor tags. I like the concept, but I'd prefer to work on this post 0.4.1 once I have a bit more time to work out the failures in our referance app.
This reverts commit 4fc2b7eb7e.
2009-01-20 20:08:57 -05:00
Adam Greene 4fc2b7eb7e removing the normalization of url's for the rails session. stipping them of host, port, and anchors is not really needed, especially since josh's redirect change to stop when going to a different host. See comments here: http://webrat.lighthouseapp.com/projects/10503-webrat/tickets/132 2009-01-20 19:30:28 -05:00