Download as
Browse Code »

Commit 837c370665fc06cd04db2588bed4608d415734cb

Authored by Paulo Meireles
Committed by Daniela Feitosa
1 parent 6ea5cc36
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Fixing 'missing cucumber and selenium'

Showing 1 changed file with 10 additions and 8 deletions   Show diff stats
lib/tasks/plugins_tests.rake
  Diff comments   View file @837c370
... ... @@ -31,7 +31,7 @@ def run_cucumber(name, profile, files_glob)
31 31 if files.empty?
32 32 puts "I: no tests to run #{name}"
33 33 else
34   - sh 'xvfb-run', 'ruby', '-S', 'cucumber', '--profile', profile, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *features
  34 + sh 'xvfb-run', 'ruby', '-S', 'cucumber', '--profile', profile, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *files
35 35 end
36 36 end
37 37  
... ... @@ -42,14 +42,16 @@ def plugin_test_task(name, plugin, files_glob)
42 42 end
43 43 end
44 44  
45   -def plugin_cucumber_task(plugin, files_glob)
46   - task :cucumber => 'db:test:plugins:prepare' do |t|
  45 +def plugin_cucumber_task(name, plugin, files_glob)
  46 + desc "Run #{name} tests for #{plugin_name(plugin)}"
  47 + task name => 'db:test:plugins:prepare' do |t|
47 48 run_cucumber t.name, :default, files_glob
48 49 end
49 50 end
50 51  
51   -def plugin_selenium_task(plugin, files_glob)
52   - task :selenium => 'db:test:plugins:prepare' do |t|
  52 +def plugin_selenium_task(name, plugin, files_glob)
  53 + desc "Run #{name} tests for #{plugin_name(plugin)}"
  54 + task name => 'db:test:plugins:prepare' do |t|
53 55 run_cucumber t.name, :selenium, files_glob
54 56 end
55 57 end
... ... @@ -79,11 +81,11 @@ namespace :test do
79 81 plugin_test_task :units, plugin, "plugins/#{plugin}/test/unit/**/*.rb"
80 82 plugin_test_task :functionals, plugin, "plugins/#{plugin}/test/functional/**/*.rb"
81 83 plugin_test_task :integration, plugin, "plugins/#{plugin}/test/integration/**/*.rb"
82   - plugin_cucumber_task plugin, "plugins/#{plugin}/features/**/*.feature"
83   - plugin_selenium_task plugin, "plugins/#{plugin}/features/**/*.feature"
  84 + plugin_cucumber_task :cucumber, plugin, "plugins/#{plugin}/features/**/*.feature"
  85 + plugin_selenium_task :selenium, plugin, "plugins/#{plugin}/features/**/*.feature"
84 86 end
85 87  
86   - test_sequence_task(plugin, plugin, "#{plugin}:units", "#{plugin}:functionals", "#{plugin}:integration", "#{plugin}:cucumber", "#{plugin}:selenium") # FIXME missing cucumber and selenium
  88 + test_sequence_task(plugin, plugin, "#{plugin}:units", "#{plugin}:functionals", "#{plugin}:integration", "#{plugin}:cucumber", "#{plugin}:selenium")
87 89 end
88 90  
89 91 { :units => :unit , :functionals => :functional , :integration => :integration }.each do |taskname,folder|
... ...