From 8e699da37c01781e9d362509f4e924e437a98eca Mon Sep 17 00:00:00 2001 From: shmargum Date: Fri, 15 Dec 2017 11:41:39 -0500 Subject: [PATCH 1/3] one fallback image per width in multi width --- lib/wraith/save_images.rb | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/wraith/save_images.rb b/lib/wraith/save_images.rb index bf76426b..26b56246 100644 --- a/lib/wraith/save_images.rb +++ b/lib/wraith/save_images.rb @@ -123,15 +123,20 @@ def crop_selector driver, selector, image_location def capture_image_selenium(screen_sizes, url, file_name, selector, global_before_capture, path_before_capture) driver = get_driver screen_sizes.to_s.split(",").each do |screen_size| - width, height = screen_size.split("x") - new_file_name = file_name.sub('MULTI', screen_size) - driver.manage.window.resize_to(width, height || 1500) - driver.navigate.to url - driver.execute_async_script(File.read(global_before_capture)) if global_before_capture - driver.execute_async_script(File.read(path_before_capture)) if path_before_capture - resize_to_fit_page(driver) unless height - driver.save_screenshot(new_file_name) - crop_selector(driver, selector, new_file_name) if selector && selector.length > 0 + begin + width, height = screen_size.split("x") + new_file_name = file_name.sub('MULTI', screen_size) + driver.manage.window.resize_to(width, height || 1500) + driver.navigate.to url + driver.execute_async_script(File.read(global_before_capture)) if global_before_capture + driver.execute_async_script(File.read(path_before_capture)) if path_before_capture + resize_to_fit_page(driver) unless height + driver.save_screenshot(new_file_name) + crop_selector(driver, selector, new_file_name) if selector && selector.length > 0 + rescue => e + logger.error e + create_invalid_image(new_file_name, width) + end end driver.quit end From d10acd364021a085e2177622565e3e1f8548d2fa Mon Sep 17 00:00:00 2001 From: shmargum Date: Thu, 1 Mar 2018 17:46:10 -0500 Subject: [PATCH 2/3] bump selenium and chromedriver versions --- wraith.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wraith.gemspec b/wraith.gemspec index dba2c1ec..951ab10a 100644 --- a/wraith.gemspec +++ b/wraith.gemspec @@ -30,6 +30,6 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'log4r' spec.add_runtime_dependency 'thor' spec.add_runtime_dependency 'parallel' - spec.add_runtime_dependency 'selenium-webdriver', "~> 3.5" - spec.add_runtime_dependency 'chromedriver-helper', "~> 1.1" + spec.add_runtime_dependency 'selenium-webdriver', "~> 3.9" + spec.add_runtime_dependency 'chromedriver-helper', "~> 1.2" end From 5b4ba6f14954d2cdb568e1804b874db8532392ee Mon Sep 17 00:00:00 2001 From: shmargum Date: Thu, 1 Mar 2018 18:00:25 -0500 Subject: [PATCH 3/3] require sudo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 66d760d7..15a359af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -sudo: false +sudo: required addons: apt: packages: