Fix tests for cd900f1

Backport additional changes from merge commit 9f4cefd

Author: pixeltrix

activerecord/CHANGELOG.md

@@ -1,3 +1,8 @@
+*   No longer pass deprecated option `-i` to `pg_dump`.
+
+    *Paul Sadauskas*
+
+
 ## Rails 4.1.14.rc1 (October 30, 2015) ##
 
 *   Includes HABTM returns correct size now. It's caused by the join dependency
@@ -29,6 +34,7 @@
 
     *Sean Griffin*
 
+
 ## Rails 4.1.12 (June 25, 2015) ##
 
 *   Raises the right exception when declares a has many through

activerecord/test/cases/tasks/postgresql_rake_test.rb

@@ -202,7 +202,7 @@ def setup
 
     def test_structure_dump
       filename = "awesome-file.sql"
-      Kernel.expects(:system).with("pg_dump -i -s -x -O -f #{filename}  my-app-db").returns(true)
+      Kernel.expects(:system).with("pg_dump -s -x -O -f #{filename}  my-app-db").returns(true)
       @connection.expects(:schema_search_path).returns("foo")
 
       ActiveRecord::Tasks::DatabaseTasks.structure_dump(@configuration, filename)