From 7fd77474970fb170f26b56a6b38ef1a19cd816f9 Mon Sep 17 00:00:00 2001
From: Francesco Rodriguez <lrodriguezsanc@gmail.com>
Date: Mon, 18 Jun 2012 01:44:15 -0500
Subject: fix invalid syntax and sqlite rake failing tests

---
 activerecord/lib/active_record/tasks/sqlite_database_tasks.rb | 5 +++--
 activerecord/test/cases/mysql_rake_test.rb                    | 2 +-
 activerecord/test/cases/postgresql_rake_test.rb               | 2 +-
 activerecord/test/cases/sqlite_rake_test.rb                   | 6 ++++--
 4 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'activerecord')

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
-- 
cgit v1.2.3