aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ActiveJob] extract JobBuffer from helperAbdelkader Boudih2014-08-295-20/+25
|
* Revert "Merge pull request #16254 from ↵Yves Senn2014-08-291-0/+1
| | | | | | | | | | | | | zuhao/refactor_activerecord_attribute_decorators_test" This reverts commit 16fe19831548f108c113094d106663497fc190d5, reversing changes made to 4c81c8ce533896be28bdc0b055ff30bb9dee1316. The call to `Model.reset_column_information` was to express the intent of the test. `reset_column_information` itself can trigger SQL queries because it checks for a tables existance. Let's move it outside of the block. /cc @sgrif
* Merge pull request #16739 from y-yagi/patch-6Yves Senn2014-08-292-2/+2
|\ | | | | [ci skip] Fix example code of ActiveRecord::FixtureSet.context_class
| * [ci skip] Fix example code of ActiveRecord::FixtureSet.context_classyuuji.yaginuma2014-08-292-2/+2
| |
* | Merge pull request #16728 from splattael/invalid_address_errorYves Senn2014-08-292-1/+8
|\ \ | |/ |/| Don't rescue IPAddr::InvalidAddressError
| * Don't rescue IPAddr::InvalidAddressErrorPeter Suschlik2014-08-292-1/+8
|/ | | | | | | | IPAddr::InvalidAddressError does not exist in Ruby 1.9.3 and fails for JRuby in 1.9 mode. As IPAddr::InvalidAddressError is a subclass of ArgumentError (via IPAddr::Error) just rescuing ArgumentError is fine.
* Reset ActiveRecord::Migration.message_count counter before start testingAkira Matsuda2014-08-291-1/+1
|
* Bring original puts back after finishing testsAkira Matsuda2014-08-292-4/+12
|
* Silence another test that runs migrationsAkira Matsuda2014-08-291-0/+5
|
* MigrationTest doesn't need to be verbose anymoreAkira Matsuda2014-08-291-1/+1
|
* No tests are dealing with ActiveRecord::Migration.message_count here anymoreAkira Matsuda2014-08-291-1/+0
|
* Reset ActiveRecord::Migration.verbose to the value beforeAkira Matsuda2014-08-292-2/+5
|
* Demodulize ActiveRecord::MigratorTestAkira Matsuda2014-08-291-284/+282
|
* Merge pull request #16637 from Agis-/redirect-with-constraint-routeAaron Patterson2014-08-283-2/+31
|\ | | | | Fix the router ignoring constraints when used together with a redirect route
| * Don't ignore constraints in redirect routesAgis-2014-08-253-2/+31
| | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/402c2af55053c2f29319091ad21fd6fa6b90ee89 introduced a regression that caused any constraints added to redirect routes to be ignored. Fixes #16605
* | Avoid using heredoc for user warningsGodfrey Chan2014-08-2810-61/+51
| | | | | | | | | | | | | | | | | | | | Using heredoc would enforce line wrapping to whatever column width we decided to use in the code, making it difficult for the users to read on some consoles. This does make the source code read slightly worse and a bit more error-prone, but this seems like a fair price to pay since the primary purpose for these messages are for the users to read and the code will not stick around for too long.
* | No transaction for a test that creates fixtures in the test bodyAkira Matsuda2014-08-291-0/+1
| |
* | make it easy to copy & paste the config from deprecation warning.Yves Senn2014-08-281-2/+3
| | | | | | | | [ci skip]
* | User Model#last to certainly get lastly created dataAkira Matsuda2014-08-281-1/+1
| | | | | | | | This test would fail when executed after any test that calls fixtures(:binaries)
* | Move model definition to test/models for test order indenendencyAkira Matsuda2014-08-283-29/+15
| |
* | Move association definition to the model fileAkira Matsuda2014-08-282-2/+1
| |
* | Be sure that test fixtures satisfy referential integrity before calculatingAkira Matsuda2014-08-281-1/+1
| | | | | | | | | | | | | | There exists some other test files that load :minivans fixtures but don't load :speedometers. Loading :speedometers here prevents the following error when this test was run after such test: CalculationsTest#test_should_group_by_association_with_non_numeric_foreign_key: ActiveRecord::RecordNotFound: Couldn't find all Speedometers with 'speedometer_id': (ABC, s1) (found 1 results, but was looking for 2)
* | Expectations firstAkira Matsuda2014-08-284-9/+9
| |
* | Reset RACK_ENV after modified in a test caseAkira Matsuda2014-08-281-0/+1
| |
* | Rails.root should be a PathnameAkira Matsuda2014-08-281-1/+1
| |
* | No need to sort testsAkira Matsuda2014-08-283-3/+3
| | | | | | | | Dir.glob result must be already sorted anyway
* | Test everythingAkira Matsuda2014-08-281-1/+1
| | | | | | | | This actually was testing test everything, so why not do it simpler?
* | AP test files does no more need to be alphabetically sorted hereAkira Matsuda2014-08-281-4/+1
| |
* | Ignore SCHEMA queries when asserting no queriesAkira Matsuda2014-08-285-22/+22
| |
* | Reset schema properly after schema changing testAkira Matsuda2014-08-281-0/+2
| |
* | Merge pull request #16727 from BanzaiMan/travis-yml-fixRafael Mendonça França2014-08-271-0/+1
|\ \ | | | | | | Add language directive to .travis.yml
| * | Add language directive to .travis.ymlHiro Asari2014-08-271-0/+1
| | | | | | | | | | | | | | | | | | | | | Currently, Travis CI assumes that the project is in Ruby in the absence of the `language` key. This behavior may change in the future. (For example, switch to a "blank" image which *may* be created.)
* | | remove useless parameterAaron Patterson2014-08-271-2/+2
| | |
* | | remove dead codeAaron Patterson2014-08-271-12/+2
|/ / | | | | | | | | | | the ERB has already been compiled to Ruby code by the time we're calling module_eval. Nothing that module eval raises will be caught by a blank `rescue`, so I think we can remove this
* | Merge pull request #16544 from schneems/schneems/death-to-dir-globGuillermo Iguaran2014-08-276-20/+13
|\ \ | | | | | | Refactor out Dir.glob from ActionDispatch::Static
| * | Refactor out Dir.glob from ActionDispatch::Staticschneems2014-08-276-20/+13
|/ / | | | | | | | | | | | | | | Dir.glob can be a security concern. The original use was to provide logic of fallback files. Example a request to `/` should render the file from `/public/index.html`. We can replace the dir glob with the specific logic it represents. The glob {,index,index.html} will look for the current path, then in the directory of the path with index file and then in the directory of the path with index.html. This PR replaces the glob logic by manually checking each potential match. Best case scenario this results in one less file API request, worst case, this has one more file API request. Related to #16464 Update: added a test for when a file of a given name (`public/bar.html` and a directory `public/bar` both exist in the same root directory. Changed logic to accommodate this scenario.
* | Merge pull request #16723 from rubys/mention_assert_select_changesZachary Scott2014-08-271-0/+13
|\ \ | | | | | | [ci skip] mention assert_select in release notes
| * | [ci skip] mention assert_select in release notesSam Ruby2014-08-271-0/+13
|/ /
* | Merge pull request #16717 from splattael/keygeneratorSantiago Pastorino2014-08-271-1/+1
|\ \ | | | | | | Use less iterations for KeyGenerator in tests
| * | Use less iterations for KeyGenerator in testsPeter Suschlik2014-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit improves performance of cookie tests: Ruby | After | Before ----- | --------:| --------: MRI | 5.03s | 9.28s JRuby | 25.45s | 1648.23s Please note the improvement for JRuby.
* | | Merge pull request #16707 from katmutua/masterSantiago Pastorino2014-08-271-3/+3
|\ \ \ | | | | | | | | update 4_2_release_notes
| * | | [ci skip] Update 4_2_release notesJackie Mutua2014-08-271-3/+3
| | | |
* | | | Merge pull request #16702 from sgrif/sg-binary-serializedRafael Mendonça França2014-08-273-0/+31
|\ \ \ \ | | | | | | | | | | Correctly detect mutation on serialized columns mapping to binary
| * | | | Correctly detect mutation on serialized columns mapping to binarySean Griffin2014-08-273-0/+31
| | | | | | | | | | | | | | | | | | | | Fixes #16701
* | | | | Merge pull request #16722 from yui-knk/fix/guides_association_basics2Rafael Mendonça França2014-08-271-4/+4
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Fix typo of `collection_singular_ids=` method.
| * | | | | [ci skip] Fix typo of `collection_singular_ids=` method.yui-knk2014-08-271-4/+4
| | | | | |
* | | | | | Merge pull request #16721 from yui-knk/fix/guides_association_basicsRafael Mendonça França2014-08-271-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [ci skip] Fix typo of `collection=` method.
| * | | | | [ci skip] Fix typo of `collection=` method.yui-knk2014-08-271-4/+4
|/ / / / /
* | | | | Merge pull request #16719 from tgxworld/fix_spelling_in_changelogArun Agrawal2014-08-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix spelling. [CI SKIP]
| * | | | | Fix spelling. [CI SKIP]Guo Xiang Tan2014-08-271-1/+1
|/ / / / /