acceptance_test 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: ae34aa2cd47d1bbb0ef858917ccf9e96abfb287e
-  data.tar.gz: 74123d56a4ce80ecfb91b7c1fde908c27f26971e
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDgwYTc1YmQxNjhlMmRlOGRlOTk4OWVjYjMxNWU3YmM3ZDJiYWFkNg==
+  data.tar.gz: !binary |-
+    ZTg0MWFkODU2MThlZGM5ZGI5ZTY1NmZjOTQyYzA2ZGRmZDYzZjUyYw==
 SHA512:
-  metadata.gz: a5a59e5fd6d988910c8c186f72020fd57a435ff4f3214657a4ad8246f243ac12f0151642cd00eb2fd3a79d981db815c5bcc358c4304ce7a172531f42fd0cd6f9
-  data.tar.gz: 9b4be35e79cede77d65861eee17214c846c9e931666aba0760118e265d58ade32126e43f099e8c2799f5606703da40820a56b8991ee693d4aa704764fe97fc50
+  metadata.gz: !binary |-
+    MDljZjg0YmFlZmViMzA2MDlmNmUwNTFiZDM5NGM4NWZhMDkzNjdiNjk5ZjRl
+    ZDIzZGZhMzA3MDUxMThlOTdmZmM5MTFmZWNhMGY5MWMzMDY0YjY4MjE0M2Ux
+    YTA4N2MxZDYxYTUyYmJjYzkyMjUyYzdmOWRkNzUyZjE5YWU4ZDA=
+  data.tar.gz: !binary |-
+    NGJiOTAxYWVkOTkxYWYyNzk3YzJkZWNlZmIzYzAyOWQwNDk5NmUxODFiYmRm
+    NzJhYWUyMzEyZjdlZWZmNWY0YjUzM2MzNDlhY2Y2MmM5ZGU0YTQyMmUzNTRj
+    NWQxNTQ5ZDMyZGQ0ZDU2NjcwNmY0OTNmNjViYjhlN2FlODQ1MDM=

data/.ruby-version

@@ -1 +1 @@
-2.1.3
+1.9.3

data/CHANGES

@@ -155,4 +155,8 @@
 
 == Version 1.7.2
 
-* Bug fixes
+* Bug fixes
+
+== Version 1.7.3
+
+* Extending syntax for scenario outline

data/lib/acceptance_test/acceptance_test.rb

@@ -154,4 +154,17 @@ class AcceptanceTest
     ('a'..'z').to_a.shuffle[0, 12].join
   end
 
+  # def self.get_localhost
+  #   orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true  # turn off reverse DNS resolution temporarily
+  #
+  #   UDPSocket.open do |s|
+  #     s.connect '192.168.1.1', 1
+  #     s.addr.last
+  #   end
+  # ensure
+  #   Socket.do_not_reverse_lookup = orig
+  # end
+
+  # ip = `ifconfig | grep 'inet ' | grep -v 127.0.0.1 | cut -d ' ' -f2`.strip
+  # Capybara.app_host = http://#{ip}:#{Capybara.server_port}
 end

data/lib/acceptance_test/gherkin_ext.rb

@@ -26,19 +26,17 @@ class GherkinExt
 
           source.each_line do |line|
             if line =~ /file\s?:/
-              source_path = line.gsub('file:', '').gsub('|', '').strip
+              part1, part2 = line.split(",")
+
+              source_path = part1.gsub('file:', '').gsub('|', '').strip
+              key = part2 ? part2.gsub('key:', '').gsub('|', '').strip : nil
 
               if source_path
                 values = self.data_reader.call(source_path)
 
-                values.each do |row|
-                  new_source += "  |"
+                data = key.nil? ? values : values[key]
 
-                  row.each do |element|
-                    new_source += " #{element} |"
-                  end
-                  new_source += "\n"
-                end
+                new_source += build_data_section data
               end
             else
               new_source += line
@@ -52,6 +50,22 @@ class GherkinExt
           source
         end
       end
+
+      def self.build_data_section values
+        buffer = ""
+
+        values.each do |row|
+          buffer += "  |"
+
+          row.each do |element|
+            buffer += " #{element} |"
+          end
+
+          buffer += "\n"
+        end
+
+        buffer
+      end
     end
   end
 

data/lib/acceptance_test/version.rb

@@ -1,3 +1,3 @@
 class AcceptanceTest
-  VERSION = "1.7.2"
+  VERSION = "1.7.3"
 end

data/spec/data.yml

