From 460178ad34e7be15fd4136f36bf0e7444563d2c5 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Sun, 3 Sep 2017 19:22:59 +0200
Subject: [PATCH] Fix the screenshot tool

closes #7605
---
 features/step_definitions/custom_web_steps.rb | 23 +++++++++----------
 lib/tasks/screenshots.rake                    | 11 +++++----
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/features/step_definitions/custom_web_steps.rb b/features/step_definitions/custom_web_steps.rb
index 728dda1b4..41e4f80eb 100644
--- a/features/step_definitions/custom_web_steps.rb
+++ b/features/step_definitions/custom_web_steps.rb
@@ -12,8 +12,8 @@ module ScreenshotCukeHelpers
 
     sleep 0.5
 
-    browser.manage.window.resize_to(1280, 1024)
-    browser.save_screenshot(pic)
+    page.driver.resize(1280, 1024)
+    save_screenshot(pic)
   end
 
   def take_screenshots_without_login
@@ -29,16 +29,15 @@ module ScreenshotCukeHelpers
 
   def take_screenshots_with_login
     pages = {
-      'stream'        => 'stream',
-      'activity'      => 'activity_stream',
-      'mentions'      => 'mentioned_stream',
-      'aspects'       => 'aspects_stream',
-      'tags'          => 'followed_tags_stream',
-      'contacts'      => 'contacts',
-      'settings'      => 'edit_user',
-      'notifications' => 'notifications',
-      'conversations' => 'conversations',
-      'logout'        => 'destroy_user_session'
+      "stream"        => "stream",
+      "activity"      => "activity_stream",
+      "mentions"      => "mentioned_stream",
+      "aspects"       => "aspects_stream",
+      "tags"          => "followed_tags_stream",
+      "contacts"      => "contacts",
+      "settings"      => "edit_user",
+      "notifications" => "notifications",
+      "conversations" => "conversations"
     }
 
     pages.each do |name, path|
diff --git a/lib/tasks/screenshots.rake b/lib/tasks/screenshots.rake
index eee87fedc..0b2c17859 100644
--- a/lib/tasks/screenshots.rake
+++ b/lib/tasks/screenshots.rake
@@ -15,7 +15,6 @@ namespace :screenshots do
 
   desc 'Generate "flicker" images for easy comparison (requires RMagick)'
   task :flicker do
-    require 'RMagick'
     screen_dir = Rails.root.join('tmp', 'screenshots')
 
     ref_dir = screen_dir.join('reference')
@@ -28,10 +27,12 @@ namespace :screenshots do
         raise "the comparison screenshot for #{filename} doesn't exist!"
       end
 
-      img_list = Magick::ImageList.new(ref_dir.join(filename), cur_dir.join(filename))
-      img_list.delay = 65      # number of ticks between flicker img change (100 ticks/second)
-      img_list.iterations = 0  # -> endless loop
-      img_list.write(screen_dir.join("#{filename}.gif"))
+      MiniMagick::Tool::Convert.new do |convert|
+        convert.merge! ["-delay", "65", "-loop", "0"]
+        convert << ref_dir.join(filename)
+        convert << cur_dir.join(filename)
+        convert << screen_dir.join("#{filename}.gif")
+      end
     end
 
     puts %Q(