acceptance_test 1.3.1 → 1.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTk3NTJiZjc3NThmZjhmMzFlMzBlYTVkMDMwYTQyZDUwMjYxNzU0Mw==
+    YjA5NTU3MjYwOTRiYzE2ZTI5ZGZmYjljZWFlZjgyYzBlY2Y3OGE3ZQ==
   data.tar.gz: !binary |-
-    ZTE5ZGYyMTVkNDg4ZTg2ZTQ2NWYyMzZiMDQxOWY0ZDQwY2NhMzY2Mw==
+    YTBkZDU4N2M0OGIyMzFiMGQxYzA4OTFhMTBlOWZkNDEwNjk2MWY5ZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTVjNzVhMGEwZDgyY2EwMzRkMDA3M2FjY2Y2YzkwMmMyYmIzZTYzMTE0NmM1
-    MmUzZjhhZDJjYjY1MWEyMzNmOWQ2ZWFiMGRkY2RiMjUwOGI5YmM3MWY2MDI1
-    YWQ4ZDBjOGZjYTM2ZDI1OTgwMjI2YjAyNjVkNjQ2OWM2NGY4M2E=
+    MWE4ZTRlNzQwODUyNTIyNDc3N2UzMWI5NTkyOGU5NTg2YzhiZDFlNzVjMmVi
+    YzhhZTM5NTNhZWQ4YzI4MWJkNWNkYjViZGZmNThlMWFmY2U3MjYyMDBiZDY4
+    ODZjYTUyYzc1M2YzZTFhOWJhNDNlZWY3MDkyOTNhZTVhOTQxOGE=
   data.tar.gz: !binary |-
-    MGNlYjQwZmZhMDNiNDdlY2FlOTJhZmQzNTFiZjkwOTRiMTVkNGRiMTgzMTNl
-    NmY0OTY2M2Q4MjUwMWNlODA1MWQwYzFjMjFkMzYxMDRmNGU1N2U0ZWJiZDc1
-    M2E4YzYwZmEzMmIwNGEyZWNmYTFkNmI4MjBlMGJmMWQ4YTM5YzM=
+    YTk1YjM3Y2YxNjI5OTU0NTc4MDE0ODVhNzZkYjQ3NTA4MDQyNmJlYTVhYmEx
+    NWRiY2EzZTlkZjIzMzNhMjk1NDI1MTViZWI0MTNlYTI0ODhjY2FkMWU1ZWI3
+    NWFmYTdhNTJiNzNmOTZkNzUyNGM5MDhmZTZjNzI2ZmRmMmNmZDQ=

data/CHANGES

@@ -72,3 +72,7 @@
 == Version 1.3.1
 
 * Bug fix
+
+== Version 1.4.0
+
+* Refactor code to make it simple

data/lib/acceptance_test.rb

@@ -1,4 +1,3 @@
 require 'acceptance_test/version'
-require 'acceptance_test/acceptance_shared_context'
 require 'acceptance_test/acceptance_test'
 require 'acceptance_test/screenshot_maker'

data/lib/acceptance_test/acceptance_test.rb

@@ -29,21 +29,21 @@ class AcceptanceTest
       select_driver driver
     end
 
+    puts "Current Driver    : #{Capybara.current_driver}"
+
     setup_app_host app_host
   end
 
-  def after page, exception=nil, metadata={}
-    if exception
+  def after metadata={}, exception=nil, page=nil
       driver = driver(metadata)
 
-      if driver and not [:webkit].include? driver
-        screenshot_maker = ScreenshotMaker.new screenshot_dir
+    if driver and exception and page and not [:webkit].include? driver
+      screenshot_maker = ScreenshotMaker.new screenshot_dir
 
-        screenshot_maker.make page, metadata
+      screenshot_maker.make page, metadata
 
-        puts metadata[:full_description]
-        puts "Screenshot: #{screenshot_maker.screenshot_url(metadata)}"
-      end
+      puts metadata[:full_description]
+      puts "Screenshot: #{screenshot_maker.screenshot_url(metadata)}"
     end
 
     Capybara.current_driver = Capybara.default_driver
@@ -63,10 +63,14 @@ class AcceptanceTest
     driver.to_s =~ /selenium/
   end
 
+  def self.supported_drivers
+    [:webkit, :selenium, :poltergeist, :selenium_remote]
+  end
+
   private
 
   def default_app_host
