acceptance_test 1.5.4 → 1.5.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGRkNjZjNDQ4MDEyOGU2YTc3MGU0MzQ3OWI4M2ZhYmVkZGQyNjBiOQ==
+    MzIxZjhmY2Y3ODZhODMyOWYwNGJmOTVmMWVkZjI0MjkxN2UyMTU0Mw==
   data.tar.gz: !binary |-
-    OTdkOTFiMzJkOTc3YTMwMjQ4YTY4MWU5YWUwNzNlNDMzODc0ODk4MQ==
+    OTQ3YmY0MGU2Y2IyNTViNTMxNWNlZGJlZTJiYTEyODcxNWI4MjNmNQ==
 SHA512:
   metadata.gz: !binary |-
-    N2EyMTZlM2U0MmY4NTU3Y2ZjNWQ1OGVjYWM0ZjFjMDMyZDJhYTAwNjMzOWFm
-    MzdmM2EzZGU2MTE4OTMxZDUyYTNjZjlkMjQ4Mzk1NWZhMzQ1ZGZiNWVkNzk2
-    N2U2NWRhNTM1Nzk5MTQ2NTEyMmUzMDAwNmEyYTNmZWVlMzdlMGE=
+    OWE3ZGNkMTA2YTVhYzc0NDc0Y2YyODEzODQ0ZmQ2NmI5NzUwYTMyNjI1NGE4
+    YmJjMTBmNTcwNjNkMjMyYTY3N2Y0OTQ5MjU5ZTU4NmFlMmExODIzMzQ2YzBi
+    M2Q5NmJhYjE4NzhiMmU1OTJhZDBmZjc4NTk5YTFjYTEwOWI2NGY=
   data.tar.gz: !binary |-
-    ZTA5NTUzNmViMTYyMzc4ZmEyZjIwYzhhYTM4YjQ3MGEyMjY5MmY2Y2ZmYWU0
-    YTE0OWZiMTczMWQzNzJmMTM2NDhhYzk4N2QwMzJkNTVlMzVmYjM0MWNjZDdl
-    MDRlMGQ5YmQyMGNkNmRjOGUzMzU2Y2YzZjI5ODU4N2E3YWMwOWU=
+    Yzc0ZWI0ZWVmNjRkOTkyZTAwN2E2MWU5ZTRlYmFhNDJkMWY4MjE2MGQ2YzJh
+    MWQ0NWU2ODQzOGUxNTA1NjBiYjc5YTA3OWFhYjUyZTljZDI5OWY0ZTM4OTli
+    NWIyN2FhNDc5ZjVhODZjOWE0NzkzNWRjZjRjMTkzN2U1NzVkM2E=

data/CHANGES

@@ -131,4 +131,8 @@
 
 == Version 1.5.4
 
+* Bug fixes
+
+== Version 1.5.5
+
 * Bug fixes

data/lib/acceptance_test/acceptance_test.rb

@@ -6,6 +6,9 @@ require 'capybara'
 require "capybara/dsl"
 require 'active_support/core_ext/hash'
 
+require 'acceptance_test/gherkin_helper'
+require 'acceptance_test/turnip_helper'
+
 class AcceptanceTest
   include Singleton
 
@@ -20,6 +23,8 @@ class AcceptanceTest
       config[:screenshot_dir] = File.expand_path('tmp')
     end
 
+    set_app_host
+
     Capybara.configure do |conf|
       conf.default_wait_time = timeout_in_seconds
       conf.match = :first
@@ -47,7 +52,19 @@ class AcceptanceTest
       ;
     end
 
-    Capybara.app_host = config[:webapp_url]
+    Capybara.default_driver = :selenium
+  end
+
+  def set_app_host
+    Capybara.app_host = AcceptanceTest.instance.config[:webapp_url]
+  end
+
+  def enable_external_source data_reader
+    GherkinHelper.instance.enable_external_source data_reader
+  end
+
+  def extend_turnip
+    TurnipHelper.instance.extend_turnip
   end
 
   def before metadata={}
@@ -134,10 +151,18 @@ class AcceptanceTest
     [:webkit, :selenium, :poltergeist, :selenium_remote]
   end
 
-  def configure_rspec rspec_conf=nil
+  def configure_rspec object=nil
     acceptance_test = self
 
-    rspec_conf = RSpec.configuration unless rspec_conf
+    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(example.metadata)

data/lib/acceptance_test/turnip_helper.rb

@@ -0,0 +1,76 @@
+require 'singleton'
+
+require 'turnip/define'
+
+class TurnipHelper
+  include Singleton
+
+  def extend_turnip
+    turnip_define = Turnip::Define
+
+    turnip_define.class_eval do
+      def before &block
+        send(:define_method, "before",  &block) if block
+      end
+
+      def after &block
+        send(:define_method, "after",  &block) if block
+      end
+    end
+
+    turnip_rspec_execute = Turnip::RSpec::Execute
+
+    turnip_rspec_execute.class_eval do
+      def run_before rspec_root
+        self.class.send(:define_method, :rspec_root, lambda { rspec_root })
+
+        before
+      end
+
+      def run_after rspec_root
+        self.class.send(:define_method, :rspec_root, lambda { rspec_root })
+
+        after
+      end
+    end
+
+    turnip_rspec = Turnip::RSpec
+
+    turnip_rspec.class_eval do
+      class << self
+        def run(feature_file)
+          Turnip::Builder.build(feature_file).features.each do |feature|
+            ::RSpec.describe feature.name, feature.metadata_hash do
+              rspec_root = self
+
+              before do
+                run_before rspec_root
+                example = Turnip::RSpec.fetch_current_example(self)
+                # This is kind of a hack, but it will make RSpec throw way nicer exceptions
+                example.metadata[:file_path] ||= feature_file
+
+                feature.backgrounds.map(&:steps).flatten.each do |step|
+                  run_step(feature_file, step)
+                end
+              end
+              feature.scenarios.each do |scenario|
+                instance_eval <<-EOS, feature_file, scenario.line
+              describe scenario.name, scenario.metadata_hash do it(scenario.steps.map(&:to_s).join(' -> ')) do
+                  scenario.steps.each do |step|
+                    run_step(feature_file, step)
+                  end
+                end
+              end
+                EOS
+              end
+              after do
+                run_after rspec_root
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+end

data/lib/acceptance_test/version.rb

@@ -1,3 +1,3 @@
 class AcceptanceTest
-  VERSION = "1.5.4"
+  VERSION = "1.5.5"
 end

data/spec/features/data.csv

@@ -1,3 +1,3 @@
-Capybara
-Wombat
-Echidna
+Capybara,   Hydrochoerus hydrochaeris
+Wombat,     quadrupedal marsupials
+Echidna,    Tachyglossidae

data/spec/features/{wikipedia_search.feature → search_with_drivers.feature}

@@ -4,28 +4,28 @@ Feature: Using Wikipedia
     Given I am within wikipedia.com
 
   @selenium
-  @wikipedia
+  @search_with_drivers
   Scenario: Searching with selenium for a term with submit
 
     Given I am on wikipedia.com
     When I enter word "Capybara"
     And I click submit button
-    Then I should see results: "Capybara"
+    Then I should see "Capybara"
 
   @webkit
-  @wikipedia
+  @search_with_drivers
   Scenario: Searching with selenium for a term with submit
 
     Given I am on wikipedia.com
     When I enter word "Capybara"
     And I click submit button
-    Then I should see results: "Capybara"
+    Then I should see "Capybara"
 
   @poltergeist
-  @wikipedia
+  @search_with_drivers
   Scenario: Searching with selenium for a term with submit
 
     Given I am on wikipedia.com
     When I enter word "Capybara"
     And I click submit button
-    Then I should see results: "Capybara"
+    Then I should see "Capybara"

data/spec/features/search_with_examples_from_csv.feature

@@ -0,0 +1,32 @@
+Feature: Using Wikipedia
+
+  Background: within wikipedia.com context
+    Given I am within wikipedia.com
+
+  @selenium
+  @search_with_examples_from_csv
+  Scenario Outline: Searching with selenium for a term with submit (embedded 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 |
+    | 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/features/data.csv ||

data/spec/features/search_with_table.feature

@@ -0,0 +1,20 @@
+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)
+
+    Given I am on wikipedia.com
+    And I have the following data:
+      | key     | value    |
+      | keyword | Capybara |
+      | result  | Hydrochoerus hydrochaeris |
+    Then "keyword" should be "Capybara"
+    And "result" should be "Hydrochoerus hydrochaeris"
+
+    When I enter word <keyword>
+    And I click submit button
+    Then I should see <result>

data/spec/features/steps/common_steps.rb

@@ -0,0 +1,5 @@
+module CommonSteps
+  step "I should see :text" do |text|
+    expect(page).to have_content text
+  end
+end

data/spec/features/steps/search_with_drivers_steps.rb