@@ -0,0 +1,6 @@
+"test1":
+  [
+    ["Capybara", "Hydrochoerus hydrochaeris", "1"],
+    ["Wombat",   "quadrupedal marsupials", "2"],
+    ["Echidna",  "Tachyglossidae", "3"]
+  ]

data/spec/features/search_with_pages.feature

@@ -3,7 +3,6 @@ Feature: Using Wikipedia
   Background: within wikipedia.com context
     Given I am within wikipedia.com
 
-  @selenium
   @search_with_pages
   Scenario: Searching with selenium for a term with submit
 

data/spec/features/{search_with_examples_from_csv.feature → search_with_scenario_outline1.feature}

@@ -3,8 +3,7 @@ Feature: Using Wikipedia
   Background: within wikipedia.com context
     Given I am within wikipedia.com
 
-  @selenium
-  @search_with_examples_from_csv
+  @search_with_scenario_outline
   Scenario Outline: Searching with selenium for a term with submit (embedded data)
 
     Given I am on wikipedia.com
@@ -17,16 +16,3 @@ Feature: Using Wikipedia
     | Capybara | Hydrochoerus hydrochaeris |
     | Wombat   | quadrupedal marsupials    |
     | Echidna  | Tachyglossidae |
-
-  @selenium
-  @search_with_examples_from_csv
-  Scenario Outline: Searching with selenium for a term with submit (external data)
-
-    Given I am on wikipedia.com
-    When I enter word <keyword>
-    And I click submit button
-    Then I should see "<result>"
-
-  Examples:
-    | keyword | result |
-    | file:spec/data.csv ||

data/spec/features/search_with_scenario_outline2.feature

@@ -0,0 +1,16 @@
+Feature: Using Wikipedia
+
+  Background: within wikipedia.com context
+    Given I am within wikipedia.com
+
+  @search_with_scenario_outline
+  Scenario Outline: Searching with selenium for a term with submit (external data)
+
+    Given I am on wikipedia.com
+    When I enter word <keyword>
+    And I click submit button
+    Then I should see "<result>"
+
+  Examples:
+    | keyword | result | something_else |
+    | file:spec/data.csv ||             |

data/spec/features/search_with_scenario_outline3.feature

@@ -0,0 +1,16 @@
+Feature: Using Wikipedia
+
+  Background: within wikipedia.com context
+    Given I am within wikipedia.com
+
+  @search_with_scenario_outline
+  Scenario Outline: Searching with selenium for a term with submit (external data)
+
+    Given I am on wikipedia.com
+    When I enter word <keyword>
+    And I click submit button
+    Then I should see "<result>"
+
+  Examples:
+    | keyword | result |something_else |
+    | file:spec/data.yml, key:test1 || |

data/spec/features/search_with_table.feature

@@ -3,7 +3,6 @@ Feature: Using Wikipedia
   Background: within wikipedia.com context
     Given I am within wikipedia.com
 
-  @selenium
   @search_with_table
   Scenario: Searching with selenium for a term with submit (embedded data)
 

data/spec/support/steps/{search_with_examples_from_csv_steps.rb → search_with_scenario_outline_steps.rb}

@@ -1,10 +1,20 @@
+require 'csv'
+
 # enable external source for gherkin
 
-data_reader = lambda {|source_path| CSV.read(File.expand_path(source_path)) }
+data_reader = lambda do |source_path|
+  ext = File.extname(source_path)
+
+  if ext == '.csv'
+    CSV.read(File.expand_path(source_path))
+  elsif ext == '.yml'
+    YAML.load_file(File.expand_path(source_path))
+  end
+end
 
 AcceptanceTest.instance.enable_external_source data_reader
 
-steps_for :search_with_examples_from_csv do
+steps_for :search_with_scenario_outline do
 
   step "I am within wikipedia.com" do
   end

data/spec/turnip_helper.rb

@@ -19,7 +19,7 @@ AcceptanceTest.instance.configure_turnip 'tmp/report.html'
 
 require 'steps/search_with_drivers_steps'
 require 'steps/search_with_pages_steps'
-require 'steps/search_with_examples_from_csv_steps'
+require 'steps/search_with_scenario_outline_steps'
 require 'steps/search_with_table_steps'
 
 

metadata

@@ -1,62 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: acceptance_test
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gemcutter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: 'Description: simplifies congiguration and run of acceptance tests.'
+description: ! 'Description: simplifies congiguration and run of acceptance tests.'
 email: alexander.shvets@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".idea/.rakeTasks"
