2 files changed, 52 insertions, 4 deletions
diff --git a/activerecord/test/cases/migration/command_recorder_test.rb b/activerecord/test/cases/migration/command_recorder_test.rb
index b222b5b75a..af033f11d9 100644
--- a/activerecord/test/cases/migration/command_recorder_test.rb
+++ b/activerecord/test/cases/migration/command_recorder_test.rb
@@ -92,13 +92,19 @@ module ActiveRecord
       end
 
       def test_invert_create_join_table
-        drop_table = @recorder.inverse_of :create_join_table, [:musics, :artists]
-        assert_equal [:drop_table, [:artists_musics]], drop_table
+        drop_join_table = @recorder.inverse_of :create_join_table, [:musics, :artists]
+        assert_equal [:drop_join_table, [:musics, :artists], nil], drop_join_table
       end
 
       def test_invert_create_join_table_with_table_name
-        drop_table = @recorder.inverse_of :create_join_table, [:musics, :artists, table_name: :catalog]
-        assert_equal [:drop_table, [:catalog]], drop_table
+        drop_join_table = @recorder.inverse_of :create_join_table, [:musics, :artists, table_name: :catalog]
+        assert_equal [:drop_join_table, [:musics, :artists, table_name: :catalog], nil], drop_join_table
+      end
+
+      def test_invert_drop_join_table
+        block = Proc.new{}
+        create_join_table = @recorder.inverse_of :drop_join_table, [:musics, :artists, table_name: :catalog], &block
+        assert_equal [:create_join_table, [:musics, :artists, table_name: :catalog], block], create_join_table
       end
 
       def test_invert_rename_table
diff --git a/activerecord/test/cases/migration/create_join_table_test.rb b/activerecord/test/cases/migration/create_join_table_test.rb
index f262bbaad7..c099854ad8 100644
--- a/activerecord/test/cases/migration/create_join_table_test.rb
+++ b/activerecord/test/cases/migration/create_join_table_test.rb
@@ -78,6 +78,48 @@ module ActiveRecord
 
         assert_equal [%w(artist_id music_id)], connection.indexes(:artists_musics).map(&:columns)
       end
+
+      def test_drop_join_table
+        connection.create_join_table :artists, :musics
+        connection.drop_join_table :artists, :musics
+
+        assert !connection.tables.include?('artists_musics')
+      end
+
+      def test_drop_join_table_with_strings
+        connection.create_join_table :artists, :musics
+        connection.drop_join_table 'artists', 'musics'
+
+        assert !connection.tables.include?('artists_musics')
+      end
+
+      def test_drop_join_table_with_the_proper_order
+        connection.create_join_table :videos, :musics
+        connection.drop_join_table :videos, :musics
+
+        assert !connection.tables.include?('musics_videos')
+      end
+
+      def test_drop_join_table_with_the_table_name
+        connection.create_join_table :artists, :musics, table_name: :catalog
+        connection.drop_join_table :artists, :musics, table_name: :catalog
+
+        assert !connection.tables.include?('catalog')
+      end
+
+      def test_drop_join_table_with_the_table_name_as_string
+        connection.create_join_table :artists, :musics, table_name: 'catalog'
+        connection.drop_join_table :artists, :musics, table_name: 'catalog'
+
+        assert !connection.tables.include?('catalog')
+      end
+
+      def test_create_join_table_with_column_options
+        connection.create_join_table :artists, :musics, column_options: {null: true}
+        connection.drop_join_table :artists, :musics, column_options: {null: true}
+
+        assert !connection.tables.include?('artists_musics')
+      end
     end
   end
 end