Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update CHANGELOG to mention the json_escape change, and rearrange stuff a bit. | Prem Sichanugrist | 2011-06-10 | 1 | -21/+23 |
| | |||||
* | Ensure number helpers can handle HTML safe strings - closes #1597. | Andrew White | 2011-06-10 | 2 | -1/+8 |
| | |||||
* | Merge pull request #1523 from raghunadhd/refactor_regex | Xavier Noria | 2011-06-10 | 1 | -4/+7 |
|\ | | | | | rafactored the regex related code in the mapper class | ||||
| * | removed the unnecessary back slashes from the regular expression | Raghunadh | 2011-06-10 | 1 | -2/+2 |
| | | |||||
| * | rafactored the regex related code in the mapper class | Raghunadh | 2011-06-07 | 1 | -4/+7 |
| | | |||||
* | | add missing ensure | Neeraj Singh | 2011-06-10 | 1 | -0/+1 |
| | | |||||
* | | replaced and with && as per coding guidelines | Neeraj Singh | 2011-06-10 | 1 | -1/+1 |
| | | |||||
* | | The test name is misleading. It says | Neeraj Singh | 2011-06-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | test_should_cache_with_trailing_slash_on_url A trailing slash is removed when a page is cached. What the test meant to say was : a url with trailing slash should be cached and the cached page should not have any trailing slash. This patch clarifies the name a bit. | ||||
* | | ensuring that json_escape returns html safe strings when passed an html safe ↵ | Aaron Patterson | 2011-06-09 | 1 | -0/+10 |
| | | | | | | | | string | ||||
* | | Make sure `escape_javascript` return `SafeBuffer` if the incoming argument ↵ | Prem Sichanugrist | 2011-06-09 | 3 | -1/+6 |
| | | | | | | | | is already html_safe | ||||
* | | Merge pull request #1606 from neerajdotname/remove_users_controller_from_test | José Valim | 2011-06-09 | 1 | -3/+0 |
|\ \ | | | | | | | remove unused UserController from test | ||||
| * | | remove unused user_controller from test | Neeraj Singh | 2011-06-08 | 1 | -3/+0 |
| | | | |||||
* | | | class WithSymbolReturningString is not used anywhere in the test. | Neeraj Singh | 2011-06-08 | 1 | -12/+0 |
|/ / | | | | | | | | | | | | | | | | | | | | | Secondly it seemed from the method that the intent was to test a case where layout was declared in a symbol and the method named mention in layout returns nil. That case is already covered with class class WithSymbolReturningNil . Also the case of SymbolReturningString is covered with the class WithSymbol. | ||||
* | | Indention style + whitespace for readability | David Heinemeier Hansson | 2011-06-09 | 1 | -33/+38 |
| | | |||||
* | | If you set a js_compressor, it means that you want shit compressed -- we ↵ | David Heinemeier Hansson | 2011-06-09 | 1 | -2/+2 |
| | | | | | | | | dont need a second option to turn that on | ||||
* | | Update CHANGELOG to mention the new SafeBuffer change | Prem Sichanugrist | 2011-06-08 | 1 | -0/+29 |
| | | |||||
* | | Merge pull request #1560 from sikachu/master-escapejs | José Valim | 2011-06-08 | 2 | -1/+8 |
|\ \ | | | | | | | Make escape_javascript happy to handle SafeBuffers | ||||
| * | | Make escape_javascript happy to handle SafeBuffers | Paul Gallagher | 2011-06-08 | 2 | -1/+8 |
| | | | | | | | | | | | | | | | * see GH#1553 * allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block | ||||
* | | | Make test meaningful | Neeraj Singh | 2011-06-08 | 1 | -1/+1 |
|/ / | | | | | | | | | | | | | | | | | | | If before_filter list was being called mistakenly then the test should fail. However test will not fail because second filter is assigning new values to @list. To truly test that first before_filter is not called when it should not be called then @list should not assigned value unconditionally. This patch will make the test fail if first filter is called. | ||||
* | | Merge pull request #1549 from neerajdotname/rename_to_method_for_action | José Valim | 2011-06-08 | 1 | -2/+2 |
|\ \ | | | | | | | test name should reflect the name of the method | ||||
| * | | test name should reflect the name of the method | Neeraj Singh | 2011-06-08 | 1 | -2/+2 |
| | | | | | | | | | | | | that is actually being called | ||||
* | | | Merge pull request #1548 from neerajdotname/remove_class_me5 | José Valim | 2011-06-08 | 1 | -6/+0 |
|\ \ \ | | | | | | | | | remove unused class from test | ||||
| * | | | remove unused class from test | Neeraj Singh | 2011-06-08 | 1 | -6/+0 |
| |/ / | |||||
* | | | Merge pull request #1547 from sikachu/safebuffer | José Valim | 2011-06-07 | 3 | -5/+10 |
|\ \ \ | |/ / |/| | | Fix ActionPack tests on `master` | ||||
| * | | Fix failing test on uninitialized `Rails.config.assets.prefix` | Prem Sichanugrist | 2011-06-08 | 1 | -0/+1 |
| | | | | | | | | | | | | This was introduced in [2684f17a17e4f97bdb89d20b4cd08585235263a2] :bomb: | ||||
| * | | Add proper fix to `mail_to` helper. | Prem Sichanugrist | 2011-06-08 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | * Fix the problem on manipulating on the `ActiveSupport::SafeBuffer` * Make sure that we run `escape_javascript` on the `String`, to avoid unexpected behavior. | ||||
| * | | Adapt [823aa223efbac6ad4d31ea33402892267bb77cb4] to make sure we perform ↵ | Prem Sichanugrist | 2011-06-08 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | cloning before manipulation only on `OutputBuffer`. After the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa223efbac6ad4d31ea33402892267bb77cb4] does not play nice with the String, and result in the fragment got lost. | ||||
* | | | Merge pull request #1542 from cmeiklejohn/dont_gsub_on_safebuffer | José Valim | 2011-06-07 | 1 | -1/+2 |
|\ \ \ | |/ / |/| | | Don't operate on the safebuffer, operate on a string and convert. | ||||
| * | | Don't operate on the safebuffer, operate on a string and convert. | Christopher Meiklejohn | 2011-06-07 | 1 | -1/+2 |
| | | | |||||
* | | | remove warning: assigned but unused variable | Santiago Pastorino | 2011-06-08 | 13 | -19/+10 |
| | | | |||||
* | | | Fragment caching needs to operate on the pure output, not the | Christopher Meiklejohn | 2011-06-07 | 1 | -1/+3 |
|/ / | | | | | | | safebuffer. | ||||
* / | Update asset helpers to use `config.assets.prefix` | Joshua Peek | 2011-06-07 | 1 | -2/+2 |
|/ | | | Fixes #1489 | ||||
* | Added missing assert to test checking form with namespaced isolated model ↵ | Piotr Sarnacki | 2011-06-07 | 2 | -6/+6 |
| | | | | and fixed helpers to work correctly in such case | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-06 | 9 | -14/+13 |
|\ | | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS | ||||
| * | Remove trailing white-spaces | Guillermo Iguaran | 2011-06-05 | 5 | -6/+5 |
| | | |||||
| * | some grammatical corrections | Vijay Dev | 2011-06-04 | 1 | -3/+3 |
| | | |||||
| * | Removing trailing white-spaces | Guillermo Iguaran | 2011-05-31 | 1 | -2/+2 |
| | | |||||
| * | The example in the API docs incorrectly indicated that form_for would use ↵ | Mark Roghelia | 2011-05-31 | 1 | -2/+2 |
| | | | | | | | | the same default route for both new and previously persisted records. The default path given in the example would have generated a routing error for new records. form_for actually uses polymorphic_path to determine which route to use based on the state of the record. The example has been updated to reflect the method's actual behavior. | ||||
| * | Added missing quote in grouped_options_for_select example | diego | 2011-05-26 | 1 | -1/+1 |
| | | |||||
* | | Use Latest Sprockets beta | David Heinemeier Hansson | 2011-06-06 | 1 | -1/+1 |
| | | |||||
* | | Move CHANGELOG entry to future version | Andrew White | 2011-06-05 | 1 | -1/+4 |
| | | |||||
* | | Add backward compatibility for testing cookies | Andrew White | 2011-06-05 | 4 | -5/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit restores the ability to assign cookies for testing via @request.env['HTTP_COOKIE'] and @request.cookies, e.g: @request.env['HTTP_COOKIE'] = 'user_name=david' get :index assert_equal 'david', cookies[:user_name] and @request.cookies[:user_name] = 'david' get :index assert_equal 'david', cookies[:user_name] Assigning via cookies[] is the preferred method and will take precedence over the other two methods. This is so that cookies set in controller actions have precedence and are carried over between calls to get, post, etc. | ||||
* | | Ensure cookie keys are strings | Andrew White | 2011-06-05 | 2 | -2/+12 |
| | | |||||
* | | Merge pull request #1426 from arunagw/sprockets_gem_update | José Valim | 2011-06-05 | 1 | -1/+1 |
|\ \ | | | | | | | sprockets gem update to beta9 | ||||
| * | | sprockets gem update to beta9 | Arun Agrawal | 2011-05-31 | 1 | -1/+1 |
| | | | |||||
* | | | Allow multiple sources in Sprockets helpers | Guillermo Iguaran | 2011-06-05 | 4 | -28/+40 |
| | | | |||||
* | | | Add missing require for cookies middleware | Andrew White | 2011-06-04 | 1 | -0/+1 |
| | | | |||||
* | | | Refactor ActionController::TestCase cookies | Andrew White | 2011-06-04 | 8 | -65/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning cookies for test cases should now use cookies[], e.g: cookies[:email] = 'user@example.com' get :index assert_equal 'user@example.com', cookies[:email] To clear the cookies, use clear, e.g: cookies.clear get :index assert_nil cookies[:email] We now no longer write out HTTP_COOKIE and the cookie jar is persistent between requests so if you need to manipulate the environment for your test you need to do it before the cookie jar is created. | ||||
* | | | Merge pull request #1447 from dmathieu/empty_route | Piotr Sarnacki | 2011-06-01 | 2 | -1/+9 |
|\ \ \ | | | | | | | | | Fix creating an empty route on 1.8. Closes #1210 | ||||
| * | | | fix creating an empty route on 1.8. Closes #1210 | Damien Mathieu | 2011-06-01 | 2 | -1/+9 |
| |/ / |