aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #19404 from dmathieu/remove_rack_envAaron Patterson2015-03-1916-120/+31
|\ \ \ | | | | | | | | Don't fallback to RACK_ENV when RAILS_ENV is not present
| * | | don't fallback to RACK_ENV when RAILS_ENV is not presentDamien Mathieu2015-03-1916-120/+31
| | | |
* | | | Merge branch 'bin_test_runner'. #19216Arthur Neves2015-03-198-20/+10
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | 3 commits were missing when we merged the PR, probably they were lost when that branch was rebased against latest master. This merge, contains those 3 commits.
| * | | Use absolute path on find_method location for the runnerArthur Neves2015-03-192-5/+6
| | | |
| * | | Fix test rake when passing multiple argumentsArthur Neves2015-03-191-2/+2
| | | | | | | | | | | | | | | | bundle exec db:migrate rake was not working, with the new runner, before this commit
| * | | method_source needs to be a hard dependency on railtiesArthur Neves2015-03-195-13/+2
|/ / /
* | | Merge pull request #19216 from senny/bin_test_runnerYves Senn2015-03-1914-65/+411
|\ \ \ | | | | | | | | `bin/rails test` runner (rerun snippets, run tests by line, option documentation)
| * | | run `test_test.rb` using the `bin/rails test`.Yves Senn2015-03-181-17/+1
| | | |
| * | | Use Rails::TestRunner on rake testArthur Neves2015-03-181-16/+17
| | | |
| * | | Fix reporter test and verbose modeArthur Neves2015-03-182-10/+8
| | | |
| * | | move `ENV["BACKTRACE"]` support into the TestRunner.Yves Senn2015-03-183-3/+12
| | | |
| * | | `-p`, `--pattern` to run tests using a pattern.Yves Senn2015-03-182-2/+5
| | | |
| * | | use `bin/rails t` runner in `test_runner_test.rb`.Yves Senn2015-03-183-30/+23
| | | |
| * | | Fix relative dir call on test runnerArthur Neves2015-03-182-15/+24
| | | |
| * | | Add tests for runner#test_files methodArthur Neves2015-03-182-7/+21
| | | |
| * | | Run multiple files on runnerArthur Neves2015-03-182-6/+21
| | | |
| * | | `-e` / `--environment` for the test runner.Yves Senn2015-03-183-2/+22
| | | |
| * | | move argument parsing into the `Runner`.Yves Senn2015-03-182-3/+6
| | | |
| * | | get rid of NAMED_PATTERNS in favor of running a whole directoryYves Senn2015-03-182-7/+12
| | | |
| * | | document running a test by line number.Yves Senn2015-03-181-0/+7
| | | |
| * | | pluralize rerun snippet heading.Yves Senn2015-03-181-1/+1
| | | |
| * | | add tests for our minitest reporter.Yves Senn2015-03-181-0/+76
| | | |
| * | | Show the right file when test raisesArthur Neves2015-03-182-4/+4
| | | |
| * | | Move minitest pluginArthur Neves2015-03-183-21/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Minitest Rails plugin should be loaded on test_help, so we report errors even when not running from the runner. Also fix the backtrace
| * | | Move some logic to runnerArthur Neves2015-03-182-13/+11
| | | |
| * | | Dont display Failed test if suite passedArthur Neves2015-03-181-0/+1
| | | |
| * | | Better file:line parsing and filter method by file tooArthur Neves2015-03-182-11/+45
| | | |
| * | | Add method_source to gemfileArthur Neves2015-03-182-0/+3
| | | |
| * | | no need to escape the method in a regex wrap, minitest does that for usArthur Neves2015-03-181-1/+1
| | | |
| * | | If a nem given, use that name to filter the testArthur Neves2015-03-181-5/+1
| | | |
| * | | Add test run by line, and report error by lineArthur Neves2015-03-183-3/+62
| | | |
| * | | spike of a `OptionParser` backed test runner.Yves Senn2015-03-185-2/+121
| | | |
* | | | Merge pull request #19387 from arthurnn/fix_route_regressionArthur Nogueira Neves2015-03-194-3/+36
|\ \ \ \ | | | | | | | | | | Add a new-line to the end of route method generated code.
| * | | | Add a new-line to the end of route method generated code.Arthur Neves2015-03-184-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix regression on route method that was added by bac812a7ef2660a2fe2ab00822e5e66228379822. The regression was that when calling the `route` method, we were not appending a \n anymore. [fixes #19316]
* | | | | Merge pull request #19406 from larskanis/add_changelog_entry_for_17680Yves Senn2015-03-191-0/+7
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | ActiveRecord: Add a changelog entry for issue #17680. [ci skip] Conflicts: activerecord/CHANGELOG.md
* | | | Merge pull request #19401 from jonatack/patch-3Yves Senn2015-03-191-35/+38
|\ \ \ \ | |_|_|/ |/| | | Active Record changelog pass [skip ci]
| * | | Active Record changelog pass [skip ci]Jon Atack2015-03-191-35/+38
| | | |
* | | | Merge pull request #19403 from akshay-vishnoi/docsAbdelkader Boudih2015-03-191-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] use true as value rather than symbol
| * | | | [ci skip] use true as value rather than symbolAkshay Vishnoi2015-03-191-1/+1
| | | | |
* | | | | Merge pull request #19400 from jamesbowles/patch-1Kasper Timm Hansen2015-03-191-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | [skip ci] Fixed typo in asset pipeline documentation
| * | | | [skip ci] Fixed typoJames2015-03-191-1/+1
|/ / / /
* | | | Merge pull request #19398 from akshay-vishnoi/docsClaudio B.2015-03-181-1/+1
|\| | | | | | | | | | | [ci skip] use false as value rather than symbol
| * | | [ci skip] use false as value rather than symbolAkshay Vishnoi2015-03-191-1/+1
|/ / /
* | | Merge pull request #19391 from crackofdusk/docs_binstubsYves Senn2015-03-181-9/+9
|\ \ \ | |/ / |/| | Change commands in the Getting Started guide to use scripts in bin/ [ci skip]
| * | Change commands in the Getting Started guide to use scripts in bin/Dimiter Petrov2015-03-181-9/+9
|/ / | | | | | | [ci skip]
* | Improve test for leaky scope chaineileencodes2015-03-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a better test for 51660f0. It is testing that the SQL is the same before and after the previously leaky scope is called. Before if `hotel.drink_designers` was called first then `hotel.recipes` would incorrectly get the scope applied. We want to be sure that the polymorphic hm:t association is not leaking into or affecting the SQL for the hm:t association on `Hotel`. The reason I couldn't do this before was because there was an issue with the SQL getting cached and wanted to resolve that later and then fix the test to be better. Because of the caching, this test requires that `Hotel.reflect_on_association(:recipes).clear_association_scope_cache` be called after the first call to `hotel.recipes` to clear the assocation scope chain and not interfere with the rest of the test.
* | Add `clear_association_scope_cache` methodeileencodes2015-03-181-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | In the tests if I were to call `post.categorizations.to_a` and then later call `post.categorizations.to_a` expecting to have different results the 2 queries would be the same because of the caching involved in `@association_scope_cache`. The chain gets cached and the queries will be the same even if they are not supposed to be (i.e. testing an order dependent scoping issue). I found this issue because I was working on a bug with cached scoped in hm:t and hm:t polymorphic relationships but `capture_sql` was outputting the wrong SQL to write a good test.
* | Merge pull request #19240 from yui-knk/refactor/guide_rbYves Senn2015-03-181-45/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove gem check in guides/rails_guides.rb Conflicts: guides/rails_guides.rb
| * | Remove gem check in guides/rails_guides.rbyui-knk2015-03-071-45/+0
| | | | | | | | | | | | | | | Now rails/Gemfile includes nokogiri and redcarpet, so remove gem check from guides/rails_guides.rb
* | | Remove additional handling of boolean attributes on button to helperCarlos Antonio da Silva2015-03-181-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | This logic was just doing duplicated work, since the button_to helper relies on tag/content_tag to generate the button html, which already handles all boolean attributes it knows about. The code dates back to 2005: 43c470fae468ef63e0d5c3dc1e202925685fd47b.