Improve initial project setup for running tests.

Must run `rake project:setup[mysql]` to create database.yml for your local env.

Author: peakpg

Rakefile

@@ -20,22 +20,22 @@ Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 
-Rake::TestTask.new('test:units' => 'app:test:prepare') do |t|
+Rake::TestTask.new('test:units' => ['project:ensure_db_exists', 'app:test:prepare']) do |t|
  t.libs << 'lib'
  t.libs << 'test'
  t.pattern = 'test/unit/**/*_test.rb'
  t.verbose = false
 end
 
-Rake::TestTask.new('test:functionals' => 'app:test:prepare') do |t|
+Rake::TestTask.new('test:functionals' => ['project:ensure_db_exists', 'app:test:prepare']) do |t|
  t.libs << 'lib'
  t.libs << 'test'
  t.pattern = 'test/functional/**/*_test.rb'
  t.verbose = false
 
 end
 
-Rake::TestTask.new('test:integration') do |t|
+Rake::TestTask.new('test:integration' => ['project:ensure_db_exists', 'app:test:prepare']) do |t|
  t.libs << 'lib'
  t.libs << 'test'
  t.pattern = 'test/integration/**/*_test.rb'
@@ -45,15 +45,15 @@ end
 require 'cucumber'
 require 'cucumber/rake/task'
 
-Cucumber::Rake::Task.new(:features) do |t|
+Cucumber::Rake::Task.new(:features => ['project:ensure_db_exists', 'app:test:prepare']) do |t|
  t.cucumber_opts = "features --format progress"
 end
 
-Cucumber::Rake::Task.new('features:fast') do |t|
+Cucumber::Rake::Task.new('features:fast' => ['project:ensure_db_exists', 'app:test:prepare']) do |t|
  t.cucumber_opts = "features --format progress --tags ~@cli"
 end
 
-Cucumber::Rake::Task.new('features:cli') do |t|
+Cucumber::Rake::Task.new('features:cli' => ['project:ensure_db_exists', 'app:test:prepare']) do |t|
  t.cucumber_opts = "features --format progress --tags @cli"
 end
 
@@ -62,7 +62,7 @@ desc "Run everything but the command line (slow) tests"
 task 'test:fast' => %w{test:units test:functionals test:integration features:fast}
 
 desc 'Runs all the tests'
-task :test => 'app:test:prepare' do
+task :test => ['project:ensure_db_exists', 'app:test:prepare'] do
  tests_to_run = ENV['TEST'] ? ["test:single"] : %w(test:units test:functionals test:integration features)
  errors = tests_to_run.collect do |task|
  begin

config/database.jdbcmysql.yml.example

@@ -17,36 +17,43 @@ end
 
 
 # These are tasks for the core browsercms project, and shouldn't be bundled into the distributable gem
-namespace :test do
-
- # Could be improved somewhat to get rid of unneeded warnings.
- desc "run tests against sqlite database"
- task :sqlite3 do
- cp(File.join('config', 'database.sqlite3.yml'), File.join('config', 'database.yml'), :verbose => true)
- Rake::Task['db:drop'].invoke
- Rake::Task['db:create'].invoke
- system "rake db:migrate test"
- end
-
- # Could be improved somewhat to get rid of unneeded warnings.
- desc "run tests against mysql database"
- task :mysql do
- cp(File.join('config', 'database.mysql.yml'), File.join('config', 'database.yml'), :verbose => true)
- Rake::Task['db:drop'].invoke
- Rake::Task['db:create'].invoke
- system "rake db:migrate test"
+namespace :project do
+
+ # Could be improved somewhat to get rid of unneeded warnings.
+ #desc "run tests against sqlite database"
+ #task :sqlite3 do
+ # cp(File.join('config', 'database.sqlite3.yml'), File.join('config', 'database.yml'), :verbose => true)
+ # Rake::Task['db:drop'].invoke
+ # Rake::Task['db:create'].invoke
+ # system "rake db:migrate test"
+ #end
+ #
+ ## Could be improved somewhat to get rid of unneeded warnings.
+ #desc "run tests against mysql database"
+ #task :mysql do
+ # cp(File.join('config', 'database.mysql.yml'), File.join('config', 'database.yml'), :verbose => true)
+ # Rake::Task['db:drop'].invoke
+ # Rake::Task['db:create'].invoke
+ # system "rake db:migrate test"
+ #end
+
+ task :ensure_db_exists do
+ unless File.exists?("test/dummy/config/database.yml")
+ fail("Need to create a database.yml file before running tests. Run:\n $ rake project:setup[database] to create a sample database.yml for the project.")
+ end
  end
 
  desc 'Copy database.yml files for running tests'
- task :setup do
- drivers = %w(jdbcmysql mysql postgres sqlite3).each do |driver|
- source = File.join('config', "database.#{driver}.yml.example")
- destination = File.join('config', "database.#{driver}.yml")
- cp(source, destination, :verbose => true)
+ task :setup, :database do |t, args|
+ drivers = %w(jdbcmysql mysql postgres sqlite3)
+ unless drivers.include?(args[:database])
+ fail("'#{args[:database]}' is not an available database. Choose from one of the following #{drivers.inspect}. i.e\n\t$ rake project:setup[mysql]")
  end
 
- source  = File.join('test/dummy/config', "database.yml.example")
+ source = File.join('test/dummy/config', "database.#{args[:database]}.yml")
  destination = File.join('test/dummy/config', "database.yml")
  cp(source, destination, :verbose => true)
+
+
  end
 end