Load the test schema through Rails, and keep the search trigger installed

2 files changed, 4 insertions, 19 deletions

diff --git a/lib/tasks/init.rake b/lib/tasks/init.rake
index 16575345..adfaddfd 100644
--- a/lib/tasks/init.rake
+++ b/lib/tasks/init.rake
@@ -77,3 +77,7 @@ namespace :cccms do
     end
   end
 end
+
+Rake::Task["db:schema:load"].enhance do
+  Page.ensure_search_vector_trigger!
+end
diff --git a/lib/tasks/test_db.rake b/lib/tasks/test_db.rake
deleted file mode 100644
index 0a7a17d7..00000000
--- a/lib/tasks/test_db.rake
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace :db do
-  namespace :test do
-    task :load_schema do
-      ActiveRecord::Base.establish_connection(:test)
-      ActiveRecord::Schema.verbose = false
-      load "#{Rails.root}/db/schema.rb"
-    end
-
-    task :prepare => :environment do
-      begin
-        ActiveRecord::Base.establish_connection(:test)
-        ActiveRecord::Base.connection
-      rescue
-        system("psql -U postgres postgres -c \"CREATE DATABASE psql_test OWNER psql ENCODING 'UTF8';\"")
-      end
-      Rake::Task['db:test:load_schema'].invoke
-    end
-  end
-end