acceptance_test 1.1.1 → 1.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWZkZTc4ZmEwMTk0Nzc2ZTFjYjRhY2JhMDU1NzJkZDliMmM2ZDk0MA==
+    NTRhYWVlMWRiOGQ1YjBmODMwZWVjZjliNDk2OWZmZDcxNTBmMDdkNQ==
   data.tar.gz: !binary |-
-    ZjI4NGU3YTcyMjY2MTlhMTIxMmJhMmFjZTdiNDE2NjczZmZlYTZmMw==
+    NzYxZjQxNjQ5ZjUxZjA5NGI5ZjE0NWU1OTE4MDY3OTQzY2NjYmEzMA==
 SHA512:
   metadata.gz: !binary |-
-    NmZjOWQ4MmYzN2YyYjA5NmRlNjNhN2RhZDY3ZjY3NWJlMzIyNTU3NTBiMGI4
-    YzI2MGU4NWJkYTFkYWRkOTc1NTc1NTFhMjMyYjU1NTY3Y2I3MTdjNzQ4OTkz
-    ODFiZjllODRiMTYyMDgwOTQxZTQxYWY0OGIzNGFjYmZlMjAzYzU=
+    NjY1MTU4N2Y2YTExODI1YzEwZDI0YWQyM2VhMGQ2YTU0Y2JmOThhYTlkZGVk
+    NzY5MmEwYmVlNGZjMzY5Nzc1YWE2MjM0ZDgxMjA5MGM5N2Y2OWE3MGVlMmQ3
+    NDZkM2ZlYjhlMDQ2YzdiOGVhNjFlMTM0YzcyMDZiNjQ2OTQyNTY=
   data.tar.gz: !binary |-
-    NDJkNmRiMDc2ZWQ3N2U3M2IwMzQ1MTIyNzcwYTkzOTdlYjk3M2I5Y2IyNzFm
-    NmEwMWEwODcxZmIxNTk0NDJkYTY0YTJkNjA0YmNmOTAxNGY1MWY4MGJkMGMy
-    MTM1ZDA0N2IwZjdkNGJiZWJmM2YxZjIwNzIzZmQ5MjcwNTE1MTY=
+    MTc0ZjZiOWYzNTRkNjBhNWU3Y2NiNDFlMDY3MThiMjA4MDQ5ZDBiMDk0NzEw
+    OWZlNjdhN2Y3MDI0MmNiNjg5YjFjYzA2NzQzMThkNTExYWJjYmE2MWYyZGQy
+    YjYwOGY1YzdkNmM5N2QyZTkxMjljZjU3ZTgwMTM3YmY5MWIxN2E=

data/CHANGES

@@ -36,7 +36,10 @@
 
 * Switch to rspec3
 
-
 == Version 1.1.1
 
 * Bug fix
+
+== Version 1.1.2
+
+* Relaxing method calls

data/lib/acceptance_test.rb

@@ -1,4 +1,2 @@
 require 'acceptance_test/version'
-require 'acceptance_test/acceptance_test_helper'
-require 'acceptance_test/acceptance_test'
-require 'acceptance_test/acceptance_shared_context'
+require 'acceptance_test/acceptance_test'

data/lib/acceptance_test/acceptance_shared_context.rb

@@ -1,23 +1,25 @@
-acceptance_test_lambda = lambda do
-  attr_reader :acceptance_test
+if defined? RSpec
+  acceptance_test_lambda = lambda do
+    attr_reader :acceptance_test
 
-  before :all do
-    @acceptance_test = AcceptanceTest.new
-  end
+    before :all do
+      @acceptance_test = AcceptanceTest.new
+    end
 
-  before do
-    acceptance_test.before self
-  end
+    before do
+      acceptance_test.before self
+    end
 
-  after do
-    acceptance_test.after self
+    after do
+      acceptance_test.after self
+    end
   end
-end
 
-RSpec.shared_context "AcceptanceTest" do
-  self.define_singleton_method(:include_context, acceptance_test_lambda)
+  RSpec.shared_context "AcceptanceTest" do
+    self.define_singleton_method(:include_context, acceptance_test_lambda)
 
-  include_context
+    include_context
+  end
 end
 
 

data/lib/acceptance_test/acceptance_test.rb

@@ -4,6 +4,8 @@ require 'capybara'
 require 'yaml'
 require 'active_support/hash_with_indifferent_access'
 
+require 'acceptance_test/acceptance_test_helper'
+
 class AcceptanceTest
   attr_accessor :app_host
 
@@ -17,45 +19,43 @@ class AcceptanceTest
     configure
   end
 
-  def before context
-    driver = driver(context)
+  def before metadata={}
+    driver = driver(metadata)
 
     if driver
       register_driver driver
 
       select_driver driver
 
-      if selenium_driver?(driver) and selenium_config_exist?
-        puts "\nSelenium Configuration: #{@selenium_config[:name]}"
-        puts "Environment: #{@selenium_config[:env]}"
-        puts "Application: #{@selenium_config[:webapp_url]}"
-        puts "Selenium: #{@selenium_config[:selenium_host]}:#{@selenium_config[:selenium_port]}"
+      if acceptance_config_exist?
+        put  "\n"
+        puts "Acceptance Configuration: #{@acceptance_config[:name]}"
+        puts "Environment: #{@acceptance_config[:env]}"
+        puts "Application: #{@acceptance_config[:webapp_url]}"
+        puts "Selenium: #{@acceptance_config[:selenium_host]}:#{@acceptance_config[:selenium_port]}" if
+            selenium_driver?(driver)
       end
     end
 
     setup_app_host app_host
   end
 
