acceptance_test 1.7.12 → 1.7.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGU0NGU3MjljNzhmY2QyYWZjNDIwMGI3NjkyZjEwNTI3Y2Y5YTc3YQ==
+    MjI3YTg0NzY4YjYwMjY0YTUzZTEwOTU1MjQ2ZDk5NjBhYTU4ZTliMg==
   data.tar.gz: !binary |-
-    MGExMDNlNTNkOWM5N2JhZTMxZGI5YjJjOTczOTExZWJjYTE4Y2UwNA==
+    YjgwMGM3YjcxYTM2YzgxY2YxZDEyMWVjYzA4MDJmZWJhNTdlYWZmNg==
 SHA512:
   metadata.gz: !binary |-
-    ZjkzZWJmMDdmOTVjZDNkZDVhMDZhNTQwYTFhNmY5YmUyYWY2YmE4MzhmZTU1
-    NTE3N2FmZjNmYjM3MTU1ZmQ1NDk4MmNjN2VlYzEwMmYyMmIxM2FkZDI3ODg1
-    ZDBmZmE5NDkxYzRhYTEwNmM4YjVjYTBlMjY5MzAxNTI5ODQxNzI=
+    NzliYmI5M2UwMjFhOTZhZDkzNzlkNGY5ZWUzYmFhMWE1MGY4ODhjZDgyZDU2
+    MzIxZmNlMTdjOWZhZDc0M2JiYjIxZTYwNDdlNGZkMzlmMjk2MTE2ZTNhMTdj
+    ZWE2ZjVlYWQ0M2I4OTY5NDVkZGUyNWU5ZDc3MGE5YjQ1NGFmMmI=
   data.tar.gz: !binary |-
-    NGI3Y2Y3ZWNlZWRiN2FkYjBlYjI1MGYyOTUyMWMyZmU1YTMxNzEzYzFjZDY1
-    MzZkMWJhNmMxNTI0NWJhYTI5ZjY1MzI4N2I1MjBhYzJkNWRiNmJhYzUyN2Fj
-    Mjk3ZTdmNjM3NjE3ZWYzYzYyNjM3MjRlNzk2NDMyYzQyMTY2Yjk=
+    NjNiYjVlYjQzZGM5MWFkNjhiMjAyNjFmMTUzM2RmM2UzOTNmY2QxMGE0Nzkz
+    MWE3NzQxYTdiY2RhNGFmYjIxZjAxYWE0ZDI2ZmI0Yzg2YmEwYTU4MDg2YmQx
+    MjMyNzU5Mzg5Y2MzNmUyN2QwODBlNThlYmM5OGQ0MzNmMmYwMGY=

data/CHANGES

@@ -191,4 +191,8 @@
 
 == Version 1.7.12
 
+* Bug fix
+
+== Version 1.7.13
+
 * Bug fix

data/lib/acceptance_test/screenshot_maker.rb

@@ -6,25 +6,23 @@ class ScreenshotMaker
   end
 
   def make page, options
-    name = screenshot_name(File.basename(options[:file_path]), options[:line_number])
+    file_path = options[:file_path]
+
+    name = screenshot_name(build_name(file_path), options[:line_number])
     path = File.expand_path("#{basedir}/#{name}")
 
     page.save_screenshot(path)
   end
 
-  def screenshot_name filename, line_number=nil
-    "#{filename}#{line_number ? '-'+line_number : ''}.png"
-  end
-
   def screenshot_url options
     file_path = options[:file_path]
 
-    if file_path =~ /http:/ or file_path =~ /https:/ or file_path =~ /ftp:/
-      name = screenshot_name(File.basename(options[:file_path]), options[:line_number])
+    if options[:screenshot_url_base]
+      name = screenshot_name(build_name(file_path), options[:line_number])
 
-      "#{file_path}/#{name}"
+      "#{options[:screenshot_url_base]}/#{name}"
     else
-      name = screenshot_name(File.basename(options[:file_path]), options[:line_number])
+      name = screenshot_name(build_name(file_path), options[:line_number])
 
       path = File.expand_path("#{basedir}/#{name}")
 
@@ -32,4 +30,26 @@ class ScreenshotMaker
     end
   end
 
+  private
+
+  def screenshot_name name, line_number=nil
+    "#{name}#{line_number ? '-'+line_number.to_s : ''}.png"
+  end
+
+  def build_name path
+    full_path = File.expand_path(path)
+    extension = File.extname(path)
+
+    index1 = full_path.index("/spec")
+    index2 = full_path.index(extension)
+
+    name = full_path[index1+1..index2-1].gsub("/", "_")
+
+    name = name[5..-1] if name =~ /^spec_/
+    name = name[9..-1] if name =~ /^features_/
+    name = name[11..-1] if name =~ /^acceptance_/
+
+    name
+  end
+
 end

data/lib/acceptance_test/version.rb

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

metadata

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