From 9074e8c644c952a639617ed190b915a54a835e1b Mon Sep 17 00:00:00 2001 From: Nathan Zook and Ryan Bigg Date: Mon, 11 Oct 2010 11:15:38 +1100 Subject: [PATCH 1/6] Updated RUNNING_UNIT_TESTS documentation with mention of the build_databases rake tasks. --- activerecord/RUNNING_UNIT_TESTS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/activerecord/RUNNING_UNIT_TESTS b/activerecord/RUNNING_UNIT_TESTS index 324df2c025..18e3936d8a 100644 --- a/activerecord/RUNNING_UNIT_TESTS +++ b/activerecord/RUNNING_UNIT_TESTS @@ -31,8 +31,13 @@ That'll run the base suite using the MySQL-Ruby adapter. Some tests rely on the being initialized - you can initialize the schema with: rake test_mysql TEST=test/cases/aaa_create_tables_test.rb + rake mysql:build_databases + +To setup the testing environment for PostgreSQL use this command: + + rake postgresql:build_databases The incantation for running a particular test looks like this - ruby -w -I"lib:test:test/connections/native_postgresql" test/cases/datatype_test_postgresql.rb -n test_timestamp_with_zone_values_without_rails_time_zone_support + rake test TEST=test/cases/datatype_test_postgresql.rb TESTOPTS="-n test_timestamp_with_zone_values_without_rails_time_zone_support" From 7d081162222e5334fe42a7fbc07354aa4f5e5d50 Mon Sep 17 00:00:00 2001 From: Utkarsh Kukreti Date: Wed, 8 Sep 2010 00:00:10 +0530 Subject: [PATCH 2/6] Fix typo 'configation' [#5575 state:resolved] --- .../generators/rails/app/templates/config/databases/oracle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml index fddf8b8144..b661a60389 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml @@ -10,7 +10,7 @@ # # By default prefetch_rows (OCI_ATTR_PREFETCH_ROWS) is set to 100. And # until true bind variables are supported, cursor_sharing is set by default -# to 'similar'. Both can be changed in the configation below; the defaults +# to 'similar'. Both can be changed in the configuration below; the defaults # are equivalent to specifying: # # prefetch_rows: 100 From ef74ad8e0c0a1c46f7e8983e9d5460dea9bec95e Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Mon, 11 Oct 2010 13:28:50 +1100 Subject: [PATCH 3/6] Remove mention to register_javascript_include_default in documentation --- actionpack/lib/action_view/helpers/asset_tag_helper.rb | 3 --- railties/guides/source/action_view_overview.textile | 3 --- 2 files changed, 6 deletions(-) diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index c1dfbe5dc3..b97c73aff9 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -292,9 +292,6 @@ module ActionView # # * = The application.js file is only referenced if it exists # - # Though it's not really recommended practice, if you need to extend the default JavaScript set for any reason - # (e.g., you're going to be using a certain .js file in every action), then take a look at the register_javascript_include_default method. - # # You can also include all javascripts in the +javascripts+ directory using :all as the source: # # javascript_include_tag :all # => diff --git a/railties/guides/source/action_view_overview.textile b/railties/guides/source/action_view_overview.textile index 843dfe530d..0e1a352ebd 100644 --- a/railties/guides/source/action_view_overview.textile +++ b/railties/guides/source/action_view_overview.textile @@ -253,9 +253,6 @@ javascript_include_tag :monkey # => -h5. register_javascript_include_default - -Register one or more additional JavaScript files to be included when +javascript_include_tag :defaults+ is called. This method is typically intended to be called from plugin initialization to register additional +.js+ files that the plugin installed in +public/javascripts+. h5. register_stylesheet_expansion From 234a4ca7ddb7794a92f266af48fd38edbdb03003 Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Mon, 11 Oct 2010 13:32:04 +1100 Subject: [PATCH 4/6] Add missing CHANGELOG entry about reset_javascript_include_default --- actionpack/CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 6352b97a6b..966d1ae47d 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -33,6 +33,8 @@ * Upgrade to Rack 1.2.1 [Jeremy Kemper] +* Removed reset_javascript_include_default, use config.action_view.javascript_expansions in config/application.rb for this instead [José Valim] + * Allow :path to be given to match/get/post/put/delete instead of :path_names in the new router [Carlos Antônio da Silva] * Added resources_path_names to the new router DSL [José Valim] From 70ad6e499f405efb8b0a2e58c9742d4957c6b7c5 Mon Sep 17 00:00:00 2001 From: "Philip R. Dutton" Date: Sun, 10 Oct 2010 22:31:30 -0400 Subject: [PATCH 5/6] I corrected a code snippet typo in the railties/guides/source/initialization.textile file [#5779 state:resolved] --- railties/guides/source/initialization.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/railties/guides/source/initialization.textile b/railties/guides/source/initialization.textile index 599ddccdd6..3e02bc0158 100644 --- a/railties/guides/source/initialization.textile +++ b/railties/guides/source/initialization.textile @@ -3070,7 +3070,7 @@ The +Rails::Plugin::Configuration+ class may be a bit difficult to find at first module Rails - class Plugin < Railtie + class Plugin < Engine ... end end From e6b45b8111cc375be57a1e1ca2b2b47eb21a2e01 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Mon, 11 Oct 2010 12:00:37 +0200 Subject: [PATCH 6/6] Revert "Add missing CHANGELOG entry about reset_javascript_include_default" This reverts commit 234a4ca7ddb7794a92f266af48fd38edbdb03003. Reason: No big deal Ryan, only there's a very strict policy in docrails which allows public write access on the other hand. CHANGELOGs can only be edited in master. If this is added I'll make sure you get the credit for the patch. --- actionpack/CHANGELOG | 2 -- 1 file changed, 2 deletions(-) diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 966d1ae47d..6352b97a6b 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -33,8 +33,6 @@ * Upgrade to Rack 1.2.1 [Jeremy Kemper] -* Removed reset_javascript_include_default, use config.action_view.javascript_expansions in config/application.rb for this instead [José Valim] - * Allow :path to be given to match/get/post/put/delete instead of :path_names in the new router [Carlos Antônio da Silva] * Added resources_path_names to the new router DSL [José Valim]