eyes_selenium 3.14.1 → 3.14.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f5495b370028231c243e17f7b1d1bcddf0159fc9
4
- data.tar.gz: 6dfd6f9de486b75b38f875bb00bcda778afecb38
3
+ metadata.gz: 6c3b7458d90ef5f55b65f8e0b42b41d0eaf7f746
4
+ data.tar.gz: 3751dc0f12798e472f7116240c2c80ef32c60132
5
5
  SHA512:
6
- metadata.gz: 64e5393b644942159afd1b27c5559616251cf4ac7ef73121902fa0f3129d73f8868d51be15a100d28fff091194956580ddc10f332b381344c65821decb566ea0
7
- data.tar.gz: 2197dbe3938bf1046e788949f2c3f537c30d8a738b21c665d5f6bb24582b413792bd58abf09cc02ff0771c70deda4dce3a6cb320b9eb41b3af91a57b84453749
6
+ metadata.gz: d2a70ae337b3880c5bae8f49b936d25be1e6ae88f761d99dec56864501d3fb5715dcd3f88ad47aaa3771175257963d1b719ab00e3ff800a01a91f31cbe2717c4
7
+ data.tar.gz: 60da9624d81765441bb428865a82c54434c646b947156de02c931f1732b19c6e4fbf293eff161dbf62a8d1e07e07e53dcdced47dad97bc66498f50a0d95e9c73
@@ -66,8 +66,9 @@ module Applitools::Selenium
66
66
  viewport_size = Applitools::Utils::EyesSeleniumUtils.extract_viewport_size(executor)
67
67
  result = Applitools::Utils::EyesSeleniumUtils.current_frame_content_entire_size(executor)
68
68
  logger.info "Entire size: #{result}"
69
- result.width = [result.width, max_width].min unless max_width.nil?
70
- result.height = [result.height, max_height].min unless max_height.nil?
69
+ result.width = max_width unless max_width.nil?
70
+ result.height = max_height unless max_height.nil?
71
+
71
72
  result.width = [viewport_size.width, result.width].min if disable_horizontal
72
73
  result.height = [viewport_size.height, result.height].min if disable_vertical
73
74
  logger.info "Actual size to scroll: #{result}"
@@ -238,7 +238,11 @@ module Applitools::Selenium
238
238
  timeout = target.options[:timeout] || USE_DEFAULT_MATCH_TIMEOUT
239
239
  self.eyes_screenshot_factory = lambda do |image|
240
240
  Applitools::Selenium::EyesWebDriverScreenshot.new(
241
- image, driver: driver, force_offset: position_provider.force_offset
241
+ image, driver: driver,
242
+ force_offset: position_provider.force_offset,
243
+ position_provider: self.class.position_provider(
244
+ :SCROLL, driver, disable_horizontal_scrolling, disable_vertical_scrolling, explicit_entire_size
245
+ )
242
246
  )
243
247
  end
244
248
 
@@ -11,6 +11,7 @@ module Applitools::Selenium
11
11
  [:driver, :force_offset].sort => :initialize_main,
12
12
  [:driver].sort => :initialize_main,
13
13
  [:driver, :position_provider].sort => :initialize_main,
14
+ [:driver, :position_provider, :force_offset].sort => :initialize_main,
14
15
  [:driver, :entire_frame_size].sort => :initialize_for_element,
15
16
  [:driver, :entire_frame_size, :frame_location_in_screenshot].sort => :initialize_for_element
16
17
  }.freeze
@@ -123,6 +124,12 @@ module Applitools::Selenium
123
124
  self.position_provider = Applitools::Selenium::ScrollPositionProvider.new driver if
124
125
  options[:position_provider].nil?
125
126
 
127
+ self.position_provider = if options[:position_provider].nil?
128
+ Applitools::Selenium::ScrollPositionProvider.new(driver)
129
+ else
130
+ options[:position_provider]
131
+ end
132
+
126
133
  viewport_size = driver.default_content_viewport_size
127
134
 
128
135
  self.frame_chain = driver.frame_chain
@@ -53,8 +53,10 @@ module Applitools::Selenium
53
53
  viewport_size = Applitools::Utils::EyesSeleniumUtils.extract_viewport_size(executor)
54
54
  result = Applitools::Utils::EyesSeleniumUtils.entire_page_size(executor)
55
55
  logger.info "Entire size: #{result}"
56
- result.width = [result.width, max_width].min unless max_width.nil?
57
- result.height = [result.height, max_height].min unless max_height.nil?
56
+
57
+ result.width = max_width unless max_width.nil?
58
+ result.height = max_height unless max_height.nil?
59
+
58
60
  result.width = [viewport_size.width, result.width].min if disable_horizontal
59
61
  result.height = [viewport_size.height, result.height].min if disable_vertical
60
62
  logger.info "Actual size to scroll: #{result}"
@@ -1,3 +1,3 @@
1
1
  module Applitools
2
- VERSION = '3.14.1'.freeze
2
+ VERSION = '3.14.2'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: eyes_selenium
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.14.1
4
+ version: 3.14.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Applitools Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-12-29 00:00:00.000000000 Z
11
+ date: 2017-12-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: eyes_core
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 3.14.1
19
+ version: 3.14.2
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 3.14.1
26
+ version: 3.14.2
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: selenium-webdriver
29
29
  requirement: !ruby/object:Gem::Requirement