aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Improve CHANGELOGRafael Mendonça França2015-01-291-6/+5
|
* Merge pull request #18323 from kirs/controller-test-kwargsRafael Mendonça França2015-01-2945-417/+938
|\ | | | | | | Use kwargs in ActionController::TestCase and ActionDispatch::Integration HTTP methods
| * Switch to kwargs in ActionController::TestCase and ActionDispatch::IntegrationKir Shatrov2015-01-2945-417/+938
|/ | | | | | | | Non-kwargs requests are deprecated now. Guides are updated as well. `post url, nil, nil, { a: 'b' }` doesn't make sense. `post url, params: { y: x }, session: { a: 'b' }` would be an explicit way to do the same
* Merge pull request #18627 from tekin/dont-blat-default-formatAndrew White2015-01-293-3/+33
|\ | | | | Preserve default format when generating URLs
| * Preserve default url options when generating URLsTekin Suleyman2015-01-283-3/+33
| | | | | | | | | | Fixes an issue that would cause default_url_options to be lost when generating URLs with fewer positional arguments than parameters in the route definition.
* | Merge pull request #18719 from ↵Yves Senn2015-01-291-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 5t111111/add-fix-for-loading-fixtures-in-engine-tests Add fix for loading fixtures in engine tests (additional fix for #4971) Conflicts: railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb
| * | Add fix for loading fixtures in engine testsWAKASUGI 5T1111112015-01-291-0/+1
| | |
* | | reassign `file_fixture_path` in plugins `test_helper.rb`. refs #18658.Yves Senn2015-01-291-0/+1
| | |
* | | let dependencies use Module#const_defined?Xavier Noria2015-01-281-2/+2
|/ / | | | | | | | | | | | | Module#const_defined? accepts constant paths in modern Ruby, we no longer need our qualified_* extensions. References #17845.
* | Don't error when grouped calculations return 0 recordsSean Griffin2015-01-282-1/+6
| | | | | | | | Fixes #18717
* | Merge Pull Request #16052 Added #or to ActiveRecord::RelationSean Griffin2015-01-288-1/+166
|\ \
| * | Bring the implementation of Relation#or up to speedSean Griffin2015-01-285-44/+48
| | |
| * | Added #or to ActiveRecord::RelationMatthew Draper2015-01-286-1/+162
| | | | | | | | | | | | | | | | | | | | | Post.where('id = 1').or(Post.where('id = 2')) # => SELECT * FROM posts WHERE (id = 1) OR (id = 2) [Matthew Draper & Gael Muller]
* | | Always convert strings to UTF-8, regardless of column type in SQLiteSean Griffin2015-01-282-12/+7
| |/ |/| | | | | | | | | | | | | All columns which would map to a string primitive need this behavior. Binary has it's own marker type, so it won't go through this conversion. String and text, which need this, will. Fixes #18585.
* | Merge branch 'rm-deprecate_via_redirect'Rafael Mendonça França2015-01-283-5/+31
|\ \
| * | Just assert the deprecation of one methodRafael Mendonça França2015-01-281-10/+15
| | |
| * | Add CHANGELOG entryRafael Mendonça França2015-01-281-0/+6
| | |
| * | Merge pull request #18693 from aditya-kapoor/deprecate_via_redirectRafael Mendonça França2015-01-282-15/+30
|/| | | | | | | | | | | Deprecate *_via_redirect integration test methods
| * | Deprecate *_via_redirect integration test methodsAditya Kapoor2015-01-282-15/+30
| | |
* | | Merge pull request #18716 from tonytonyjan/typoRafael Mendonça França2015-01-281-1/+1
|\ \ \ | | | | | | | | | | | | table name should be plural
| * | | table name should be plural [ci skip]Jian Weihang2015-01-291-1/+1
|/ / /
* | | Merge pull request #18654 from liseki/fix-aj-test-helperRafael Mendonça França2015-01-282-2/+51
|\ \ \ | |_|/ |/| | Fix ActiveJob assertions with a GlobalID object argument
| * | Fix ActiveJob assertions with a GlobalID object argumentRichard Manyanza2015-01-232-2/+51
| | |
* | | Don't redefine autosave association callbacks in nested attrsSean Griffin2015-01-286-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | These callbacks will already have been defined when the association was built. The check against `reflection.autosave` happens at call time, not at define time, so simply modifying the reflection is sufficient. Fixes #18704
* | | Merge pull request #18658 from senny/file_fixturesYves Senn2015-01-288-0/+76
|\ \ \ | | | | | | | | Add `ActiveSupport::Testing::FileFixtures`.
| * | | introduce `ActiveSupport::Testing::FileFixtures`.Yves Senn2015-01-288-0/+76
|/ / / | | | | | | | | | | | | | | | It's a thin layer to provide easy access to sample files throughout test-cases. This adds the directory `test/fixtures/files` to newly generated applications.
* | | Merge pull request #18709 from ianks/atomic-writeYves Senn2015-01-283-1/+18
|\ \ \ | | | | | | | | | | | | Return value of yielded block in File.atomic_write
| * | | Return value of yielded block in File.atomic_writeIan Ker-Seymer2015-01-282-1/+14
|/ / / | | | | | | | | | | | | | | | Staying true to Ruby convention, we now return the value of the yielded block from `File.atomic_write {...}`. This mimics the behavior of MRI's `File.open {...}`.
* | | Merge pull request #18666 from cheunghy/auth_check_nilGuillermo Iguaran2015-01-282-2/+9
|\ \ \ | | | | | | | | Fixed undefined method error when doing http basic authentication.
| * | | Fixed undefined method error when doing authentication.Zhang Kai Yu2015-01-241-2/+2
| | | |
| * | | Add test for HTTP basic authentication when no credential is given.Zhang Kai Yu2015-01-241-0/+7
| | | |
* | | | improve performance of integration tests.Aaron Patterson2015-01-271-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found delegate to be a bottleneck during integration tests. Here is the test case: ```ruby require 'test_helper' class DocumentsIntegrationTest < ActionDispatch::IntegrationTest test "index" do get '/documents' assert_equal 200, response.status end end Minitest.run_one_method(DocumentsIntegrationTest, 'test_index') StackProf.run(mode: :wall, out: 'stackprof.dump') do 3000.times do Minitest.run_one_method(DocumentsIntegrationTest, 'test_index') end end ``` Top of the stack: ``` [aaron@TC integration_performance_test (master)]$ stackprof stackprof.dump ================================== Mode: wall(1000) Samples: 23694 (7.26% miss rate) GC: 1584 (6.69%) ================================== TOTAL (pct) SAMPLES (pct) FRAME 7058 (29.8%) 6178 (26.1%) block in Module#delegate 680 (2.9%) 680 (2.9%) ActiveSupport::PerThreadRegistry#instance 405 (1.7%) 405 (1.7%) ThreadSafe::NonConcurrentCacheBackend#[] 383 (1.6%) 383 (1.6%) Set#include? 317 (1.3%) 317 (1.3%) ActiveRecord::Base.logger 281 (1.2%) 281 (1.2%) Rack::Utils::HeaderHash#[]= 269 (1.1%) 269 (1.1%) ActiveSupport::Notifications::Fanout::Subscribers::Evented#subscribed_to? 262 (1.1%) 262 (1.1%) block (4 levels) in Class#class_attribute 384 (1.6%) 246 (1.0%) block (2 levels) in Class#class_attribute ``` According to @eileencodes's tests, this speeds up integration tests so that they are only 1.4x slower than functional tests: Before: INDEX: Integration Test: 153.2 i/s - 2.43x slower After: INDEX: Integration Test: 275.1 i/s - 1.41x slower
* | | | Remove Relation#bind_paramsSean Griffin2015-01-2730-130/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `bound_attributes` is now used universally across the board, removing the need for the conversion layer. These changes are mostly mechanical, with the exception of the log subscriber. Additional, we had to implement `hash` on the attribute objects, so they could be used as a key for query caching.
* | | | Merge pull request #18588 from thegcat/patch-1Rafael Mendonça França2015-01-271-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] fix typo still -> will
| * | | | fix typo still cause -> still causesFelix Schäfer2015-01-271-1/+1
| | | | |
* | | | | All subclasses of `Attribute` should be private constantsSean Griffin2015-01-271-1/+1
| | | | |
* | | | | Use an `Attribute` object to represent a bind valueSean Griffin2015-01-2711-41/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The column is primarily used for type casting, which we're trying to separate from the idea of a column. Since what we really need is the combination of a name, type, and value, let's use the object that we already have to represent that concept, rather than this tuple. No consumers of the bind values have been changed, only the producers (outside of tests which care too much about internals). This is *finally* possible since the bind values are now produced from a reasonable number of lcoations.
* | | | | Don't rely on the internal representation of join valuesSean Griffin2015-01-272-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | I'm going to be extracting this logic into a clause class, things need to go through a method and not access the values hash directly.
* | | | | Minor refactorings on `Relation#build_joins`Sean Griffin2015-01-271-26/+13
| | | | | | | | | | | | | | | | | | | | Attempting to grok this code by refactoring it as I go through it.
* | | | | `WhereClause#predicates` does not need to be publicSean Griffin2015-01-2711-126/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only place it was accessed was in tests. Many of them have another way that they can test their behavior, that doesn't involve reaching into internals as far as they did. `AssociationScopeTest` is testing a situation where the where clause would have one bind param per predicate, so it can just ignore the predicates entirely. The where chain test was primarly duplicating the logic tested on `WhereClause` directly, so I instead just make sure it calls the appropriate method which is fully tested in isolation.
* | | | | Use the `WhereClause` ast building logic for havingSean Griffin2015-01-271-4/+1
| | | | |
* | | | | Move where grouping into `WhereClause`Sean Griffin2015-01-273-11/+59
| | | | |
* | | | | Unify access to bind values on RelationSean Griffin2015-01-276-21/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bind values can come from four places. `having`, `where`, `joins`, and `from` when selecting from a subquery that contains binds. These need to be kept in a specific order, since the clauses will always appear in that order. Up until recently, they were not. Additionally, `joins` actually did keep its bind values in a separate location (presumably because it's the only case that people noticed was broken). However, this meant that anything accessing just `bind_values` was broken (which most places were). This is no longer possible, there is only a single way to access the bind values, and it includes joins in the proper location. The setter was removed yesterday, so breaking `+=` cases is not possible. I'm still not happy that `joins` is putting it's bind values on the Arel AST, and I'm planning on refactoring it further, but this removes a ton of bug cases.
* | | | | Merge pull request #18701 from andreynering/fix-typo-guide-nameRafael Mendonça França2015-01-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo on guide name
| * | | | | Fix typo on guide name [ci skip]Andrey Nering2015-01-271-1/+1
| | | | | |
* | | | | | Restore useful documentation removed atRafael Mendonça França2015-01-271-0/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | 3729103e17e00494c8eae76e8a4ee1ac990d3450 [ci skip]
* | | | | Merge pull request #18622 from take/patch-1Abdelkader Boudih2015-01-271-20/+0
|\ \ \ \ \ | | | | | | | | | | | | Update ActiveRecord::ModelSchema#table_name= 's doc
| * | | | | Update model_schema.rb [ci skip]Takehiro Adachi2015-01-271-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overriding these methods may cause unexpected results since "table_name=" does more then just setting the "@table_name". ref: https://github.com/rails/rails/pull/18622#issuecomment-70874358
* | | | | | Move the `from` bind logic to a `FromClause` classSean Griffin2015-01-265-22/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contrary to my previous commit message, it wasn't overkill, and led to much cleaner code. [Sean Griffin & anthonynavarre]
* | | | | | Remove `Relation#bind_values=`Sean Griffin2015-01-264-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last place that was assigning it was when `from` is called with a relation to use as a subquery. The implementation was actually completely broken, and would break if you called `from` more than once, or if you called it on a relation, which also had its own join clause, as the bind values would get completely scrambled. The simplest solution was to just move it into its own array, since creating a `FromClause` class for this would be overkill.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 08:08:40 +0000