Set resolution for xvfb-run

This avoid unexpected failures with different environments defaults
noosfero · Mar 12, 2016 · 85f6dcc · 85f6dcc
1 parent b03d4c3
commit 85f6dcc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
@@ -57,7 +57,8 @@ namespace :ci do
 
     sh 'ruby', '-Itest', *tests unless tests.empty?
     sh 'cucumber', *features unless features.empty?
-    sh 'xvfb-run', '-a', 'cucumber', '-p', 'selenium', *features unless features.empty?
+    sh 'xvfb-run', '-a', '--server-args="-screen 0, 1280x1024x24"',
+      'cucumber', '-p', 'selenium', *features unless features.empty?
 
     changed_plugins.each do |plugin|
       if $broken_plugins.include?(plugin)

diff --git a/lib/tasks/plugins_tests.rake b/lib/tasks/plugins_tests.rake
@@ -116,7 +116,8 @@ def run_minitest files
 end
 
 def run_cucumber(profile, files)
-  sh 'xvfb-run', '-a', 'ruby', '-S', 'cucumber', '--profile', profile.to_s, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *files
+  sh 'xvfb-run', '-a', '--server-args="-screen 0, 1280x1024x24"',
+    'ruby', '-S', 'cucumber', '--profile', profile.to_s, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *files
 end
 
 def custom_run(name, files, run=:all)

diff --git a/lib/tasks/selenium.rake b/lib/tasks/selenium.rake
@@ -1,5 +1,5 @@
 desc 'Runs Seleniun acceptance tests'
 task :selenium do
   puts "Firefox version = #{`firefox --version`}"
-  sh "xvfb-run -a cucumber -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
+  sh "xvfb-run -a --server-args=\"-screen 0, 1280x1024x24\" cucumber -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
 end