Download as
Browse Code »

Commit 85f6dccae771dc4144dd901a2f462639321647cd

Authored by Braulio Bhavamitra
1 parent b03d4c32
Exists in web_steps_improvements and in 9 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_sign_up_form, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.5

Set resolution for xvfb-run 

This avoid unexpected failures with different environments defaults
Showing 3 changed files with 5 additions and 3 deletions   Show diff stats
lib/tasks/ci.rake
  Diff comments   View file @85f6dcc
@@ -57,7 +57,8 @@ namespace :ci do @@ -57,7 +57,8 @@ namespace :ci do
57 57
58 sh 'ruby', '-Itest', *tests unless tests.empty? 58 sh 'ruby', '-Itest', *tests unless tests.empty?
59 sh 'cucumber', *features unless features.empty? 59 sh 'cucumber', *features unless features.empty?
60 - sh 'xvfb-run', '-a', 'cucumber', '-p', 'selenium', *features unless features.empty? 60 + sh 'xvfb-run', '-a', '--server-args="-screen 0, 1280x1024x24"',
  61 + 'cucumber', '-p', 'selenium', *features unless features.empty?
61 62
62 changed_plugins.each do |plugin| 63 changed_plugins.each do |plugin|
63 if $broken_plugins.include?(plugin) 64 if $broken_plugins.include?(plugin)
lib/tasks/plugins_tests.rake
  Diff comments   View file @85f6dcc
@@ -116,7 +116,8 @@ def run_minitest files @@ -116,7 +116,8 @@ def run_minitest files
116 end 116 end
117 117
118 def run_cucumber(profile, files) 118 def run_cucumber(profile, files)
119 - sh 'xvfb-run', '-a', 'ruby', '-S', 'cucumber', '--profile', profile.to_s, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *files 119 + sh 'xvfb-run', '-a', '--server-args="-screen 0, 1280x1024x24"',
  120 + 'ruby', '-S', 'cucumber', '--profile', profile.to_s, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *files
120 end 121 end
121 122
122 def custom_run(name, files, run=:all) 123 def custom_run(name, files, run=:all)
lib/tasks/selenium.rake
  Diff comments   View file @85f6dcc
1 desc 'Runs Seleniun acceptance tests' 1 desc 'Runs Seleniun acceptance tests'
2 task :selenium do 2 task :selenium do
3 puts "Firefox version = #{`firefox --version`}" 3 puts "Firefox version = #{`firefox --version`}"
4 - sh "xvfb-run -a cucumber -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}" 4 + sh "xvfb-run -a --server-args=\"-screen 0, 1280x1024x24\" cucumber -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
5 end 5 end