aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/contributing_to_ruby_on_rails.textile
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-03-05 22:58:48 +0000
committerJon Leighton <j@jonathanleighton.com>2011-03-05 22:58:48 +0000
commit28ed10d3f27e27ed105dd8fd60d6151a6b372375 (patch)
treeca2cfb5696cbc9de3d636212374eaeafafa23c39 /railties/guides/source/contributing_to_ruby_on_rails.textile
parentb7f1b3641afe0ff4f3cd344815c6f7bb58821e9e (diff)
parent74818a35432b40fef16fe74f248ea75d35405324 (diff)
downloadrails-28ed10d3f27e27ed105dd8fd60d6151a6b372375.tar.gz
rails-28ed10d3f27e27ed105dd8fd60d6151a6b372375.tar.bz2
rails-28ed10d3f27e27ed105dd8fd60d6151a6b372375.zip
Merge branch 'master' into nested_has_many_through
Conflicts: activerecord/CHANGELOG
Diffstat (limited to 'railties/guides/source/contributing_to_ruby_on_rails.textile')
-rw-r--r--railties/guides/source/contributing_to_ruby_on_rails.textile23
1 files changed, 22 insertions, 1 deletions
diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile
index 1977f8d0ce..3454b8b7a3 100644
--- a/railties/guides/source/contributing_to_ruby_on_rails.textile
+++ b/railties/guides/source/contributing_to_ruby_on_rails.textile
@@ -101,6 +101,14 @@ $ cd actionpack
$ rake test
</shell>
+If you want to run tests from the specific directory use the +TEST_DIR+ environment variable. For example, this will run tests inside +railties/test/generators+ directory only:
+
+<shell>
+$ cd railties
+$ TEST_DIR=generators rake test
+</shell>
+
+
h4. Warnings
The test suite runs with warnings enabled. Ideally Ruby on Rails should issue no warning, but there may be a few, and also some from third-party libraries. Please ignore (or fix!) them if any, and submit patches that do not issue new warnings.
@@ -341,7 +349,20 @@ $ git commit -a
$ git format-patch master --stdout > my_new_patch.diff
</shell>
-Sanity check the results of this operation: open the diff file in your text editor of choice and make sure that no unintended changes crept in.
+Open the diff file in your text editor of choice to sanity check the results, and make sure that no unintended changes crept in.
+
+You can also perform an extra check by applying the patch to a different dedicated branch:
+
+<shell>
+$ git checkout -b testing_branch
+$ git apply --check my_new_patch.diff
+</shell>
+
+Please make sure the patch does not introduce whitespace errors:
+
+<shell>
+$ git apply --whitespace=error-all mynew_patch.diff
+</shell>
h4. Create a Lighthouse Ticket