Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixes #16255 [ci skip] | Akshay Vishnoi | 2014-07-22 | 1 | -1/+1 |
| | |||||
* | Merge pull request #16231 from Envek/type_in_references | Yves Senn | 2014-07-22 | 6 | -5/+56 |
|\ | | | | | | | | | | | * Allow to specify a type for foreign key column in migrations * unified the docs * some cleanup in CHANGELOG | ||||
| * | Allow to specify a type for foreign key column in migrations | Andrey Novikov | 2014-07-22 | 6 | -3/+46 |
|/ | | | | [Andrey Novikov & Łukasz Sarnacki] | ||||
* | Merge pull request #16253 from ↵ | Yves Senn | 2014-07-22 | 1 | -1/+1 |
|\ | | | | | | | | | zuhao/refactor_activerecord_nested_through_associations_test Make sure assertion passes for postgresql. | ||||
| * | Make sure assertion passes for postgresql. | Zuhao Wan | 2014-07-22 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #16254 from ↵ | Yves Senn | 2014-07-22 | 1 | -1/+0 |
|\ \ | |/ |/| | | | | | zuhao/refactor_activerecord_attribute_decorators_test Remove redundant reset that already happened in teardown. | ||||
| * | Remove redundant that already happened in teardown. | Zuhao Wan | 2014-07-22 | 1 | -1/+0 |
|/ | |||||
* | build fix, remove not null constraint. | Yves Senn | 2014-07-22 | 1 | -1/+1 |
| | | | | | | | | | | | The fixtures are still in play, adding a new column without a default and `null: true` is not possible. This reverts back to leaking global state, as our `schema.rb` adds the `null: false` constraint on this field. A future solution would be to make the `migration_test.rb` run independent of fixture tables. This way we can simply drop the state after test execution, without worrying about side effects. /cc @zuhao | ||||
* | Merge pull request #16250 from zuhao/refactor_activerecord_migration_test | Yves Senn | 2014-07-22 | 1 | -1/+1 |
|\ | | | | | Remove length limit that results failure in other tests. | ||||
| * | Remove length limit that results failure in other tests. | Zuhao Wan | 2014-07-22 | 1 | -1/+1 |
| | | |||||
* | | docs, add example for running a single test against core adapters. | Yves Senn | 2014-07-22 | 1 | -0/+6 |
| | | | | | | | | [ci skip] | ||||
* | | Merge pull request #16248 from ↵ | Yves Senn | 2014-07-22 | 1 | -2/+3 |
|\ \ | |/ |/| | | | | | zuhao/refactor_activerecord_presence_validation_test Remove the side-effects of validates_presence_of. | ||||
| * | Remove the side-effects of validates_presence_of. | Zuhao Wan | 2014-07-22 | 1 | -2/+3 |
|/ | |||||
* | Merge pull request #16232 from egilburg/activesupport_coverage | Rafael Mendonça França | 2014-07-21 | 11 | -4/+114 |
|\ | | | | | Added some missing activesupport test coverage | ||||
| * | missing activesupport test coverage | Eugene Gilburg | 2014-07-19 | 11 | -4/+114 |
| | | |||||
* | | Merge pull request #16239 from akshay-vishnoi/remove-require | Rafael Mendonça França | 2014-07-21 | 1 | -1/+0 |
|\ \ | | | | | | | Remove not-required file class/subclasses | ||||
| * | | Remove not-required file class/subclasses | Akshay Vishnoi | 2014-07-21 | 1 | -1/+0 |
| | | | |||||
* | | | Merge pull request #16242 from vadivelan-k/content_verifier | Arthur Nogueira Neves | 2014-07-21 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Touch option description grammatical error fixed [ci skip] | ||||
| * | | | Touch option description grammatical error fixed [ci skip] | vadivelan | 2014-07-21 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #16240 from siddharthbhagwan/master | Eileen M. Uchitelle | 2014-07-21 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Generators guide grammatical error fixed [ci skip] | ||||
| * | | Generator guide grammatical error fixed [ci skip] | Siddharth Bhagwan | 2014-07-21 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #16236 from y-yagi/patch-1 | Yves Senn | 2014-07-21 | 1 | -1/+1 |
|\ \ | |/ |/| | [ci skip] Fix code in Routing Guide | ||||
| * | [ci skip] Fix code in Routing Guide | yuuji.yaginuma | 2014-07-21 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'rm-remove-mocha' | Rafael Mendonça França | 2014-07-19 | 20 | -84/+182 |
|\ | | | | | | | | | Conflicts: actionpack/test/abstract_unit.rb | ||||
| * | Stop requiring mocha automatically | Rafael Mendonça França | 2014-07-19 | 14 | -5/+19 |
| | | | | | | | | | | | | | | | | | | | | | | We are planning to remove mocha from our test suite because of performance problems. To make this possible we should stop require mocha on ActionSupport::TestCase. This should not affect applications since users still need to add mocha to Gemfile and this already load mocha. Added FIXME notes to place that still need mocha removal | ||||
| * | Stop using mocha on dbconsole_test | Rafael Mendonça França | 2014-07-15 | 1 | -44/+68 |
| | | |||||
| * | Stop using mocha on console_test | Rafael Mendonça França | 2014-07-07 | 1 | -15/+40 |
| | | |||||
| * | Set the application logger using configuration | Rafael Mendonça França | 2014-07-07 | 1 | -3/+5 |
| | | |||||
| * | Stop using mocha on configuration_test | Rafael Mendonça França | 2014-07-07 | 1 | -7/+23 |
| | | |||||
| * | Stop using mocha on app_rails_loader_test | Rafael Mendonça França | 2014-07-07 | 2 | -10/+27 |
| | | |||||
* | | Merge pull request #16230 from egilburg/before_type_cast_coverage | Rafael Mendonça França | 2014-07-19 | 1 | -0/+7 |
|\ \ | | | | | | | Missing test for form values before type cast | ||||
| * | | adding missing test for text area value before type cast | Eugene Gilburg | 2014-07-19 | 1 | -0/+7 |
|/ / | |||||
* | | Merge pull request #16224 from egilburg/renderer_refactors | Rafael Mendonça França | 2014-07-19 | 4 | -17/+32 |
|\ \ | | | | | | | Some ActionView renderer refactors | ||||
| * | | adding missing test coverage | Eugene Gilburg | 2014-07-18 | 1 | -0/+12 |
| | | | |||||
| * | | marking private methods which dont work if called on their own anyways | Eugene Gilburg | 2014-07-18 | 2 | -1/+5 |
| | | | |||||
| * | | small refactors to actionview renderers | Eugene Gilburg | 2014-07-18 | 3 | -16/+15 |
| | | | |||||
* | | | Merge pull request #16227 from Aguynamedsteve/typo_correction | Yves Senn | 2014-07-19 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixed typo in comment [ci skip] | ||||
| * | | | Fixed typo in comment | Steve | 2014-07-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #16219 from skanev/fix-create-join-table-with-common-prefix | Yves Senn | 2014-07-19 | 5 | -2/+44 |
|\ \ \ \ | |_|/ / |/| | | | Make create_join_table use the same logic as HABTM reflections | ||||
| * | | | create_join_table uses same logic as HABTM reflections | Stefan Kanev | 2014-07-18 | 5 | -2/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, create_join_table would not remove the common prefix in the join table name, unlike ActiveRecord::Reflections. A HABTM between Music::Artist and Music::Record would use a table music_artists_records, while create_join table would create music_artists_music_records. | ||||
* | | | | Merge pull request #16098 from tgxworld/fixes_to_request_test | Rafael Mendonça França | 2014-07-18 | 1 | -22/+14 |
|\ \ \ \ | | | | | | | | | | | Fixes to request method test. | ||||
| * | | | | Remove redundant test. | Guo Xiang Tan | 2014-07-18 | 1 | -11/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're stubbing the request, the test is actually just asserting that `@method = env['REQUEST_METHOD']`. In order to the test against the methodoverride middleware, we should test it against an actual request. However, Rack is already covering this scenario so we can remove this test. | ||||
| * | | | | Fix duplicated test. | Guo Xiang Tan | 2014-07-18 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | There is already another test covering Request#request_method. This test should cover Request#method. | ||||
| * | | | | Update test to clearly reflect what it is testing for. | Guo Xiang Tan | 2014-07-18 | 1 | -5/+7 |
| | | | | | |||||
| * | | | | Update outdated test. | Guo Xiang Tan | 2014-07-18 | 1 | -6/+3 |
| | |_|/ | |/| | | | | | | | | | | | | | | The current test is asserting against an outdated version of Request#method where HEAD requests are treated as GET requests. | ||||
* | | | | Merge pull request #16212 from ↵ | Rafael Mendonça França | 2014-07-18 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | aantix/additional_migration_conflict_help_messaging Additional help messaging to help the user resolve a conflicted migration | ||||
| * | | | | Modified migration conflict message to remove the string concatenation. | Jim Jones | 2014-07-18 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Added additional help messaging when there's scaffolding being generated and ↵ | Jim Jones | 2014-07-17 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a migration already exists for the resource. The user is now alerted that they are able to skip the conflicted migration file via the --skip option. | ||||
* | | | | | Merge pull request #16221 from arthurnn/14886_pr | Godfrey Chan | 2014-07-18 | 4 | -2/+14 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Cleanup + CHANGELOG for pr #14886 | ||||
| * | | | | Add CHANGELOG for #14886 | Arthur Neves | 2014-07-18 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cleanup test a bit [related #14886] [related #14743] |