Commit Graph

231 Commits

Author SHA1 Message Date
Marcel Molina
39766a9b4c Don't include a layout when rendering an rjs template using render's :template option.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3316 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-12-17 06:38:06 +00:00
Jeremy Kemper
c140e80fc4 More robust relative url root discovery for SCGI compatibility. This solves the 'SCGI routes problem' -- you no longer need to prefix all your routes with the name of the SCGI mountpoint. References #3070.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3237 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-12-08 04:40:24 +00:00
Marcel Molina
c3612a23e6 Silence deprecation warnings for keep_flash when running tests.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3203 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-12-02 00:39:25 +00:00
Sam Stephenson
bea737eb5a Make ActionController's render honor the :locals option when rendering a :file. Closes #1665.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3157 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-22 08:37:04 +00:00
Jeremy Kemper
cd8686b456 r3173@asus: jeremy | 2005-11-18 23:34:41 -0800
Ticket 2731 - sessions
 r3185@asus:  jeremy | 2005-11-19 18:02:51 -0800
 eliminate const redefinition warning
 r3186@asus:  jeremy | 2005-11-19 19:25:50 -0800
 Use :database option instead of :dbfile
 r3187@asus:  jeremy | 2005-11-19 19:34:31 -0800
 Data writer assigns to instance var.  Since nothing is calling write_attribute on the data column except for marshal_data, simplify data reader to lazy-unmarshal the data column (no worrying whether it's already unmarshaled)
 r3188@asus:  jeremy | 2005-11-19 19:35:40 -0800
 Explicitly create the session class so that subsequent requests for the session can find it in the database.  This is masking a problem with the controller losing its @session instance var and therefore requesting a new session.
 r3189@asus:  jeremy | 2005-11-19 19:36:40 -0800
 Using create unnecessarily  broadens the existing duck-typing so use new + save instead.
 r3194@asus:  jeremy | 2005-11-19 20:28:17 -0800
 Test creation of another instance while first instance is still active.  Should return same session_id.
 r3195@asus:  jeremy | 2005-11-19 20:39:45 -0800
 Always create new AR sessions rather than trying too hard to avoid database traffic.  References #2731.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3100 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-20 04:41:59 +00:00
Marcel Molina
62fe5bbfb1 Make rjs templates always implicitly skip out on layouts.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3084 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-18 08:32:17 +00:00
Marcel Molina
06e74b6c91 Add support for new rjs templates which wrap an update_page block.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3078 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-17 21:28:59 +00:00
Jeremy Kemper
8da9d02e6e Include QUOTED_TYPE constant in ActionPack AR assertions tests.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3059 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-16 09:09:04 +00:00
Jeremy Kemper
745ea39926 MemCache store may be given multiple addresses. Closes #2869.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3054 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-16 08:35:31 +00:00
Jeremy Kemper
08fd13d17c Handle cookie parsing irregularity for certain Nokia phones. Closes #2530.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3039 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-15 07:51:09 +00:00
Jeremy Kemper
0abaf3a2d8 CGI::Session::ActiveRecordStore.data_column_name = 'foobar' to use a different session data column than the 'data' default. References #2731. Remove error-prone method_missing passthrough to session model. Cleanup.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2944 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-09 01:03:24 +00:00
Jeremy Kemper
85baf07be8 Controllers with acronyms in their names (e.g. PDFController) require the correct default helper (PDFHelper in file pdf_helper.rb). Closes #2262. Do not raise an exception when default helper is missing; log a debug message instead. It's nice to delete empty helpers.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2938 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-08 08:23:13 +00:00
David Heinemeier Hansson
a6106e4ec6 Added skip_before_filter/skip_after_filter for easier control of the filter chain in inheritance hierachies [DHH] Added short-hand to assert_tag so assert_tag :tag => "span" can be written as assert_tag "span" [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2873 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-04 19:42:22 +00:00
David Heinemeier Hansson
4f754985d0 Added redirect_to :back as a short-hand for redirect_to(request.env["HTTP_REFERER"])
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2848 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-02 14:47:03 +00:00
Scott Barron
025949102e Fix problem where redirecting components can cause an
infinite loop [Rick Olson]

Closes #2654


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2829 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-30 13:13:02 +00:00
David Heinemeier Hansson
cb0e27cee9 Fix that render :text didn't interpolate instance variables (Closes #2629, #2626) [skaes]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2777 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-28 07:33:54 +00:00
David Heinemeier Hansson
07c494ae24 Added a reader for flash.now, so it's possible to do stuff like flash.now[:alert] ||= 'New if not set' (closes #2422) [Caio Chassot]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2747 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-26 13:14:10 +00:00
Nicholas Seckar
86a571090c Reset template variables after using render_to_string. Closes #2559
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2723 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-25 02:15:08 +00:00
Jeremy Kemper
22d9bad8a0 Expose the session model backing CGI::Session
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2696 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-20 21:59:48 +00:00
Jamis Buck
e515ba9ecd Fix the html-scanner to count children correctly, playing nicely with :only, fixes #2181 [patrick@lenz.sh]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2670 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-18 00:50:52 +00:00
Nicholas Seckar
cb8bb70aa7 Make string-keys locals assigns optional
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2665 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-17 15:51:07 +00:00
Tobias Lütke
0279949b05 added assert_valid to AP
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2635 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-16 02:20:53 +00:00
Nicholas Seckar
e625d27633 Add temporary support for passing locals to render using string keys
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2630 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-16 00:04:33 +00:00
Marcel Molina
48fd667bda Raise an exception if an attempt is made to insert more session data into the ActiveRecordStore data column than the column can hold. Closes #2234.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2612 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-15 14:39:29 +00:00
Scott Barron
f8f4eccd9a If a component redirects when called with render_component_as_string, render the
redirected to action.

Fixes #2327


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2604 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-15 02:53:21 +00:00
Nicholas Seckar
e0e8f0a302 Fix Request#host_with_port to use the standard port when Rails is behind a proxy.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2596 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-15 01:00:25 +00:00
David Heinemeier Hansson
43b6a74fb1 Added :locals support for render :inline #2463 [mdabney@cavoksolutions.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2567 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-13 20:26:39 +00:00
Jeremy Kemper
9a7ff1433a r3575@sedna: jeremy | 2005-10-13 11:22:13 -0700
Eliminate warning for redefined MemCache constant.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2554 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-13 19:05:41 +00:00
Sam Stephenson
4b72a4b12f Unset the X-Requested-With header when using the xhr wrapper in functional tests. Closes #2352.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2551 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-13 18:09:27 +00:00
Sam Stephenson
f49dc37e71 Wrap javascript_tag contents in a CDATA section and add a cdata_section method to TagHelper. Closes #1691.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2543 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-12 22:47:39 +00:00
Sam Stephenson
0886bb391d Fixed that an instance variable with the same name as a partial should be implicitly passed as the partial :object. Closes #2269.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2522 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-10 20:35:13 +00:00
Marcel Molina
a9de9c48c2 Make assert_tag :children count appropriately. Closes #2181.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2500 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-09 01:45:21 +00:00
David Heinemeier Hansson
438db964ad Testing should also use a default REQUEST_METHOD
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2408 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-29 08:43:17 +00:00
Jeremy Kemper
5d19fd7841 Unit tests and fixtures for multipart posts.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2389 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-28 08:19:26 +00:00
Jeremy Kemper
17d2732b1c Ticket #2295 - Tolerate consecutive delimiters in query parameters
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2375 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-27 22:23:37 +00:00
Nicholas Seckar
564077373d Streamline render process, code cleaning. Closes #2294.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2368 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-27 16:45:39 +00:00
Scott Barron
a111e1a271 Keep flash after component is rendered. Closes #2291.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2363 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-27 11:02:11 +00:00
Jeremy Kemper
9852197f83 r3573@asus: jeremy | 2005-09-26 11:38:44 -0700
Ticket 1507 - IE file uploads give the filename as a full Windows path, but Ruby on UNIX doesn't know how to File.basename('C:\\blah\blah.foo').
 r3574@asus:  jeremy | 2005-09-26 14:32:11 -0700
 Get rid of constant redefine warning.
 r3575@asus:  jeremy | 2005-09-26 14:33:07 -0700
 Override the file upload's original_filename singleton method in CGIMethods.get_typed_value.
 r3576@asus:  jeremy | 2005-09-26 14:33:49 -0700
 Unit test overridden original_filename against normal filenames and full Windows paths.
 r3577@asus:  jeremy | 2005-09-26 14:33:57 -0700
 Update change log.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2345 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-26 17:59:46 +00:00
Scott Barron
fa7d4a691f This seems unnecessary to call in teardown and is causing the tests
to error because the table has been dropped.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2331 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-25 10:41:22 +00:00
Thomas Fuchs
2346f5716f Fix open/save dialog in IE not opening files send with send_file/send_data, #2279
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2325 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-25 06:53:42 +00:00
Jamis Buck
4fa9a2bfe2 Require 'pp' early to prevent the pretty-print methods being mixed in too late and messing up a test
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2277 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-20 13:55:27 +00:00
David Heinemeier Hansson
3754822f43 Fixed problem with send_file and WEBrick using stdout #1812
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2274 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-20 10:53:33 +00:00
David Heinemeier Hansson
7f26415d3c Optimized tag_options to not sort keys, which is no longer necessary when assert_dom_equal and friend is available #1995 [skae]. Added assert_dom_equal and assert_dom_not_equal to compare tags generated by the helpers in an order-indifferent manner #1995 [skae]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2271 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-20 07:54:55 +00:00
David Heinemeier Hansson
47292cdef7 Fixed that Request#domain caused an exception if the domain header wasn't set in the original http request #1795 [Michael Koziarski]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2270 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-20 06:44:53 +00:00
Nicholas Seckar
b9c79f195f Add routing tests from #1945
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2257 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-18 14:37:43 +00:00
Nicholas Seckar
57e0cf8e95 Add a routing test case covering #2101
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2256 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-18 14:11:24 +00:00
David Heinemeier Hansson
e9504bb6f7 Cache relative_url_root for all webservers, not just Apache #2193 [skae]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2246 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-15 05:32:16 +00:00
David Heinemeier Hansson
c1505e3e2b Included UrlRewriter tests in rake run and made them not depend on Hash order
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2244 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-15 05:24:29 +00:00
David Heinemeier Hansson
d985260ed7 Made base_tests.rb run as part of rake
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2243 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-15 05:20:32 +00:00
David Heinemeier Hansson
ebb7bd7835 Added easy assignment of fragment cache store through use of symbols for included stores (old way still works too)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2230 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-09-13 08:31:32 +00:00