diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-03-25 09:36:49 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-03-25 09:42:45 +0100 |
| commit | 30a5cd9c8b728af150e79bb06697de6f1adf2360 (patch) | |
| tree | cd8a9c686eb705c50959d7a55672851cc0d40605 /activerecord/test/cases/tasks | |
| parent | 0f76ea63e12c1f2a251b9eee9189c26a09c97b69 (diff) | |
| parent | 78fb8bb7e168eefd876f1133636d5138b18ba52c (diff) | |
| download | rails-30a5cd9c8b728af150e79bb06697de6f1adf2360.tar.gz rails-30a5cd9c8b728af150e79bb06697de6f1adf2360.tar.bz2 rails-30a5cd9c8b728af150e79bb06697de6f1adf2360.zip | |
Merge pull request #19503 from jasoncodes/no-psqlrc
Avoid loading user's psqlrc when loading test structure
Diffstat (limited to 'activerecord/test/cases/tasks')
| -rw-r--r-- | activerecord/test/cases/tasks/postgresql_rake_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/tasks/postgresql_rake_test.rb b/activerecord/test/cases/tasks/postgresql_rake_test.rb index d45fb07417..084302cde5 100644 --- a/activerecord/test/cases/tasks/postgresql_rake_test.rb +++ b/activerecord/test/cases/tasks/postgresql_rake_test.rb @@ -261,14 +261,14 @@ module ActiveRecord def test_structure_load filename = "awesome-file.sql" - Kernel.expects(:system).with("psql -q -f #{filename} my-app-db") + Kernel.expects(:system).with("psql -X -q -f #{filename} my-app-db") ActiveRecord::Tasks::DatabaseTasks.structure_load(@configuration, filename) end def test_structure_load_accepts_path_with_spaces filename = "awesome file.sql" - Kernel.expects(:system).with("psql -q -f awesome\\ file.sql my-app-db") + Kernel.expects(:system).with("psql -X -q -f awesome\\ file.sql my-app-db") ActiveRecord::Tasks::DatabaseTasks.structure_load(@configuration, filename) end |