-  def after context
-    example = RSpec.current_example
-
-    if example.exception
-      driver = driver(context)
+  def after page, example_exception=nil, metadata={}
+    if example_exception
+      driver = driver(metadata)
 
       if driver and not [:webkit].include? driver
-        save_screenshot example, context.page
+        save_screenshot example, page
       end
     end
 
     Capybara.current_driver = Capybara.default_driver
-
-    context.reset_session!
   end
 
-  def load_selenium_config file_name, config_name
-    @selenium_config = HashWithIndifferentAccess.new YAML.load_file(file_name)[config_name]
+  def load_acceptance_config file_name, config_name
+    @acceptance_config = HashWithIndifferentAccess.new YAML.load_file(file_name)[config_name]
 
-    @selenium_config[:name] = config_name
+    @acceptance_config[:name] = config_name
   end
 
   private
@@ -79,17 +79,25 @@ class AcceptanceTest
 
     require "capybara"
     require "capybara/dsl"
-    require 'capybara/rspec'
 
-    RSpec.configure do |config|
-      config.filter_run_excluding :exclude => true
+    # try to load capybara related rspec library
+    begin
+      require 'capybara/rspec'
+    rescue
+      ;
     end
 
-    RSpec.configure do |config|
-      config.include Capybara::DSL
-    end
+    if defined? RSpec
+      RSpec.configure do |config|
+        config.filter_run_excluding :exclude => true
+      end
+
+      RSpec.configure do |config|
+        config.include Capybara::DSL
+      end
 
-    RSpec::Core::ExampleGroup.send :include, Capybara::DSL
+      RSpec::Core::ExampleGroup.send :include, Capybara::DSL
+    end
 
     Capybara.configure do |config|
       config.default_wait_time = ENV['WAIT_TIME'].to_i
@@ -108,13 +116,13 @@ class AcceptanceTest
       when :selenium_with_firebug
         require 'capybara/firebug'
 
-        #Capybara.register_driver :selenium_with_firebug do |app|
-        #  profile = Selenium::WebDriver::Firefox::Profile.new
-        #  profile.enable_firebug
-        #  Capybara::Selenium::Driver.new(app, :browser => :firefox, :profile => profile)
-        #end
+      #Capybara.register_driver :selenium_with_firebug do |app|
+      #  profile = Selenium::WebDriver::Firefox::Profile.new
+      #  profile.enable_firebug
+      #  Capybara::Selenium::Driver.new(app, :browser => :firefox, :profile => profile)
+      #end
 
-        #Selenium::WebDriver::Firefox::Profile.firebug_version = '1.11.2'
+      #Selenium::WebDriver::Firefox::Profile.firebug_version = '1.11.2'
       when :selenium_chrome
         unless Capybara.drivers[:selenium_chrome]
           Capybara.register_driver :selenium_chrome do |app|
@@ -133,10 +141,10 @@ class AcceptanceTest
 
       when :selenium_remote
         unless Capybara.drivers[:selenium_remote]
-          selenium_url = "http://#{@selenium_config[:selenium_host]}:#{@selenium_config[:selenium_port]}/wd/hub"
+          url = "http://#{@acceptance_config[:selenium_host]}:#{@acceptance_config[:selenium_port]}/wd/hub"
 
           Capybara.register_driver :selenium_remote do |app|
-            Capybara::Selenium::Driver.new(app, {:browser => :remote, :url => selenium_url})
+            Capybara::Selenium::Driver.new(app, {:browser => :remote, :url => url})
 
             #profile = Selenium::WebDriver::Firefox::Profile.new
             #profile.enable_firebug
@@ -164,7 +172,7 @@ class AcceptanceTest
       if driver == :selenium_remote
         setup_driver_from_config driver
       else
-        if selenium_config_exist?
+        if acceptance_config_exist?
           setup_driver_from_config driver
         else
           if Capybara.drivers[driver]
@@ -181,10 +189,10 @@ class AcceptanceTest
     end
   end
 
-  def driver context
+  def driver metadata
     driver = ENV['DRIVER'].nil? ? nil : ENV['DRIVER'].to_sym
 
-    driver = context.example.metadata[:driver] if driver.nil?
+    driver = metadata[:driver] if driver.nil?
 
     driver = :webkit if driver.nil?
 
@@ -221,15 +229,14 @@ class AcceptanceTest
     puts full_description + "\n Screenshot: #{screenshot_url}"
   end
 
-  def selenium_config_exist?
-    not @selenium_config.nil? and @selenium_config.size > 0
+  def acceptance_config_exist?
+    not @acceptance_config.nil? and @acceptance_config.size > 0
   end
 
   def setup_driver_from_config driver
-    selenium_app_host = app_host_from_url(@selenium_config[:webapp_url])
-    @app_host = selenium_app_host
+    @app_host = app_host_from_url(@acceptance_config[:webapp_url])
 
-    Rails.env = @selenium_config[:env] if defined? Rails.env
+    Rails.env = @acceptance_config[:env] if defined? Rails.env
 
     Capybara.current_driver = driver
     Capybara.javascript_driver = driver

data/lib/acceptance_test/version.rb

@@ -1,3 +1,3 @@
 class AcceptanceTest
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acceptance_test
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen