diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-04-12 21:44:11 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-04-12 21:44:11 +0530 |
| commit | 8248f4202d67a781bd3da88fc9412bc7264bbb7b (patch) | |
| tree | 15af5b14ae2969780fb1ae74b097ab889e10ad86 /railties | |
| parent | 6cab7602bb53464f625968d233530f6982841629 (diff) | |
| parent | 05ac3921f85663416fe8a4287b05db3284276b24 (diff) | |
| download | rails-8248f4202d67a781bd3da88fc9412bc7264bbb7b.tar.gz rails-8248f4202d67a781bd3da88fc9412bc7264bbb7b.tar.bz2 rails-8248f4202d67a781bd3da88fc9412bc7264bbb7b.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml | 3 | ||||
| -rw-r--r-- | railties/lib/rails/generators/test_case.rb | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml index f08f86aac3..467a4e725f 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml @@ -24,6 +24,9 @@ development: # domain socket that doesn't need configuration. Windows does not have # domain sockets, so uncomment these lines. #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. #port: 5432 # Schema search path. The server defaults to $user,public diff --git a/railties/lib/rails/generators/test_case.rb b/railties/lib/rails/generators/test_case.rb index d81c4c3e1d..2cb34fab7a 100644 --- a/railties/lib/rails/generators/test_case.rb +++ b/railties/lib/rails/generators/test_case.rb @@ -135,7 +135,7 @@ module Rails # Asserts a given migration does not exist. You need to supply an absolute path or a # path relative to the configured destination: # - # assert_no_file "config/random.rb" + # assert_no_migration "db/migrate/create_products.rb" # def assert_no_migration(relative) file_name = migration_file_name(relative) @@ -182,7 +182,7 @@ module Rails # Asserts the given attribute type gets a proper default value: # - # assert_field_type :string, "MyString" + # assert_field_default_value :string, "MyString" # def assert_field_default_value(attribute_type, value) assert_equal(value, create_generated_attribute(attribute_type).default) |