aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12824 from sikachu/ps-testing-time-helperXavier Noria2013-11-204-2/+144
|\ | | | | Add `#travel` and `#travel_to` to `ActiveSupport::TestCase`
| * Add `#travel` and `#travel_to` to AS::TestCasePrem Sichanugrist2013-11-204-2/+144
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `ActiveSupport::Testing::TimeHelpers#travel` and `#travel_to`. These methods change current time to the given time or time difference by stubbing `Time.now` and `Date.today` to return the time or date after the difference calculation, or the time or date that got passed into the method respectively. These methods also accept a block, which will return current time back to its original state at the end of the block. Example for `#travel`: Time.now # => 2013-11-09 15:34:49 -05:00 travel 1.day Time.now # => 2013-11-10 15:34:49 -05:00 Date.today # => Sun, 10 Nov 2013 Example for `#travel_to`: Time.now # => 2013-11-09 15:34:49 -05:00 travel_to Time.new(2004, 11, 24, 01, 04, 44) Time.now # => 2004-11-24 01:04:44 -05:00 Date.today # => Wed, 24 Nov 2004 Both of these methods also accept a block, which will return the current time back to its original state at the end of the block: Time.now # => 2013-11-09 15:34:49 -05:00 travel 1.day do User.create.created_at # => Sun, 10 Nov 2013 15:34:49 EST -05:00 end travel_to Time.new(2004, 11, 24, 01, 04, 44) do User.create.created_at # => Wed, 24 Nov 2004 01:04:44 EST -05:00 end Time.now # => 2013-11-09 15:34:49 -05:00 This module is included in `ActiveSupport::TestCase` automatically.
* Merge pull request #12961 from jbaudanza/docRafael Mendonça França2013-11-191-1/+1
|\ | | | | Update caching guide with respect to :namespace
| * Update caching guide with respect to :namespaceJonathan Baudanza2013-11-191-1/+1
|/ | | | Cache::Store does not have a default value for :namespace. If it ever did, I can't find it in the git history.
* _implied_layout_name should be privateRafael Mendonça França2013-11-191-9/+11
|
* Use the right indentationRafael Mendonça França2013-11-191-1/+1
|
* Renderer#_render_template should be privateRafael Mendonça França2013-11-191-7/+7
| | | | Closes #12831
* Merge pull request #12959 from macmartine/partial_renderer_doc_improvementRafael Mendonça França2013-11-191-1/+1
|\ | | | | Improve readability of sentence in partial-renderer docs [ci skip]
| * Improve readability of sentence in partial-renderer docs [ci skip]Mac Martine2013-11-191-1/+1
| |
* | use arel nodes to represent non-string `order_values`.Yves Senn2013-11-194-24/+28
|/ | | | | | | | | | | | | | | | | | | This fixes a bug when merging relations of different classes. ``` Given: Post.joins(:author).merge(Author.order(name: :desc)).to_sql Before: SELECT "posts".* FROM "posts" INNER JOIN "authors" ON "authors"."id" = "posts"."author_id" ORDER BY "posts"."name" DESC After: SELECT "posts".* FROM "posts" INNER JOIN "authors" ON "authors"."id" = "posts"."author_id" ORDER BY "authors"."name" DESC ```
* Revert "Properly require database tasks so we have access to the raised ↵Rafael Mendonça França2013-11-193-3/+0
| | | | | | | | constant" This reverts commit fbcd46b1a0d255a34d29caa77bbd31c287446333. This is not needed anymore. See 7280965
* Revert "Explicitly exit with status "1" for create and drop failures"Rafael Mendonça França2013-11-196-51/+16
| | | | | | | | | | This reverts commit 22f80ae57b26907f662b7fd50a7270a6381e527e. See https://github.com/rails/rails/commit/22f80ae57b26907f662b7fd50a7270a6381e527e#commitcomment-4640676 Conflicts: activerecord/CHANGELOG.md
* use arel `master` and update activerecord to depend on arel `5.0.0`.Yves Senn2013-11-192-2/+2
| | | | | | This is a follow-up to 3053fee954c1e28b23f7e00921d7b9b3b3867fa5. > The `master` branch should use the `master` branch.
* use `4-0-stable` arel branch to get bundle working again.Yves Senn2013-11-191-1/+1
| | | | | | | | | | | | | | | | this resolves the following error when running `bundle install` ``` ArgumentError: wrong number of arguments (2 for 1) /Users/senny/Projects/rails/.bundle/bundler/gems/arel-454a25f18c95/lib/arel/crud.rb:5:in `compile_update' ``` The build is still broken with lots of: ``` ArgumentError: wrong number of arguments (2 for 1) /Users/senny/Projects/rails/.bundle/bundler/gems/arel-454a25f18c95/lib/arel/crud.rb:5:in `compile_update' ```
* Merge pull request #12949 from akshay-vishnoi/documentationRafael Mendonça França2013-11-191-19/+19
|\ | | | | [ci skip] `apropriate` => `appropriate`, spaces added
| * [ci skip] `apropriate` => `appropriate`, spaces addedAkshay Vishnoi2013-11-191-19/+19
|/
* Merge pull request #12945 from fluxusfrequency/patch-1Yves Senn2013-11-191-2/+2
|\ | | | | Fixed typos in "shallow routes" and "routing concerns" in routing.md [ci skip]
| * Fixed typos in shallow routes and routing concernsBen Lewis2013-11-181-2/+2
| | | | | | | | Grammatical tense correction: "There exists two" => "There exist two". Plurality correction: "can be reused inside others resources" => "can be reused inside other resources".
* | Merge pull request #12942 from kuldeepaggarwal/typosYves Senn2013-11-181-1/+1
|\ \ | |/ |/| `skiping` => `skipping` [ci skip]
| * `skiping` => `skipping`Kuldeep Aggarwal2013-11-191-1/+1
|/
* Merge pull request #12924 from kuldeepaggarwal/f-specsYves Senn2013-11-181-1/+3
|\ | | | | added test cases to find notes in a file with .builder extension
| * added test cases to find notes in a file with .builder extensionKuldeep Aggarwal2013-11-171-1/+3
| |
* | Merge pull request #12931 from yahonda/add_oracle_ignoredYves Senn2013-11-181-1/+1
|\ \ | | | | | | Do not count query for all_constraints and all_tab_cols tested with Oracle
| * | Do not count query for all_constraints and all_tab_cols in OracleYasuo Honda2013-11-181-1/+1
|/ /
* | Merge pull request #12929 from yahonda/test_merging_where_relations_add_orderCarlos Antonio da Silva2013-11-171-1/+1
|\ \ | | | | | | Address test_merging_where_relations failure by adding order
| * | Address test_merging_where_relations failure by adding `order("posts.id")`Yasuo Honda2013-11-181-1/+1
|/ /
* | Add description for db:create and db:drop test tasks in ARCarlos Antonio da Silva2013-11-171-2/+4
| | | | | | | | | | This will help identify these tasks exists, since they are easier to setup things for running all AR tests.
* | Properly require database tasks so we have access to the raised constantCarlos Antonio da Silva2013-11-173-0/+3
| | | | | | | | Fix travis failures.
* | Merge pull request #12928 from vipulnsward/drop_unused_paramCarlos Antonio da Silva2013-11-171-1/+1
|\ \ | | | | | | Drop unused param `should_be_quoted` to `PostgreSQLColumn#array_to_string`
| * | Drop unused param `should_be_quoted` to `PostgreSQLColumn#array_to_string`Vipul A M2013-11-171-1/+1
| |/
* | Merge pull request #12921 from kuldeepaggarwal/documentation-updationCarlos Antonio da Silva2013-11-171-1/+1
|\ \ | |/ |/| [ci skip]updated documentation: added sass and less extensions
| * [ci skip]updated documentation: added sass and less extensionsKuldeep Aggarwal2013-11-171-1/+1
|/
* rm minitest monkey patchAaron Patterson2013-11-161-17/+0
|
* Merge pull request #12919 from arunagw/aa-build-fix-1.9.3Yves Senn2013-11-161-1/+1
|\ | | | | Build fix for ruby 1.9.3 syntax
| * Build fix for ruby 1.9.3 syntaxArun Agrawal2013-11-161-1/+1
| |
* | pass the pk to compile_updateAaron Patterson2013-11-163-3/+6
|/
* Merge pull request #12918 from versioncontrol/rails-12866Rafael Mendonça França2013-11-163-1/+14
|\ | | | | | | | | | | | | Checks to see if the record contains the foreign_key to set the inverse automatically Conflicts: activerecord/CHANGELOG.md
| * Checks to see if the record contains the foreign_key to set the inverse ↵Edo Balvers2013-11-163-1/+14
| | | | | | | | automatically
* | Merge pull request #12859 from jetthoughts/track_initializers_loadingRafael Mendonça França2013-11-164-1/+59
|\ \ | | | | | | Track initializer's loaded event per file
| * | Instrument each load config initializerPaul Nikitochkin2013-11-164-1/+59
|/ / | | | | | | | | | | In order to simplify profiling loading of initializers, added instument for tracking load config initializer event from `config/initializers`
* | Merge pull request #12917 from akshay-vishnoi/refactorRafael Mendonça França2013-11-161-1/+1
|\ \ | | | | | | avoiding iterations and calling of underscore on all elements of array
| * | avoiding iterations and calling of underscore on all elements of arrayAkshay Vishnoi2013-11-171-1/+1
| | |
* | | Merge pull request #12911 from zenspider/test_order_dependency_fixesAaron Patterson2013-11-162-14/+26
|\ \ \ | |/ / |/| | Test order dependency fixes
| * | Fix bad test order dependency between LoadAllFixturesTest#test_all_there and ↵Ryan Davis2013-11-161-6/+10
| | | | | | | | | | | | FoxyFixturesTest#test_ignores_belongs_to_symbols_if_association_and_foreign_key_are_named_the_same
| * | Fix bad test order dependency between ↵Ryan Davis2013-11-161-8/+16
| | | | | | | | | | | | test/cases/validations/i18n_generate_message_validation_test.rb and test/cases/validations/uniqueness_validation_test.rb
* | | Merge pull request #12916 from petervandenabeele/typo_4_0_release_notesCarlos Antonio da Silva2013-11-161-1/+1
|\ \ \ | | | | | | | | [ci skip] typo in ArgumentError in 4_0_release_notes.md
| * | | [ci skip] typo in ArgumentError exceptionPeter Vandenabeele2013-11-161-1/+1
|/ / /
* | | Merge pull request #12907 from JuanitoFatas/upgradingRafael Mendonça França2013-11-151-9/+10
|\ \ \ | | | | | | | | [ci skip] Update gem versions for 3.2 and 3.1. Also change some words.
| * | | [ci skip] Update gem versions for 3.2 and 3.1. Also change some words.Juanito Fatas2013-11-161-9/+10
| | | |
* | | | Merge pull request #12703 from makimoto/actionsupport-error-set_backtraceRafael Mendonça França2013-11-153-2/+13
|\ \ \ \ | | | | | | | | | | Use set_backtrace instead of @backtrace in ActionView error
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 00:28:40 +0000