@@ -0,0 +1,39 @@
+require 'features/steps/common_steps'
+
+RSpec.configure do |config|
+  config.before(:search_with_drivers => true) do |example|
+    AcceptanceTest.instance.configure_rspec example
+  end
+end
+
+steps_for :search_with_drivers do
+  include CommonSteps
+
+  # before do
+  #   AcceptanceTest.instance.configure_rspec rspec_root
+  #
+  # end
+  #
+  # after do
+  #   puts "after"
+  # end
+
+  step "I am within wikipedia.com" do
+    puts Capybara.current_driver
+
+    AcceptanceTest.instance.set_app_host
+  end
+
+  step "I am on wikipedia.com" do
+    visit('/')
+  end
+
+  step "I enter word :word" do |word|
+    fill_in "searchInput", :with => word
+  end
+
+  step "I click submit button" do
+    find(".formBtn", match: :first).click
+  end
+
+end

data/spec/features/steps/{wikipedia_steps.rb → search_with_examples_from_csv_steps.rb}

@@ -1,7 +1,7 @@
-module WikipediaSteps
+steps_for :search_with_examples_from_csv do
 
   step "I am within wikipedia.com" do
-    self.class.include_context "WikipediaAcceptanceTest"
+    self.class.include_context "SearchWithExamplesFromCsvAcceptanceTest"
   end
 
   step "I am on wikipedia.com" do
@@ -16,7 +16,7 @@ module WikipediaSteps
     find(".formBtn", match: :first).click
   end
 
-  step "I should see results: :content" do |text|
+  step "I should see :text" do |text|
     expect(page).to have_content text
   end
 end

data/spec/features/steps/search_with_table_steps.rb

@@ -0,0 +1,38 @@
+steps_for :search_with_table do
+  step "I am within wikipedia.com" do
+    self.class.include_context "SearchWithTableAcceptanceTest"
+  end
+
+  step "I am on wikipedia.com" do
+    visit('/')
+  end
+
+  step "I have the following data:" do |table|
+    @test_data = {}
+
+    table.hashes.each do |hash|
+      @test_data[hash['key']] = hash['value']
+    end
+  end
+
+  step ":key should be :value" do |key, value|
+    expect(@test_data[key]).to eq value
+  end
+
+  step "I should see <:key>" do |key|
+    expect(page).to have_content @test_data[key]
+  end
+
+  step "I enter word <:key>" do |key|
+    fill_in "searchInput", :with => @test_data[key]
+  end
+
+  step "I click submit button" do
+    find(".formBtn", match: :first).click
+  end
+
+  step "I should see :text" do |text|
+    expect(page).to have_content text
+  end
+
+end

data/spec/turnip_helper.rb

@@ -2,18 +2,27 @@ require 'yaml'
 require 'csv'
 require 'active_support/core_ext/hash'
 
-require 'acceptance_test/acceptance_test_helper'
+require 'acceptance_test'
 
-helper = AcceptanceTestHelper.instance
+acceptance_test = AcceptanceTest.instance
+
+# enable external source for gherkin
 
 data_reader = lambda {|source_path| CSV.read(File.expand_path(source_path)) }
-helper.enable_external_source data_reader # enable external source for gherkin
 
-helper.register_turnip_steps 'features/steps/wikipedia_steps',
-                             'WikipediaSteps', :wikipedia, "WikipediaAcceptanceTest"
+acceptance_test.enable_external_source data_reader
+
+# acceptance_test.extend_turnip
+
+require  'features/steps/search_with_drivers_steps'
+require  'features/steps/search_with_examples_from_csv_steps'
+require  'features/steps/search_with_table_steps'
+
+AcceptanceTest.instance.create_shared_context "SearchWithDriversAcceptanceTest"
+AcceptanceTest.instance.create_shared_context "SearchWithExamplesFromCsvAcceptanceTest"
+AcceptanceTest.instance.create_shared_context "SearchWithTableAcceptanceTest"
 
 config_name = File.expand_path("spec/acceptance_config.yml")
 config = HashWithIndifferentAccess.new(YAML.load_file(config_name))
 
-helper.configure config
-
+acceptance_test.configure config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acceptance_test
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen
@@ -71,18 +71,21 @@ files:
 - features/wikipedia/wikipedia_search_from_csv.feature
 - lib/acceptance_test.rb
 - lib/acceptance_test/acceptance_test.rb
-- lib/acceptance_test/acceptance_test_helper.rb
 - lib/acceptance_test/gherkin_helper.rb
 - lib/acceptance_test/page.rb
 - lib/acceptance_test/page_set.rb
 - lib/acceptance_test/screenshot_maker.rb
+- lib/acceptance_test/turnip_helper.rb
 - lib/acceptance_test/version.rb
 - spec/acceptance_config.yml
 - spec/features/data.csv
