aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-07-18 23:04:00 -0700
committerJosé Valim <jose.valim@plataformatec.com.br>2012-07-18 23:04:00 -0700
commit993e1643650b7b0939437f86b7b4cda0d92b0b8f (patch)
treeda6e1e28ba351c4cf8d88acb0064a204a0ae4a74 /railties/test
parente482100d6ed022d00ba31c6c4377f6f947173337 (diff)
parent5a7d31913bb16977ec85d55de34ac0d79b512d62 (diff)
downloadrails-993e1643650b7b0939437f86b7b4cda0d92b0b8f.tar.gz
rails-993e1643650b7b0939437f86b7b4cda0d92b0b8f.tar.bz2
rails-993e1643650b7b0939437f86b7b4cda0d92b0b8f.zip
Merge pull request #7097 from lexmag/join_table_gen_attr
Add fkey attributes to `join_table` migration generator
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/generators/migration_generator_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/migration_generator_test.rb b/railties/test/generators/migration_generator_test.rb
index 9f9cd9c9fc..774038c0e1 100644
--- a/railties/test/generators/migration_generator_test.rb
+++ b/railties/test/generators/migration_generator_test.rb
@@ -169,7 +169,7 @@ class MigrationGeneratorTest < Rails::Generators::TestCase
def test_create_join_table_migration
migration = "add_media_join_table"
- run_generator [migration, "artists", "musics:uniq"]
+ run_generator [migration, "artist_id", "musics:uniq"]
assert_migration "db/migrate/#{migration}.rb" do |content|
assert_method :change, content do |up|