-- ".idea/acceptance_test.iml"
-- ".idea/encodings.xml"
-- ".idea/jenkinsSettings.xml"
-- ".idea/misc.xml"
-- ".idea/modules.xml"
-- ".idea/runConfigurations/wikipedia_search__acceptance_test.xml"
-- ".idea/scopes/scope_settings.xml"
-- ".idea/vcs.xml"
-- ".rspec"
-- ".ruby-gemset"
-- ".ruby-version"
+- .gitignore
+- .idea/.rakeTasks
+- .idea/acceptance_test.iml
+- .idea/encodings.xml
+- .idea/jenkinsSettings.xml
+- .idea/misc.xml
+- .idea/modules.xml
+- .idea/runConfigurations/wikipedia_search__acceptance_test.xml
+- .idea/scopes/scope_settings.xml
+- .idea/vcs.xml
+- .rspec
+- .ruby-gemset
+- .ruby-version
 - CHANGES
 - Gemfile
 - Gemfile.lock
@@ -71,7 +71,6 @@ files:
 - features/wikipedia/wikipedia_search_from_csv.feature
 - lib/acceptance_test.rb
 - lib/acceptance_test/acceptance_test.rb
-- lib/acceptance_test/acceptance_test_old.rb
 - lib/acceptance_test/cucumber_ext.rb
 - lib/acceptance_test/driver_manager.rb
 - lib/acceptance_test/gherkin_ext.rb
@@ -84,16 +83,19 @@ files:
 - lib/tasks/rspec.rake
 - spec/acceptance_config.yml
 - spec/data.csv
+- spec/data.yml
 - spec/features/search_with_drivers.feature
-- spec/features/search_with_examples_from_csv.feature
 - spec/features/search_with_pages.feature
+- spec/features/search_with_scenario_outline1.feature
+- spec/features/search_with_scenario_outline2.feature
+- spec/features/search_with_scenario_outline3.feature
 - spec/features/search_with_table.feature
 - spec/support/pages/main_page.rb
 - spec/support/pages/wikipedia_pages.rb
 - spec/support/steps/common_steps.rb
 - spec/support/steps/search_with_drivers_steps.rb
-- spec/support/steps/search_with_examples_from_csv_steps.rb
 - spec/support/steps/search_with_pages_steps.rb
+- spec/support/steps/search_with_scenario_outline_steps.rb
 - spec/support/steps/search_with_table_steps.rb
 - spec/test_helper.rb
 - spec/turnip_helper.rb
@@ -111,12 +113,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -132,16 +134,19 @@ test_files:
 - features/wikipedia/wikipedia_search_from_csv.feature
 - spec/acceptance_config.yml
 - spec/data.csv
+- spec/data.yml
 - spec/features/search_with_drivers.feature
-- spec/features/search_with_examples_from_csv.feature
 - spec/features/search_with_pages.feature
+- spec/features/search_with_scenario_outline1.feature
+- spec/features/search_with_scenario_outline2.feature
+- spec/features/search_with_scenario_outline3.feature
 - spec/features/search_with_table.feature
 - spec/support/pages/main_page.rb
 - spec/support/pages/wikipedia_pages.rb
 - spec/support/steps/common_steps.rb
 - spec/support/steps/search_with_drivers_steps.rb
-- spec/support/steps/search_with_examples_from_csv_steps.rb
 - spec/support/steps/search_with_pages_steps.rb
+- spec/support/steps/search_with_scenario_outline_steps.rb
 - spec/support/steps/search_with_table_steps.rb
 - spec/test_helper.rb
 - spec/turnip_helper.rb

data/lib/acceptance_test/acceptance_test_old.rb