-    "http://#{AcceptanceTestHelper.get_localhost}:3000"
+    "http://#{AcceptanceTestHelper.instance.get_localhost}:3000"
   end
 
   def configure

data/lib/acceptance_test/acceptance_test_helper.rb

@@ -1,6 +1,83 @@
+require 'yaml'
+require 'singleton'
+require 'active_support/core_ext/hash'
+
 class AcceptanceTestHelper
+  include Singleton
+
+  def create_acceptance_test project_root, config_name, screenshot_dir
+    Capybara.configure do |config|
+      config.match = :first
+
+      config.ignore_hidden_elements = false
+    end
+
+    project_root = File.expand_path(project_root.to_s)
+
+    config = HashWithIndifferentAccess.new(YAML.load_file(config_name))
+
+    system "mkdir -p #{screenshot_dir}"
+
+    acceptance_test = AcceptanceTest.new project_root, config, screenshot_dir
+
+    ENV['ASSET_HOST'] = acceptance_test.app_host
+
+    puts "Application URL   : #{config[:webapp_url]}"
+    puts "Selenium URL      : #{config[:selenium_url]}" if config[:selenium_url]
+    puts "Default Wait Time : #{Capybara.default_wait_time}"
+
+    acceptance_test
+  end
+
+  def create_shared_context acceptance_test, name
+    throw "rspec library is not available" unless defined? RSpec
+
+    acceptance_test_lambda = lambda do
+      attr_reader :acceptance_test
+
+      before :all do
+        @acceptance_test = acceptance_test
+      end
+
+      before do
+        metadata = RSpec.current_example.metadata
+
+        acceptance_test.before metadata
+      end
+
+      after do
+        metadata = RSpec.current_example.metadata
+
+        acceptance_test.after metadata, RSpec.current_example.exception, page
+
+        self.reset_session!
+      end
+    end
+
+    RSpec.shared_context name do
+      self.define_singleton_method(:include_context, acceptance_test_lambda)
+
+      include_context
+    end
+  end
+
+  def metadata_from_scenario scenario
+    tags = scenario.source_tag_names.collect { |a| a.gsub("@", '') }
+
+    metadata = {}
+
+    if tags.size > 0
+      tag = tags.first.to_sym
+
+      if AcceptanceTest.supported_drivers.include? tag
+        metadata[:driver] = tag
+      end
+    end
+
+    metadata
+  end
 
-  def self.get_localhost
+  def get_localhost
     orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true  # turn off reverse DNS resolution temporarily
 
     UDPSocket.open do |s|

data/lib/acceptance_test/version.rb

@@ -1,3 +1,3 @@
 class AcceptanceTest
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

data/spec/features/google_search_spec.rb

@@ -1,7 +1,7 @@
-require 'acceptance_test'
+require File.expand_path("spec/features/spec_helper")
 
 RSpec.describe 'Google Search' do
-  include_context "AcceptanceTest"
+  include_context "GoogleAcceptanceTest"
 
   before :all do
     acceptance_test.app_host = "http://www.google.com"
@@ -19,7 +19,7 @@ RSpec.describe 'Google Search' do
 
     find("#gbqfbw button").click
 
-    all(:xpath, "//li[@class='g']/h3/a").each { |a| puts a[:href] }
+    # all(:xpath, "//li[@class='g']/h3/a").each { |a| puts a[:href] }
   end
 
   it "uses webkit driver", driver: :webkit do
@@ -34,7 +34,7 @@ RSpec.describe 'Google Search' do
 
     button.click
 
-    all(:xpath, "//li[@class='g']/h3/a").each { |a| puts a[:href] }
+    #all(:xpath, "//li[@class='g']/h3/a").each { |a| puts a[:href] }
   end
 
   it "uses poltergeist driver", driver: :poltergeist do

data/spec/features/spec_helper.rb

@@ -0,0 +1,9 @@
+require 'acceptance_test'
+
+config_name = File.expand_path("spec/features/acceptance_config.yml")
+
+helper = AcceptanceTestHelper.instance
+
+acceptance_test = helper.create_acceptance_test ".", config_name, "tmp"
+
+helper.create_shared_context acceptance_test, "GoogleAcceptanceTest"

data/spec/features/with_selenium_conf_spec.rb

@@ -1,35 +1,7 @@
-require 'acceptance_test'
-require 'yaml'
+File.expand_path("spec/features/spec_helper")
 
 RSpec.describe 'Google Search' do
