From 8a7f3fe4f1d2d0fa1b5a7f718778453635c7cb16 Mon Sep 17 00:00:00 2001 From: Will Read Date: Mon, 18 Apr 2016 21:00:46 -0700 Subject: [PATCH] Removes unnecessary screenshot helper Switches timeout based on being on slow CI, or fast dev boxes - can use Capybara's built in `save_and_open_screenshot` --- Gemfile | 1 - Gemfile.lock | 1 - spec/capybara_helper.rb | 8 ++++---- spec/helpers/capybara_poltergeist_screenshot.rb | 12 ------------ 4 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 spec/helpers/capybara_poltergeist_screenshot.rb diff --git a/Gemfile b/Gemfile index 848fc2fd..84b3de39 100644 --- a/Gemfile +++ b/Gemfile @@ -144,7 +144,6 @@ group :development do gem 'coveralls', require: false gem 'capybara-select2', require: false gem 'delorean' - gem 'launchy', require: false gem 'poltergeist' gem 'pry-rails' gem 'rr' diff --git a/Gemfile.lock b/Gemfile.lock index 12550326..73de03d6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -627,7 +627,6 @@ DEPENDENCIES jsonpath (~> 0.5.6) kaminari (~> 0.16.1) kramdown (~> 1.3.3) - launchy letter_opener_web liquid (~> 3.0.3) listen (~> 3.0.5) diff --git a/spec/capybara_helper.rb b/spec/capybara_helper.rb index a8f0541d..d0c8104e 100644 --- a/spec/capybara_helper.rb +++ b/spec/capybara_helper.rb @@ -2,18 +2,18 @@ require 'rails_helper' require 'capybara/rails' require 'capybara/poltergeist' require 'capybara-select2' -require 'helpers/capybara_poltergeist_screenshot' + +CAPYBARA_TIMEOUT = ENV['CI'] == 'true' ? 60 : 5 Capybara.register_driver :poltergeist do |app| - Capybara::Poltergeist::Driver.new(app, timeout: 5) + Capybara::Poltergeist::Driver.new(app, timeout: CAPYBARA_TIMEOUT) end Capybara.javascript_driver = :poltergeist -Capybara.default_max_wait_time = 5 +Capybara.default_max_wait_time = CAPYBARA_TIMEOUT RSpec.configure do |config| config.include Warden::Test::Helpers - config.include Capybara::PoltergeistScreenshot config.before :suite do Warden.test_mode! end diff --git a/spec/helpers/capybara_poltergeist_screenshot.rb b/spec/helpers/capybara_poltergeist_screenshot.rb deleted file mode 100644 index 164f0e81..00000000 --- a/spec/helpers/capybara_poltergeist_screenshot.rb +++ /dev/null @@ -1,12 +0,0 @@ -require 'launchy' - -module Capybara - module PoltergeistScreenshot - def screenshot_and_open_image(full: false) - timestamp = Time.now.strftime('%Y-%m-%d-%H-%M-%S') - screenshot_path = "tmp/capybara/screenshot_#{timestamp}_#{SecureRandom.hex}.png" - page.save_screenshot(screenshot_path, full: full) - Launchy.open screenshot_path - end - end -end