@@ -1,221 +0,0 @@
-require 'uri'
-require 'singleton'
-
-require 'active_support/core_ext/hash'
-
-require 'acceptance_test/driver_manager'
-require 'acceptance_test/gherkin_ext'
-require 'acceptance_test/turnip_ext'
-
-class AcceptanceTestOld
-  include Singleton
-
-  attr_reader :config, :driver_manager
-
-  def initialize
-    @driver_manager = DriverManager.new
-
-    @config = HashWithIndifferentAccess.new
-
-    @config[:browser] = 'firefox'
-    @config[:screenshot_dir] = File.expand_path('tmp')
-  end
-
-  def configure hash={}
-    config.merge!(HashWithIndifferentAccess.new(hash))
-  end
-
-  def setup
-    Capybara.app_host = AcceptanceTest.instance.config[:webapp_url]
-
-    Capybara.configure do |conf|
-      conf.default_wait_time = timeout_in_seconds
-    end
-
-    ENV['WAIT_TIME'] ||= Capybara.default_wait_time.to_s
-
-    Capybara.default_driver = :selenium
-  end
-
-  def teardown
-    Capybara.app_host = nil
-
-    Capybara.configure do |conf|
-      conf.default_wait_time = 5
-    end
-
-    Capybara.default_driver = :rack_test
-  end
-
-  def before_test metadata={}, page=nil
-    setup unless Capybara.app_host
-
-    driver = driver(metadata)
-
-    if driver
-      driver_name = driver_manager.register_driver driver, config[:browser].to_sym, config[:selenium_url]
-
-      if driver_name and Capybara.drivers[driver_name]
-        Capybara.current_driver = driver_name
-        Capybara.javascript_driver = driver_name
-
-        page.instance_variable_set(:@mode, driver_name) if page
-      end
-    end
-  end
-
-  def after_test metadata={}, exception=nil, page=nil
-    driver = driver(metadata)
-
-    if driver and exception and page and not [:webkit].include? driver
-      screenshot_dir = File.expand_path(config[:screenshot_dir])
-
-      FileUtils.mkdir_p screenshot_dir
-
-      screenshot_maker = ScreenshotMaker.new screenshot_dir
-
-      screenshot_maker.make page, metadata
-
-      puts metadata[:full_description]
-      puts "Screenshot: #{screenshot_maker.screenshot_url(metadata)}"
-    end
-
-    Capybara.current_driver = Capybara.default_driver
-    Capybara.javascript_driver = Capybara.default_driver
-  end
-
-  def create_shared_context name
-    throw "rspec library is not available" unless defined? RSpec
-
-    acceptance_test = self
-
-    acceptance_test_lambda = lambda do
-      acceptance_test.configure_rspec self
-    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 driver_manager.supported_drivers.include? tag
-        metadata[:driver] = tag
-      end
-    end
-
-    metadata
-  end
-
-  def extend_turnip
-    shared_context_name = "#{random_name}AcceptanceTest"
-
-    create_shared_context shared_context_name
-
-    TurnipExt.shared_context_with_turnip shared_context_name
-  end
-
-  def enable_external_source data_reader
-    GherkinExt.enable_external_source data_reader
-  end
-
-  def configure_turnip_formatter report_name
-    require 'turnip/rspec'
-    require 'turnip_formatter'
-    require 'turnip/capybara'
-    require 'gnawrnip'
-
-    RSpec.configure do |config|
-      config.add_formatter RSpecTurnipFormatter, report_name
-    end
-
-    Gnawrnip.configure do |c|
-      c.make_animation = true
-      c.max_frame_size = 1024 # pixel
-    end
-  end
-
-  def driver metadata
-    driver = ENV['DRIVER'].nil? ? nil : ENV['DRIVER'].to_sym
-
-    driver = config[:driver].to_sym if driver.nil? and config[:driver]
-
-    driver = metadata[:driver] if driver.nil?
-
-    driver_manager.supported_drivers.each do |supported_driver|
-      driver = supported_driver if metadata[supported_driver]
-      break if driver
-    end
-
-    driver = :webkit if driver.nil?
-
-    driver
-  end
-
-  # def selenium_driver? driver
-  #   driver.to_s =~ /selenium/
-  # end
-
-  def configure_rspec object=nil
-    acceptance_test = self
-
-    if object
-      if object.kind_of? RSpec::Core::Example
-        rspec_conf = object.example_group.parent_groups.last
-      else
-        rspec_conf = object
-      end
-    else
-      rspec_conf = RSpec.configuration
-    end
-
-    rspec_conf.around(:each) do |example|
-      acceptance_test.before_test(example.metadata, page)
-
-      example.run
-
-      acceptance_test.after_test(example.metadata, example.exception, page)
-    end
-  end
-
-  private
-
-  def timeout_in_seconds
-    if ENV['WAIT_TIME']
-      ENV['WAIT_TIME'].to_i
-    else
-      if config[:timeout_in_seconds]
-        config[:timeout_in_seconds]
-      else
-        Capybara.default_wait_time.to_s
-      end
-    end
-  end
-
-  def random_name
-    ('a'..'z').to_a.shuffle[0, 12].join
-  end
-
-  # def self.get_localhost
-  #   orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true  # turn off reverse DNS resolution temporarily
-  #
-  #   UDPSocket.open do |s|
-  #     s.connect '192.168.1.1', 1
-  #     s.addr.last
-  #   end
-  # ensure
-  #   Socket.do_not_reverse_lookup = orig
-  # end
-
-  # ip = `ifconfig | grep 'inet ' | grep -v 127.0.0.1 | cut -d ' ' -f2`.strip
-  # Capybara.app_host = http://#{ip}:#{Capybara.server_port}
-end