acceptance_test 1.7.11 → 1.7.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2JlOTlhOTg3Mzc5OTk1YjI1Zjc5Njk0NDE5YzZjNGQwNzlmMTg3NQ==
+    OGU0NGU3MjljNzhmY2QyYWZjNDIwMGI3NjkyZjEwNTI3Y2Y5YTc3YQ==
   data.tar.gz: !binary |-
-    MjcxZjZlZjU4OGQ1MjBmNjY3MmMzNTZlNjc2NzdiMDliMDc3NDRmNA==
+    MGExMDNlNTNkOWM5N2JhZTMxZGI5YjJjOTczOTExZWJjYTE4Y2UwNA==
 SHA512:
   metadata.gz: !binary |-
-    MWE1NDE1NTY3M2ZjNjgxMDVhMzBiZDdmMDAxNjgxYzNkYmI0NjkxNGQ0YTIz
-    N2JjODIzNDIyMWVmZDBlMjJkZTQyY2E3ZGZiYTY2NTZjNjE4ZjFhMjdhZTFi
-    OGJjOGYwZmE5YWRjZDFlNDQ5MjQyMmIyNmM0MjZmNzRmYTEwYjE=
+    ZjkzZWJmMDdmOTVjZDNkZDVhMDZhNTQwYTFhNmY5YmUyYWY2YmE4MzhmZTU1
+    NTE3N2FmZjNmYjM3MTU1ZmQ1NDk4MmNjN2VlYzEwMmYyMmIxM2FkZDI3ODg1
+    ZDBmZmE5NDkxYzRhYTEwNmM4YjVjYTBlMjY5MzAxNTI5ODQxNzI=
   data.tar.gz: !binary |-
-    MTA4YWMxYmNjMDczYzU0OGMyOTdjYTBlOGY0ZTkzNWY4YTMwN2RmNDc4Y2Vh
-    YzJlYzFlZjExMjUzYzk4MDI4MDI5MzIyMDYxYzIzNGI2ZjgwYTc2NjU4MzAw
-    ZjlhOWFhNjQ5Nzg1MjFkOWIwZDc5YTc4OTAxZmY5ZWM1ZDc5MDg=
+    NGI3Y2Y3ZWNlZWRiN2FkYjBlYjI1MGYyOTUyMWMyZmU1YTMxNzEzYzFjZDY1
+    MzZkMWJhNmMxNTI0NWJhYTI5ZjY1MzI4N2I1MjBhYzJkNWRiNmJhYzUyN2Fj
+    Mjk3ZTdmNjM3NjE3ZWYzYzYyNjM3MjRlNzk2NDMyYzQyMTY2Yjk=

data/CHANGES

@@ -187,4 +187,8 @@
 
 == Version 1.7.11
 
+* Bug fix
+
+== Version 1.7.12
+
 * Bug fix

data/lib/acceptance_test/screenshot_maker.rb

@@ -6,25 +6,30 @@ class ScreenshotMaker
   end
 
   def make page, options
-    page.save_screenshot(screenshot_path(options))
+    name = screenshot_name(File.basename(options[:file_path]), options[:line_number])
+    path = File.expand_path("#{basedir}/#{name}")
+
+    page.save_screenshot(path)
   end
 
-  def screenshot_path options
-    File.expand_path("#{basedir}/#{screenshot_name(options)}")
+  def screenshot_name filename, line_number=nil
+    "#{filename}#{line_number ? '-'+line_number : ''}.png"
   end
 
-  def screenshot_name options
-    filename = File.basename(options[:file_path])
-    line_number = options[:line_number]
+  def screenshot_url options
+    file_path = options[:file_path]
 
-    name = filename
-    name += "-#{line_number}" if line_number
+    if file_path =~ /http:/ or file_path =~ /https:/ or file_path =~ /ftp:/
+      name = screenshot_name(File.basename(options[:file_path]), options[:line_number])
 
-    "#{name}.png"
-  end
+      "#{file_path}/#{name}"
+    else
+      name = screenshot_name(File.basename(options[:file_path]), options[:line_number])
 
-  def screenshot_url options
-    "file:///#{screenshot_path(options)}"
+      path = File.expand_path("#{basedir}/#{name}")
+
+      "file:///#{path}"
+    end
   end
 
 end

data/lib/acceptance_test/version.rb

@@ -1,3 +1,3 @@
 class AcceptanceTest
-  VERSION = "1.7.11"
+  VERSION = "1.7.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acceptance_test
 version: !ruby/object:Gem::Version
-  version: 1.7.11
+  version: 1.7.12
 platform: ruby
 authors:
 - Alexander Shvets