diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-17 23:48:50 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-17 23:48:50 -0700 |
| commit | ab551bed7b737c724f090ade4fffc9156847df57 (patch) | |
| tree | b16da6bacfc83311fc36185b2ac5bb0e920e19b0 /activerecord | |
| parent | a6cda5416bfb639a035bf5a7d24fa68b6381a540 (diff) | |
| parent | 7fd77474970fb170f26b56a6b38ef1a19cd816f9 (diff) | |
| download | rails-ab551bed7b737c724f090ade4fffc9156847df57.tar.gz rails-ab551bed7b737c724f090ade4fffc9156847df57.tar.bz2 rails-ab551bed7b737c724f090ade4fffc9156847df57.zip | |
Merge pull request #6767 from frodsan/fix_sqlite_rake_tests
fix invalid syntax and sqlite rake failing tests
Diffstat (limited to 'activerecord')
4 files changed, 9 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb b/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb index aea364ecbb..85f4c12829 100644 --- a/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb +++ b/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb @@ -25,7 +25,6 @@ module ActiveRecord FileUtils.rm(file) if File.exist?(file) end - alias :purge :drop private @@ -37,4 +36,6 @@ module ActiveRecord def root @root end - end
\ No newline at end of file + end + end +end
\ No newline at end of file diff --git a/activerecord/test/cases/mysql_rake_test.rb b/activerecord/test/cases/mysql_rake_test.rb index cdb0968bb6..1dfd28df54 100644 --- a/activerecord/test/cases/mysql_rake_test.rb +++ b/activerecord/test/cases/mysql_rake_test.rb @@ -176,4 +176,4 @@ module ActiveRecord ) end end -end +end
\ No newline at end of file diff --git a/activerecord/test/cases/postgresql_rake_test.rb b/activerecord/test/cases/postgresql_rake_test.rb index 6d6ede354d..58168e4948 100644 --- a/activerecord/test/cases/postgresql_rake_test.rb +++ b/activerecord/test/cases/postgresql_rake_test.rb @@ -132,4 +132,4 @@ module ActiveRecord ActiveRecord::Tasks::DatabaseTasks.purge @configuration end end -end +end
\ No newline at end of file diff --git a/activerecord/test/cases/sqlite_rake_test.rb b/activerecord/test/cases/sqlite_rake_test.rb index f96a161df1..f68809bfda 100644 --- a/activerecord/test/cases/sqlite_rake_test.rb +++ b/activerecord/test/cases/sqlite_rake_test.rb @@ -4,7 +4,7 @@ require 'pathname' module ActiveRecord class SqliteDBCreateTest < ActiveRecord::TestCase def setup - @database = "db_create.sqlite3" + @database = 'db_create.sqlite3' @connection = stub :connection @configuration = { 'adapter' => 'sqlite3', @@ -77,6 +77,7 @@ module ActiveRecord end def test_removes_file_with_absolute_path + File.stubs(:exist?).returns(true) @path.stubs(:absolute?).returns(true) FileUtils.expects(:rm).with('/absolute/path') @@ -94,6 +95,7 @@ module ActiveRecord end def test_removes_file_with_relative_path + File.stubs(:exist?).returns(true) @path.stubs(:absolute?).returns(false) FileUtils.expects(:rm).with('/former/relative/path') @@ -101,4 +103,4 @@ module ActiveRecord ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root' end end -end +end
\ No newline at end of file |