aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | missing activesupport test coverageEugene Gilburg2014-07-1911-4/+114
| |/
* | Merge pull request #16239 from akshay-vishnoi/remove-requireRafael Mendonça França2014-07-211-1/+0
|\ \ | | | | | | Remove not-required file class/subclasses
| * | Remove not-required file class/subclassesAkshay Vishnoi2014-07-211-1/+0
| | |
* | | Merge pull request #16242 from vadivelan-k/content_verifierArthur Nogueira Neves2014-07-211-1/+1
|\ \ \ | | | | | | | | Touch option description grammatical error fixed [ci skip]
| * | | Touch option description grammatical error fixed [ci skip]vadivelan2014-07-211-1/+1
|/ / /
* | | Merge pull request #16240 from siddharthbhagwan/masterEileen M. Uchitelle2014-07-211-1/+1
|\ \ \ | |/ / |/| | Generators guide grammatical error fixed [ci skip]
| * | Generator guide grammatical error fixed [ci skip]Siddharth Bhagwan2014-07-211-1/+1
|/ /
* | Merge pull request #16236 from y-yagi/patch-1Yves Senn2014-07-211-1/+1
|\ \ | |/ |/| [ci skip] Fix code in Routing Guide
| * [ci skip] Fix code in Routing Guideyuuji.yaginuma2014-07-211-1/+1
|/
* Merge branch 'rm-remove-mocha'Rafael Mendonça França2014-07-1920-84/+182
|\ | | | | | | | | Conflicts: actionpack/test/abstract_unit.rb
| * Stop requiring mocha automaticallyRafael Mendonça França2014-07-1914-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_testRafael Mendonça França2014-07-151-44/+68
| |
| * Stop using mocha on console_testRafael Mendonça França2014-07-071-15/+40
| |
| * Set the application logger using configurationRafael Mendonça França2014-07-071-3/+5
| |
| * Stop using mocha on configuration_testRafael Mendonça França2014-07-071-7/+23
| |
| * Stop using mocha on app_rails_loader_testRafael Mendonça França2014-07-072-10/+27
| |
* | Merge pull request #16230 from egilburg/before_type_cast_coverageRafael Mendonça França2014-07-191-0/+7
|\ \ | | | | | | Missing test for form values before type cast
| * | adding missing test for text area value before type castEugene Gilburg2014-07-191-0/+7
|/ /
* | Merge pull request #16224 from egilburg/renderer_refactorsRafael Mendonça França2014-07-194-17/+32
|\ \ | | | | | | Some ActionView renderer refactors
| * | adding missing test coverageEugene Gilburg2014-07-181-0/+12
| | |
| * | marking private methods which dont work if called on their own anywaysEugene Gilburg2014-07-182-1/+5
| | |
| * | small refactors to actionview renderersEugene Gilburg2014-07-183-16/+15
| | |
* | | Merge pull request #16227 from Aguynamedsteve/typo_correctionYves Senn2014-07-191-1/+1
|\ \ \ | | | | | | | | Fixed typo in comment [ci skip]
| * | | Fixed typo in commentSteve2014-07-191-1/+1
| | | |
* | | | Merge pull request #16219 from skanev/fix-create-join-table-with-common-prefixYves Senn2014-07-195-2/+44
|\ \ \ \ | |_|/ / |/| | | Make create_join_table use the same logic as HABTM reflections
| * | | create_join_table uses same logic as HABTM reflectionsStefan Kanev2014-07-185-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_testRafael Mendonça França2014-07-181-22/+14
|\ \ \ \ | | | | | | | | | | Fixes to request method test.
| * | | | Remove redundant test.Guo Xiang Tan2014-07-181-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 Tan2014-07-181-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 Tan2014-07-181-5/+7
| | | | |
| * | | | Update outdated test.Guo Xiang Tan2014-07-181-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ça2014-07-181-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 Jones2014-07-181-3/+3
| | | | |
| * | | | Added additional help messaging when there's scaffolding being generated and ↵Jim Jones2014-07-171-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_prGodfrey Chan2014-07-184-2/+14
|\ \ \ \ \ | |_|_|/ / |/| | | | Cleanup + CHANGELOG for pr #14886
| * | | | Add CHANGELOG for #14886Arthur Neves2014-07-182-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cleanup test a bit [related #14886] [related #14743]
| * | | | LOCALHOST definition should match any 127.0.0.0/8 addressEarl J St Sauver2014-07-183-2/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The entire 127.0.0.0/8 range is assigned to the loopback address, not only 127.0.0.0/24. This patch allows ActionDispatch::Request::LOCALHOST to match any IPv4 127.0.0.0/8 loopback address. The only place that the #local? method was previously under test was in the show_expectations_test.rb file. I don't particularly like that that's implicitly where this code is under test, and I feel like I should move some of that testing code into the test/dispatch/request_test.rb file, but I wanted some feedback first. Credit goes to @sriedel for discovering the issue and adding the patch.
* | | | Merge pull request #15762 from arthurnn/better_error_on_bad_alias_methodMatthew Draper2014-07-183-10/+27
|\ \ \ \ | | | | | | | | | | | | | | | Dont swallow errors when bad alias_method
| * | | | Dont swallow errors when bad alias_methodArthur Neves2014-06-243-10/+27
| | | | |
* | | | | Follow-up to #16097 [ci skip]Robin Dupret2014-07-182-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if this is not exactly the same, let's add a new-line character instead of two spaces. While it's specified in the Markdown specs that adding spaces at the end of the line creates a break-line tag, this is a brittle approach as people may remove them saving the file on certain editors.
* | | | | Merge pull request #16099 from tgxworld/pass_log_as_blockYves Senn2014-07-185-43/+46
|\ \ \ \ \ | |_|/ / / |/| | | | Prefer to pass block when logging.
| * | | | Prefer to pass block when logging.Guo Xiang Tan2014-07-185-43/+46
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Logger by default includes a guard which checks for the logging level. By removing the custom logging guards, we can decouple the logging guard from the logging action to be done. This also follows the good practice listed on http://guides.rubyonrails.org/debugging_rails_applications.html#impact-of-logs-on-performance.
* | | | reporting is only done in one thread, so we can safely remove the lockAaron Patterson2014-07-171-1/+1
| | | | | | | | | | | | | | | | (I think)
* | | | %i doesn't work on 1.9Aaron Patterson2014-07-171-1/+1
| | | |
* | | | fix thread safety issuesAaron Patterson2014-07-171-4/+7
| | | | | | | | | | | | | | | | | | | | this test case had a race condition where it could download data multiple times. We'll download the data once at class load.
* | | | pass the test reporter by referenceAaron Patterson2014-07-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | this prevents the array from being dumped as a DRbObject so we can reduce communication with the server. the reporter should always exist on the server side, so we don't have to worry about GC
* | | | Merge pull request #16210 from sonnym/assert_valid_keys_in_validateMatthew Draper2014-07-183-0/+19
|\ \ \ \ | | | | | | | | | | | | | | | Check for valid options in validate method
| * | | | check for valid options in validate methodsonnym2014-07-173-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change prevents a certain class of user error which results when mistakenly using the `validate` class method instead of the `validates` class method. Only apply when all arguments are symbols, because some validations use the `validate` method and pass in additional options, namely the `LenghValidator` via the `ActiveMode::Validations::validates_with` method.
* | | | | fix filesystem race conditionAaron Patterson2014-07-171-1/+1
| | | | |
* | | | | do not restart the service, just stop itAaron Patterson2014-07-171-1/+0
| | | | |