Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix description for application_name method - change simple to simply | Prathamesh Sonpatki | 2014-12-30 | 1 | -1/+1 |
| | | | | [ci skip] | ||||
* | Template lookup now respect default locale and I18n fallbacks. | Rafael Mendonça França | 2014-12-29 | 6 | -11/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Given the following templates: mailer/demo.html.erb mailer/demo.en.html.erb mailer/demo.pt.html.erb Before this change for a locale that doesn't have its related file the `mailer/demo.html.erb` will be rendered even if `en` is the default locale. Now `mailer/demo.en.html.erb` has precedence over the file without locale. Also, it is possible to give a fallback. mailer/demo.pt.html.erb mailer/demo.pt-BR.html.erb So if the locale is `pt-PT`, `mailer/demo.pt.html.erb` will be rendered given the right I18n fallback configuration. Fixes #11884. | ||||
* | Move Rake tasks list to a smaller heading section earlier in the guide. | Zachary Scott | 2014-12-29 | 1 | -21/+21 |
| | | | | | It makes more sense here, rather than after explaining all of the testing facilities of Rails. [ci skip] | ||||
* | Condense notes regarding Minitest and its available assertions removed in: | Zachary Scott | 2014-12-29 | 1 | -38/+19 |
| | | | | | | | | 82b75eda70f8c30f7c418e7350532a3a0ed2a8c3 Also explain how Rails inherits capabilities from Minitest. Test classes should be roughly the same based on this information, we can address them at a high level when introducing the first test case. [ci skip] | ||||
* | Remove redundant information about Minitest, which is already covered when | Zachary Scott | 2014-12-29 | 1 | -8/+0 |
| | | | | assertions are introduced. [ci skip] | ||||
* | Move longer form example from integration guide to api reference, below an | Zachary Scott | 2014-12-29 | 2 | -74/+78 |
| | | | | | | | | existing example. [ci skip] My reasoning is that this is probably too much information for the complete Rails testing guide, as we're trying to cover testing all aspects of the framework. | ||||
* | Grammar pass through Integration Testing section [ci skip] | Zachary Scott | 2014-12-29 | 1 | -3/+3 |
| | |||||
* | fix error message of option as with invalid charters in partial rendering | Angelo capilleri | 2014-12-29 | 3 | -5/+32 |
| | | | | | before this PR IDENTIFIER_ERROR_MESSAGE could lead to misunderstand the convention of partial name. Added OPTION_AS_ERROR_MESSAGE for unvalid charter in as option. | ||||
* | Merge branch 'master' of github.com:rails/rails [ci skip] | Zachary Scott | 2014-12-29 | 1 | -0/+8 |
|\ | |||||
| * | Merge pull request #18249 from claudiob/add-doc-for-save-with-touch | Rafael Mendonça França | 2014-12-29 | 1 | -0/+8 |
| |\ | | | | | | | Add doc for `:touch` option of AR::Base#save | ||||
| | * | Add doc for `:touch` option of AR::Base#save | claudiob | 2014-12-30 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::Base `save` and `save!` take an option boolean `:touch` parameter since #18225 (stems from #18202). This commit document that parameter. [ci skip] | ||||
* | | | Remove pre-4.2 comment about missing `assert_select` [ci skip] | Zachary Scott | 2014-12-29 | 1 | -2/+0 |
| | | | |||||
* | | | Update link to rails-dom-testing documentation [ci skip] | Zachary Scott | 2014-12-29 | 1 | -1/+1 |
| | | | |||||
* | | | Pass through `assert_select` testing guide [ci skip] | Zachary Scott | 2014-12-29 | 1 | -4/+9 |
|/ / | |||||
* | | Implement testing `flash` notices into our blog app [ci skip] | Zachary Scott | 2014-12-29 | 1 | -3/+62 |
| | | |||||
* | | Pass through Testing Templates and Layouts section [ci skip] | Zachary Scott | 2014-12-29 | 1 | -11/+13 |
| | | |||||
* | | These are technically objects [ci skip] | Zachary Scott | 2014-12-29 | 1 | -2/+2 |
| | | |||||
* | | Rephrase Four Hashes of the Apocalypse [ci skip] | Zachary Scott | 2014-12-29 | 1 | -1/+1 |
|/ | |||||
* | Compare http request type with test equivalent methods, and application ↵ | Zachary Scott | 2014-12-29 | 1 | -2/+2 |
| | | | | | | use-cases. Briefly explain difference between Functional and Request type tests. [ci skip] | ||||
* | Merge pull request #18246 from aprescott/document-include_all_helpers-setting | Rafael Mendonça França | 2014-12-29 | 1 | -0/+2 |
|\ | | | | | Document the include_all_helpers config setting | ||||
| * | Document the include_all_helpers config setting. | Adam Prescott | 2014-12-29 | 1 | -0/+2 |
| | | | | | | | | | | This config setting has been available for quite a while but was not documented. | ||||
* | | Merge pull request #18244 from cristianbica/remove-object-itself | Rafael Mendonça França | 2014-12-29 | 3 | -25/+0 |
|\ \ | |/ |/| | Removed Object#itself as it's implemented in ruby 2.2 | ||||
| * | Removed Object#itself as it's implemented in ruby 2.2 | Cristian Bica | 2014-12-29 | 3 | -25/+0 |
| | | |||||
* | | Rephrase functional testing in its relation to Rails Controller Unit Testing. | Zachary Scott | 2014-12-29 | 1 | -1/+1 |
|/ | | | | [ci skip] | ||||
* | Merge pull request #18243 from JoshCheek/mailer_guide_code_example | Carlos Antonio da Silva | 2014-12-29 | 1 | -1/+3 |
|\ | | | | | Guide for Action Mailer Basics: Un-inline if statement | ||||
| * | Un-inline if statement | Josh Cheek | 2014-12-29 | 1 | -1/+3 |
|/ | | | | | The single line was long enough that it rendered on two lines, causing the example to look like syntactically invalid code. | ||||
* | Merge pull request #18240 from shunsukeaida/add_tzinfo_data_to_plugin_gemfile | Rafael Mendonça França | 2014-12-29 | 1 | -0/+4 |
|\ | | | | | plugin's gemfile also needs tzinfo-data in Windows | ||||
| * | plugin's gemfile also needs tzinfo-data in Windows | ShunsukeAida | 2014-12-30 | 1 | -0/+4 |
| | | |||||
* | | Remove some warning with Ruby 2.2 | Rafael Mendonça França | 2014-12-29 | 1 | -1/+1 |
| | | |||||
* | | Ensure `first!` and friends work on loaded associations | Sean Griffin | 2014-12-29 | 3 | -0/+12 |
| | | | | | | | | Fixes #18237 | ||||
* | | Require Arel 7.0.0.alpha | Sean Griffin | 2014-12-29 | 1 | -1/+1 |
| | | |||||
* | | Remove all cases of manuallly wrapping `Arel::Nodes::Quoted` | Sean Griffin | 2014-12-29 | 7 | -34/+15 |
| | | | | | | | | | | | | | | | | | | | | This is no longer required now that we are injecting a type caster object into the Arel table, with the exception of uniqueness validations. Since it calls `ConnectionAdapter#type_cast`, the value has already been cast for the database. We don't want Arel to attempt to cast it further, so we need to continue wrapping it in a quoted node. This can potentially go away when this validator is refactored to make better use of `where` or the predicate builder. | ||||
* | | Pass a type caster when aliasing tables for joins | Sean Griffin | 2014-12-29 | 4 | -10/+15 |
| | | |||||
* | | Fix failing tests | Sean Griffin | 2014-12-29 | 1 | -8/+4 |
| | | |||||
* | | Extract an explicit type caster class | Sean Griffin | 2014-12-29 | 8 | -39/+69 |
| | | |||||
* | | Rely on the injectable type caster for `arel_table` | Sean Griffin | 2014-12-29 | 6 | -74/+22 |
| | | | | | | | | | | | | | | This API will require much less consuming code to change to accomodate the removal of automatic type casting from Arel. As long as the predicates are constructed using the `arel_table` off of an AR subclass, there will be no changes that need to happen. | ||||
* | | Merge pull request #18097 from k0kubun/readonly-eager_load | Rafael Mendonça França | 2014-12-29 | 3 | -1/+11 |
|\ \ | | | | | | | `eager_load` preserves readonly flag for associations | ||||
| * | | `eager_load` preserves readonly flag for associations | Takashi Kokubun | 2014-12-30 | 3 | -1/+11 |
| | | | |||||
* | | | Add nodoc to touch at no_touching.rb | Rafael Mendonça França | 2014-12-29 | 1 | -1/+1 |
| |/ |/| | | | | | | | | | It is already docummented at persistence.rb. [ci skip] | ||||
* | | Just check if the buffer exists before changing it | Rafael Mendonça França | 2014-12-29 | 2 | -6/+4 |
| | | |||||
* | | Merge pull request #18236 from vipulnsward/dont-eval-frozen | Rafael Mendonça França | 2014-12-29 | 2 | -1/+12 |
|\ \ | |/ |/| | | | Fix html_safe string access modifying frozen values | ||||
| * | When trying to access a character on a string buffer object via `:[]`, if ↵ | Vipul A M | 2014-12-29 | 2 | -1/+12 |
|/ | | | | | | | | | | | | | | | | the object being accessed currently returns `html_safe?` as true, we used to set `@html_safe` variable as true on new object created. When doing something like x = 'Hello'.html_safe x[/a/, 1] would throw an error on ruby 2.2, since when nothign gets matched nil is returned by the code and it tries to set `@html_safe` value to true, which would error since starting 2.2 nil is frozen. This change adds a safety net to avoid setting `@html_safe = true` on frozen objects. Fixes #18235 | ||||
* | Merge pull request #18232 from yousuketto/doc-for-bundler-require | Yves Senn | 2014-12-29 | 1 | -1/+1 |
|\ | | | | | adjust args of Bundler.require in guides [ci skip] | ||||
| * | adjust args of Bundler.require in guides [ci skip] | Yosuke | 2014-12-29 | 1 | -1/+1 |
|/ | | | | | | Arguments of Bundler.require of generator has been changed from rails4.0.4. https://github.com/rails/rails/blob/v4.0.4/railties/lib/rails/generators/rails/app/templates/config/application.rb#L16 | ||||
* | Merge pull request #18231 from untidy-hair/improve_a_test | Guillermo Iguaran | 2014-12-28 | 1 | -1/+1 |
|\ | | | | | Expectation comes first | ||||
| * | Expectation comes first | Yukio Mizuta | 2014-12-28 | 1 | -1/+1 |
|/ | |||||
* | Minor documentation edits [ci skip] | Robin Dupret | 2014-12-28 | 6 | -19/+19 |
| | |||||
* | Merge pull request #18209 from claudiob/bump-to-2-2 | Guillermo Iguaran | 2014-12-28 | 10 | -12/+12 |
|\ | | | | | Require Ruby 2.2 for Rails 5.0 | ||||
| * | Require Ruby 2.2 for Rails 5.0 | claudiob | 2014-12-26 | 10 | -12/+12 |
| | | | | | | | | | | Stems from [this comment](https://github.com/rails/rails/pull/18203#issuecomment-68138096) by @robin850 and by the blog post http://weblog.rubyonrails.org/2014/12/19/Rails-4-2-final | ||||
* | | Merge pull request #18213 from agrobbin/moar-concerns | Sean Griffin | 2014-12-28 | 3 | -4/+34 |
|\ \ | | | | | | | Actually autoload all second-level directories called `app/*/concerns` |