aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* removing `rails test`, updating docs to show how to use `rake test`Aaron Patterson2013-04-054-180/+5
|
* Update Rake tasks to call `rails test` insteadPrem Sichanugrist2013-04-051-7/+10
| | | | | | | | | Also, print out deprecation warning for other rake tasks except `rake test` and `rake` (default) Conflicts: railties/lib/rails/test_unit/testing.rake railties/test/application/rake_test.rb
* Merge branch 'master' into railstestAaron Patterson2013-04-058-16/+40
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (44 commits) Improve the changelog entry [ci skip] Fix explicit names on multiple file fields Correctly parse bigint defaults in PostgreSQL Move changelog to the top [ci skip] Fix indent and remove extra white spaces Fix scope chaining + STI failing test for #9869 Improve `belongs_to touch: true` timestamp test Sort modules in alphabetical order. Avoid an attempt to fetch old record when id was not present in touch callback Use the correct pk field from the reflected class to find the old record Refactor mail_to to not generate intermediate hashes when adding href Ensure mail_to helper does not modify the given html options hash Use inspect when writing the foreign key from the reflection Use a space after the comment sign when showing the result of commands Exclude template files for rdoc API [ci skip] template should have generic name use | to have more intent revealing code Revert "Merge pull request #10034 from benofsky/fix_skipping_object_callback_filters" stop depending on callbacks ... Conflicts: railties/test/application/rake_test.rb
| * Merge pull request #10092 from amco/masterCarlos Antonio da Silva2013-04-041-10/+16
| |\ | | | | | | Model generator USAGE doc improvement
| | * Model generator USAGE doc improvedJason King2013-04-041-10/+16
| | | | | | | | | | | | | | | | | | * Added information about syntax for precision/scale of decimals * Removed incorrect information about being able to set `default` * Added more examples of usage
| * | Exclude template files for rdoc API [ci skip]Francesco Rodriguez2013-04-041-1/+2
| | |
| * | fix private attribute warningVipul A M2013-04-042-3/+6
| |/
| * fix warnings in railties testVipul A M2013-04-041-3/+3
| |
| * Merge pull request #10080 from vipulnsward/railties_warning_fix_v2Steve Klabnik2013-04-031-1/+1
| |\ | | | | | | add require to suppress warning; remove variable
| | * add require to suppress warning; remove variableVipul A M2013-04-041-1/+1
| | |
| * | Fix some railties test warningsVipul A M2013-04-031-1/+1
| |/
* | do not blow away the test database on every runAaron Patterson2013-04-051-10/+0
| |
* | check pending migrations against the test dbAaron Patterson2013-04-031-15/+1
| |
* | only match the default taskAaron Patterson2013-04-031-1/+1
| |
* | test no longer makes sense after requiring all test filesAaron Patterson2013-04-031-23/+1
| |
* | switch the testing tests to use rakeAaron Patterson2013-04-031-20/+23
| |
* | a test file can be provided to rake, e.g.:Aaron Patterson2013-04-031-1/+10
| | | | | | | | rake test path/to/test.rb
* | switch to Rails::TestTaskAaron Patterson2013-04-032-25/+34
| |
* | default task should also be in the test envAaron Patterson2013-04-031-1/+1
| |
* | Revert "Update Rake tasks to call `rails test` instead"Aaron Patterson2013-04-032-41/+62
| | | | | | | | This reverts commit b51673fbd9563bd3ffa22e22255ca1cef80cfb6d.
* | Revert "Warning removed unused variable task_name"Aaron Patterson2013-04-031-0/+1
| | | | | | | | This reverts commit 106e15927f0dd8060fc37eff44b823a92fa94bd2.
* | apps that depend on active record should load fixturesAaron Patterson2013-04-032-10/+2
|/
* Merge pull request #10074 from ↵Rafael Mendonça França2013-04-032-2/+0
|\ | | | | | | | | trevorturk/remove-fixme-comments-about-legacy-key-generator Remove comments about removing LegacyKeyGenerator in 4.1
| * Remove comments about removing LegacyKeyGenerator in 4.1Trevor Turk2013-04-032-2/+0
| |
* | Avoid running bundler on tests that don't need itSam Ruby2013-04-031-1/+4
| |
* | Getting rid of a few other vestiges of rails.png.Steve Klabnik2013-04-021-1/+0
| | | | | | | | | | | | | | | | | | | | We don't actually need a rails.png in the AP fixtures, the tests that use it don't actually try to load the file. We also don't need to get rid of it with the dummy reset either. Finally, it's not needed in the sample application that's included with the Rails Guides.
* | CHANGELOG entry for rails.png removal.Steve Klabnik2013-04-021-0/+5
| |
* | We don't need to remove index.html any more.Steve Klabnik2013-04-021-1/+0
| | | | | | | | | | Since it's not a real file any longer, no need to worry about removing it when we reset the dummy.
* | .gitkeep -> .keepSteve Klabnik2013-04-021-0/+0
|/ | | | Mentioned in a comment in e90c2d029edc by @frodsan.
* Rename DummyKeyGenerator -> LegacyKeyGeneratorTrevor Turk2013-04-022-4/+4
|
* Fix tests from rails.png removal.Jessica Lynn Suttles2013-04-021-1/+8
| | | | | I'm giving @jlsuttles credit on this commit because she gave me the idea and the actual converted image in 952289aabfb.
* adding .gigkeep to default app/assets/imagesSteve Klabnik2013-04-021-0/+0
|
* Remove rails.png.Steve Klabnik2013-04-022-1/+1
| | | | | | | No reason to have a file, we've got data-URIs now! It didn't make sense to me that you no longer have to remove public/index.html, but you still need to remove rails.png. This means that you won't have to any more when making a new Rails app.
* Merge pull request #3782 from arunagw/warning_mode_onSantiago Pastorino2013-04-021-1/+1
|\ | | | | Turning on warnings in "rake test" for railties
| * Turning on warnings in "rake test" for railtiesArun Agrawal2013-04-011-1/+1
| |
* | Revert "Use jquery-rails from github"Santiago Pastorino2013-04-021-3/+1
| | | | | | | | | | | | | | This reverts commit 7a9a7007637b8279501770be03bd84ce83d61ab8. Conflicts: railties/lib/rails/generators/app_base.rb
* | Fix release task after ceb3b8717beb9818fbfbab429a8aa697591e184aSantiago Pastorino2013-04-011-4/+4
| |
* | Revert more Rails.version changesRafael Mendonça França2013-04-014-5/+5
| | | | | | | | Related with ed8df3ff018d17fad123e48c7cb907332e72e7dc
* | :scissors:Rafael Mendonça França2013-04-011-4/+4
| | | | | | | | [ci skip]
* | Remove CHANGELOG entry for #10002Rafael Mendonça França2013-04-011-4/+0
| | | | | | | | [ci skip]
* | Merge pull request #10002 from charliesome/revert-version-method-on-railsJeremy Kemper2013-04-012-7/+10
|\ \ | | | | | | Reverts changes to Rails.version made in #8501
| * | reverts changes to Rails.version made in #8501Charlie Somerville2013-03-302-7/+10
| | |
* | | Move the class methods to above the protected sectionRafael Mendonça França2013-04-013-47/+36
| | |
* | | Merge pull request #10021 from pabloh/refactor_rails_generator_test_caseRafael Mendonça França2013-04-014-211/+259
|\ \ \ | | | | | | | | | | | | Refactor Rails::Generator::TestCase into modules
| * | | Break down Rails::Generator::TestCase into modulesPablo Herrero2013-03-314-211/+259
| | |/ | |/|
* | | Merge pull request #9978 from trevorturk/cookie-store-auto-upgradeSantiago Pastorino2013-04-014-16/+69
|\ \ \ | |/ / |/| | Cookie-base session store auto-upgrade
| * | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵Trevor Turk2013-03-284-16/+69
| | | | | | | | | | | | Automatically configure cookie-based sessions to use the best cookie jar given the app's config
* | | cleanup railties test; fix typosVipul A M2013-03-313-6/+5
| | |
* | | Make comment about uglifier in generated Gemfile consistent between branchesCarlos Antonio da Silva2013-03-301-1/+1
| | | | | | | | | | | | Introduced in 59d20af2238f7ab553f41b96282722889d8d4393.
* | | Merge pull request #9991 from Passionate/patch-1Rafael Mendonça França2013-03-301-18/+50
|\ \ \ | | | | | | | | improve readability