From 837c370665fc06cd04db2588bed4608d415734cb Mon Sep 17 00:00:00 2001 From: Paulo Meirelles Date: Thu, 1 Nov 2012 18:52:40 -0200 Subject: [PATCH] Fixing 'missing cucumber and selenium' --- lib/tasks/plugins_tests.rake | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/tasks/plugins_tests.rake b/lib/tasks/plugins_tests.rake index 0540ec9..5b710ad 100644 --- a/lib/tasks/plugins_tests.rake +++ b/lib/tasks/plugins_tests.rake @@ -31,7 +31,7 @@ def run_cucumber(name, profile, files_glob) if files.empty? puts "I: no tests to run #{name}" else - sh 'xvfb-run', 'ruby', '-S', 'cucumber', '--profile', profile, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *features + sh 'xvfb-run', 'ruby', '-S', 'cucumber', '--profile', profile, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *files end end @@ -42,14 +42,16 @@ def plugin_test_task(name, plugin, files_glob) end end -def plugin_cucumber_task(plugin, files_glob) - task :cucumber => 'db:test:plugins:prepare' do |t| +def plugin_cucumber_task(name, plugin, files_glob) + desc "Run #{name} tests for #{plugin_name(plugin)}" + task name => 'db:test:plugins:prepare' do |t| run_cucumber t.name, :default, files_glob end end -def plugin_selenium_task(plugin, files_glob) - task :selenium => 'db:test:plugins:prepare' do |t| +def plugin_selenium_task(name, plugin, files_glob) + desc "Run #{name} tests for #{plugin_name(plugin)}" + task name => 'db:test:plugins:prepare' do |t| run_cucumber t.name, :selenium, files_glob end end @@ -79,11 +81,11 @@ namespace :test do plugin_test_task :units, plugin, "plugins/#{plugin}/test/unit/**/*.rb" plugin_test_task :functionals, plugin, "plugins/#{plugin}/test/functional/**/*.rb" plugin_test_task :integration, plugin, "plugins/#{plugin}/test/integration/**/*.rb" - plugin_cucumber_task plugin, "plugins/#{plugin}/features/**/*.feature" - plugin_selenium_task plugin, "plugins/#{plugin}/features/**/*.feature" + plugin_cucumber_task :cucumber, plugin, "plugins/#{plugin}/features/**/*.feature" + plugin_selenium_task :selenium, plugin, "plugins/#{plugin}/features/**/*.feature" end - test_sequence_task(plugin, plugin, "#{plugin}:units", "#{plugin}:functionals", "#{plugin}:integration", "#{plugin}:cucumber", "#{plugin}:selenium") # FIXME missing cucumber and selenium + test_sequence_task(plugin, plugin, "#{plugin}:units", "#{plugin}:functionals", "#{plugin}:integration", "#{plugin}:cucumber", "#{plugin}:selenium") end { :units => :unit , :functionals => :functional , :integration => :integration }.each do |taskname,folder| -- libgit2 0.21.2