acceptance_test 1.1.3 → 1.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGRhY2FhMTNlMDhhY2MyNTY1YmM5ZmQxOGQzYmYxZTQwMTJiZmE5Yw==
+    NmE1MDc5ZWE4ZTg1OGE1M2E5ODM5NzRlNWRlZGZlMmY5YTAzZjQ2ZQ==
   data.tar.gz: !binary |-
-    OTc1NWEyMDdkM2YwOGRjNzhiOGNkNzVkMDFhNmIxMzY3ZjA2ZmE5ZQ==
+    MWY5NWVmNzAwYWViNjExZmVjNWYxNmY5ODU4OWI1Nzc2MTk2Y2NkNg==
 SHA512:
   metadata.gz: !binary |-
-    ZTU5NjkyOTM1ZTFiOWI2NmZjM2JlYjg4Njg4NjIyZjYwYmEwMTdhNDJjNGFh
-    MTBjYTZkNTczMWFjOTFiMWI1MWExZjg3ZDJkMTg4Yzg3OWQ3MTUzOGFiMGQ0
-    NmU2OGViOTc1NTczYjNhNmViOTRhYjM0NDFmOGYyM2FkNDEzZjY=
+    YjUxNWYwYzNhNmI5MTJkMTc2MGZlZWE1MjdmYTQzNGMxODZlY2JhZTMyZjYy
+    ZDJkOWQ0YmM2NzQwMDVkYjA0YWRhY2Q1ZmYzNzQxMTI4ZjFiMjBmODdkNjFi
+    YWNjMjMyMzRkMTY0OWVmNjMyMzY3ZjVhYzI0ZDBiMGJhNTlkNDY=
   data.tar.gz: !binary |-
-    MmFiMTgyYWViNWIzNTAyMjc4ZGE4MGNlNTkwYmFjNzNjODc5YjRlNDAwZjQ1
-    ZTc0YTc0ODdiMjg5MmQzMDVjY2UyMDFlYzY2ZDcxOWVjMDg0ZmU3YjczNmU1
-    YzdjZmI1N2Q2MmNhZDE2M2U2M2FmNTg0ZDFkNGEzYjBlMWIxYWQ=
+    MGQ4ZDNiZWZhMWIwN2NiMjBkNWJmMmZmMmNmNDUyZmRiYTVhNDk5N2JjMjk1
+    OWExYTIyYjZlMDZjYzQzMDVlNDRiMDViNzA3MDZkYmI1MTJlOTJjYjQxODE4
+    NGVkMDI5NTFiOTQ5NzUyNjlhMzgwMWFjYTIxMWJkYTNjZTUxZTY=

data/CHANGES

@@ -46,4 +46,8 @@
 
 == Version 1.1.3
 
-* Bug fix
+* Bug fix
+
+== Version 1.1.4
+
+* Adding ScreenshotMaker

data/lib/acceptance_test/acceptance_test.rb

@@ -7,10 +7,11 @@ require 'active_support/hash_with_indifferent_access'
 require 'acceptance_test/acceptance_test_helper'
 
 class AcceptanceTest
-  attr_accessor :app_host
+  attr_accessor :app_host, :project_root, :screenshot_dir
 
-  def initialize project_root="."
+  def initialize project_root, screenshot_dir
     @project_root = File.expand_path(project_root.to_s)
+    @screenshot_dir = File.expand_path(screenshot_dir.to_s)
 
     @app_host = default_app_host
 
@@ -39,12 +40,17 @@ class AcceptanceTest
     setup_app_host app_host
   end
 
-  def after page, example_exception=nil, metadata={}
-    if example_exception
+  def after page, exception=nil, metadata={}
+    if exception
       driver = driver(metadata)
 
       if driver and not [:webkit].include? driver
-        save_screenshot example, page
+        screenshot_maker = ScreenshotMaker.new screenshot_dir
+
+        screenshot_maker.make page, metadata
+
+        puts metadata[:full_description]
+        puts "Screenshot: #{screenshot_maker.screenshot_url(metadata)}"
       end
     end
 
@@ -79,7 +85,7 @@ class AcceptanceTest
     require "capybara"
     require "capybara/dsl"
 
-    # try to load capybara related rspec library
+    # try to load capybara-related rspec library
     begin
       require 'capybara/rspec'
     rescue
@@ -209,25 +215,6 @@ class AcceptanceTest
     "#{uri.scheme}://#{uri.host}:#{uri.port}"
   end
 
-  def save_screenshot example, page
-    file_path = example.metadata[:file_path]
-    line_number = example.metadata[:line_number]
-    full_description = example.metadata[:full_description]
-
-    filename = File.basename(file_path)
-
-    screenshot_name = "screenshot-#{filename}-#{line_number}.png"
-    screenshot_path = "#{@project_root}/tmp/#{screenshot_name}"
-
-    page.save_screenshot(screenshot_path)
-
-    project_url = ENV['BUILD_URL'].nil? ? "file:///#{@project_root}" : "#{ENV['BUILD_URL']}../ws"
-
-    screenshot_url = "#{project_url}/tmp/#{screenshot_name}"
-
-    puts full_description + "\n Screenshot: #{screenshot_url}"
-  end
-
   def acceptance_config_exist?
     not @acceptance_config.nil? and @acceptance_config.size > 0
   end

data/lib/acceptance_test/screenshot_maker.rb

@@ -0,0 +1,30 @@
+class ScreenshotMaker
+  attr_reader :basedir
+
+  def initialize basedir
+    @basedir = basedir
+  end
+
+  def make page, options
+    page.save_screenshot(screenshot_path(options))
+  end
+
+  def screenshot_path options
+    "#{basedir}/#{screenshot_name(options)}"
+  end
+
+  def screenshot_name options
+    filename = File.basename(options[:file_path])
+    line_number = options[:line_number]
+
+    name = "screenshot-#{filename}"
+    name += "-#{line_number}" if line_number
+
+    "#{name}.png"
+  end
+
+  def screenshot_url options
+    "file:///#{screenshot_path(options)}"
+  end
+
+end

data/lib/acceptance_test/version.rb

@@ -1,3 +1,3 @@
 class AcceptanceTest
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acceptance_test
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen
@@ -67,6 +67,7 @@ files:
 - lib/acceptance_test/acceptance_shared_context.rb
 - lib/acceptance_test/acceptance_test.rb
 - lib/acceptance_test/acceptance_test_helper.rb
+- lib/acceptance_test/screenshot_maker.rb
 - lib/acceptance_test/version.rb
 - spec/features/features_spec_helper.rb
 - spec/features/google_search_spec.rb