script/test_console script/test_prepare_database @@ -58,8 +58,9 @@ Development Please check out /doc directory for high level overview about adva-cms. Running tests: - rake db:test:clone # Clones from your development database to test database - ruby script/test-adva # Runs all adva-cms tests + rake db:test:clone # Clones from your development database to test database + ruby script/test-adva -p # Prepares the database and runs all adva-cms tests + ruby script/test-adva # Runs all adva-cms tests without preparing the database ruby script/test-adva vendor/adva/engines/adva_wiki # Runs only adva_wiki tests Please report bugs to Lighthouse: README @@ -30,7 +30,7 @@ class Test::Unit::TestCase I18n.default_locale = :en end alias_method_chain :setup, :test_setup - + def teardown_with_test_setup teardown_without_test_setup ensure @@ -42,13 +42,21 @@ class Test::Unit::TestCase alias_method_chain :teardown, :test_setup end +# FIXME at_exit { try to rollback any open transactions } + # include this line to test adva-cms with url_history installed # require dir + '/plugins/url_history/init_url_history' require_all dir + "/contexts.rb", - dir + "/fixtures.rb", + # dir + "/fixtures.rb", dir + "/test_helper/**/*.rb" require_all dir + "/../../**/test/contexts.rb", - dir + "/../../**/test/fixtures.rb", + # dir + "/../../**/test/fixtures.rb", dir + "/../../**/test/test_helper/**/*.rb" +if DO_PREPARE_DATABASE + puts 'Preparing the database ...' + require_all dir + "/fixtures.rb" + require_all dir + "/../../**/test/fixtures.rb" +end + engines/adva_cms/test/test_helper.rb @@ -3,7 +3,14 @@ OptionParser.new do |o| With.options[:line] = line end + o.on('-p', '--prepare-database', "Do not initialize fixtures to the database.") do |line| + DO_PREPARE_DATABASE = true + end + o.on('-w', '--with=ASPECTS', "Run tests defined for the given ASPECTS (comma separated).") do |aspects| With.aspects += aspects.split(/,/) end -end.parse!(ARGV) \ No newline at end of file +end.parse!(ARGV) + +DO_PREPARE_DATABASE = false unless defined?(DO_PREPARE_DATABASE) + engines/adva_cms/test/test_helper/parse_options.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby def files_to_load(paths) - paths.reject!{|path| path =~ /^--/ } # ignore options + paths.reject!{|path| path =~ /^-/ } # ignore options paths = [engines_path] if paths.empty? result = [] paths.each do |path| @@ -31,8 +31,8 @@ paths = ARGV.clone paths = files_to_load(paths) unless paths.empty? - puts 'Running adva-cms tests...' + puts 'Running adva-cms tests ...' # root_path = File.expand_path(File.dirname(__FILE__)).gsub!(/vendor.*/, '') # paths.each{|path| puts path.gsub(root_path, '') } - paths.each{|path| require path } + paths.sort.each{|path| require path } end script/test 9fbff1a18503b52d21f3365183a92526ca868b04 Sven Fuchs svenfuchs@artweb-design.de http://github.com/svenfuchs/adva_cms/commit/200404880a307f76a5a67110abdc430807a38b02 200404880a307f76a5a67110abdc430807a38b02 2009-02-13T05:56:45-08:00 2009-02-12T01:09:09-08:00 remove the database preparation from the default test run. you can now opt in to preparing the database before test run by passing the option -p or --prepare-database. you can also prepare the database with the script scripts/test_prepare_database 5340a49f246e6cfdb591c3ddc4811d8cfab59531 Joshua Harvey joshmh@gmail.com