-- spec/features/steps/hook.rb
-- spec/features/steps/wikipedia_steps.rb
-- spec/features/wikipedia_search.feature
-- spec/features/wikipedia_search_from_csv.feature
+- spec/features/search_with_drivers.feature
+- spec/features/search_with_examples_from_csv.feature
+- spec/features/search_with_table.feature
+- spec/features/steps/common_steps.rb
+- spec/features/steps/search_with_drivers_steps.rb
+- spec/features/steps/search_with_examples_from_csv_steps.rb
+- spec/features/steps/search_with_table_steps.rb
 - spec/support/wikipedia/main_page.rb
 - spec/support/wikipedia/wikipedia_page_set.rb
 - spec/turnip_helper.rb
@@ -122,10 +125,13 @@ test_files:
 - features/wikipedia/wikipedia_search_from_csv.feature
 - spec/acceptance_config.yml
 - spec/features/data.csv
-- spec/features/steps/hook.rb
-- spec/features/steps/wikipedia_steps.rb
-- spec/features/wikipedia_search.feature
-- spec/features/wikipedia_search_from_csv.feature
+- spec/features/search_with_drivers.feature
+- spec/features/search_with_examples_from_csv.feature
+- spec/features/search_with_table.feature
+- spec/features/steps/common_steps.rb
+- spec/features/steps/search_with_drivers_steps.rb
+- spec/features/steps/search_with_examples_from_csv_steps.rb
+- spec/features/steps/search_with_table_steps.rb
 - spec/support/wikipedia/main_page.rb
 - spec/support/wikipedia/wikipedia_page_set.rb
 - spec/turnip_helper.rb

data/lib/acceptance_test/acceptance_test_helper.rb

@@ -1,35 +0,0 @@
-require 'singleton'
-require 'turnip/capybara'
-require 'turnip/rspec'
-
-require 'acceptance_test'
-require 'acceptance_test/gherkin_helper'
-
-class AcceptanceTestHelper
-  include Singleton
-
-  def initialize
-    RSpec.configure do |config|
-      config.include Capybara::DSL
-    end
-  end
-
-  def configure config
-    AcceptanceTest.instance.configure config
-  end
-
-  def enable_external_source data_reader
-    GherkinHelper.instance.enable_external_source data_reader
-  end
-
-  def register_turnip_steps path, class_name, tag, shared_group
-    require path
-
-    RSpec.configure do |config|
-      config.include class_name.constantize, tag => true
-    end
-
-    AcceptanceTest.instance.create_shared_context shared_group
-  end
-
-end

data/spec/features/steps/hook.rb

@@ -1,89 +0,0 @@
-require 'turnip/define'
-
-# @acceptance_test = AcceptanceTest.new
-#
-# singleton_class.send :attr_reader, :acceptance_test
-#
-# step "I am within wikipedia.com" do
-#   config_name = File.expand_path("spec/acceptance_config.yml")
-#   config = HashWithIndifferentAccess.new(YAML.load_file(config_name))
-#
-#   WikipediaSteps.acceptance_test.configure config
-# end
-# attr_reader :acceptance_test
-
-# before do
-#   p "before"
-#   acceptance_test = AcceptanceTest.new true, rspec_scope
-#
-#   config_name = File.expand_path("spec/acceptance_config.yml")
-#   config = HashWithIndifferentAccess.new(YAML.load_file(config_name))
-#
-#   acceptance_test.configure config
-# end
-#
-# after do
-#   p "after"
-# end
-
-module Turnip
-  module Define
-    def before &block
-      send(:define_method, "before",  &block) if block
-    end
-
-    def after &block
-      send(:define_method, "after",  &block) if block
-    end
-  end
-end
-
-module Turnip
-  module RSpec
-    module Execute
-      def run_before rspec_scope
-        self.class.send(:define_method, :rspec_scope, lambda { rspec_scope })
-
-        before
-      end
-
-      def run_after
-        after
-      end
-    end
-
-    class << self
-      def run(feature_file)
-        Turnip::Builder.build(feature_file).features.each do |feature|
-          ::RSpec.describe feature.name, feature.metadata_hash do
-            rspec_scope = self
-            before do
-              run_before rspec_scope
-              example = Turnip::RSpec.fetch_current_example(self)
-              # This is kind of a hack, but it will make RSpec throw way nicer exceptions
-              example.metadata[:file_path] ||= feature_file
-
-              feature.backgrounds.map(&:steps).flatten.each do |step|
-                run_step(feature_file, step)
-              end
-            end
-            feature.scenarios.each do |scenario|
-              instance_eval <<-EOS, feature_file, scenario.line
-              describe scenario.name, scenario.metadata_hash do it(scenario.steps.map(&:to_s).join(' -> ')) do
-                  scenario.steps.each do |step|
-                    run_step(feature_file, step)
-                  end
-                end
-              end
-              EOS
-            end
-            after do
-              run_after
-            end
-          end
-        end
-      end
-    end
-
-  end
-end

data/spec/features/wikipedia_search_from_csv.feature

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