-  include_context "AcceptanceTest"
-
-  before :all do
-    #acceptance_config_file = "spec/features/acceptance_config.yml"
-
-    # acceptance_test.acceptance_config = YAML.load_file(acceptance_config_file)
-    #
-    # acceptance_config = acceptance_test.acceptance_config
-
-    # env = acceptance_config[:env]
-    #
-    # puts "\nEnvironment: #{@acceptance_config[:env]}" if env
-    # puts "Application: #{@acceptance_config[:webapp_url]}"
-    #
-    # driver = acceptance_test.driver(metadata)
-    #
-    # if acceptance_test.selenium_driver?(driver)
-    #   selenium_host = acceptance_config[:selenium_host]
-    #   selenium_port = acceptance_config[:selenium_port]
-    #
-    #   puts "Selenium: #{selenium_host}:#{selenium_port}"
-    # end
-  end
-
-  before do
-    # puts "Using driver: #{Capybara.current_driver}."
-    # puts "Default wait time: #{Capybara.default_wait_time}."
-  end
+  include_context "GoogleAcceptanceTest"
 
   it "uses selenium driver", driver: :selenium_remote do
     visit('/')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acceptance_test
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen
@@ -64,14 +64,13 @@ files:
 - acceptance_test.gemspec
 - acceptance_test.gemspec.erb
 - lib/acceptance_test.rb
-- lib/acceptance_test/acceptance_shared_context.rb
 - lib/acceptance_test/acceptance_test.rb
-- lib/acceptance_test/acceptance_test_builder.rb
 - lib/acceptance_test/acceptance_test_helper.rb
 - lib/acceptance_test/screenshot_maker.rb
 - lib/acceptance_test/version.rb
 - spec/features/acceptance_config.yml
 - spec/features/google_search_spec.rb
+- spec/features/spec_helper.rb
 - spec/features/with_selenium_conf_spec.rb
 homepage: http://github.com/shvets/acceptance_test
 licenses:
@@ -100,4 +99,5 @@ summary: Simplifies congiguration and run of acceptance tests.
 test_files:
 - spec/features/acceptance_config.yml
 - spec/features/google_search_spec.rb
+- spec/features/spec_helper.rb
 - spec/features/with_selenium_conf_spec.rb

data/lib/acceptance_test/acceptance_shared_context.rb

@@ -1,36 +0,0 @@
-if defined? RSpec
-  require 'acceptance_test/acceptance_test_builder'
-
-  acceptance_test_lambda = lambda do
-    attr_reader :acceptance_test
-
-    before :all do
-      config_name = File.expand_path("spec/features/acceptance_config.yml")
-
-      @acceptance_test = AcceptanceTestBuilder.instance.create ".", config_name, "tmp"
-    end
-
-    before do
-      metadata = RSpec.current_example.metadata
-
-      acceptance_test.before metadata
-    end
-
-    after do
-      metadata = RSpec.current_example.metadata
-
-      acceptance_test.after page, RSpec.current_example.exception, metadata
-
-      self.reset_session!
-    end
-  end
-
-  RSpec.shared_context "AcceptanceTest" do
-    self.define_singleton_method(:include_context, acceptance_test_lambda)
-
-    include_context
-  end
-end
-
-
-

data/lib/acceptance_test/acceptance_test_builder.rb

@@ -1,37 +0,0 @@
-require 'yaml'
-require 'singleton'
-require 'active_support/core_ext/hash'
-
-class AcceptanceTestBuilder
-  include Singleton
-
-  def create project_root, config_name, screenshot_dir
-    Capybara.default_driver = :selenium
-
-    ENV['DRIVER'] = 'selenium'
-
-    Capybara.configure do |config|
-      config.match = :first
-
-      config.ignore_hidden_elements = false
-    end
-
-    project_root = File.expand_path(project_root.to_s)
-
-    config = HashWithIndifferentAccess.new(YAML.load_file(config_name))
-
-    system "mkdir -p #{screenshot_dir}"
-
-    acceptance_test = AcceptanceTest.new project_root, config, screenshot_dir
-
-    ENV['ASSET_HOST'] = acceptance_test.app_host
-
-    puts "Application URL   : #{config[:webapp_url]}"
-    puts "Selenium URL      : #{config[:selenium_url]}" if config[:selenium_url]
-    puts "ENV['DRIVER']     : #{ENV['DRIVER']}" if ENV['DRIVER']
-    puts "Default Wait Time : #{Capybara.default_wait_time}"
-
-    acceptance_test
-  end
-
-end