acceptance_test 1.5.5 → 1.6.0

data/spec/{features → support}/steps/search_with_table_steps.rb

@@ -1,6 +1,6 @@
 steps_for :search_with_table do
   step "I am within wikipedia.com" do
-    self.class.include_context "SearchWithTableAcceptanceTest"
+    AcceptanceTest.instance.setup
   end
 
   step "I am on wikipedia.com" do

data/spec/test_helper.rb

@@ -0,0 +1 @@
+$: << File.expand_path('spec/support')

data/spec/turnip_helper.rb

@@ -4,6 +4,8 @@ require 'active_support/core_ext/hash'
 
 require 'acceptance_test'
 
+require 'test_helper'
+
 acceptance_test = AcceptanceTest.instance
 
 # enable external source for gherkin
@@ -12,17 +14,14 @@ data_reader = lambda {|source_path| CSV.read(File.expand_path(source_path)) }
 
 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"
+require  'steps/search_with_drivers_steps'
+require  'steps/search_with_pages_steps'
+require  'steps/search_with_examples_from_csv_steps'
+require  'steps/search_with_table_steps'
 
 config_name = File.expand_path("spec/acceptance_config.yml")
 config = HashWithIndifferentAccess.new(YAML.load_file(config_name))
 
 acceptance_test.configure config
+
+acceptance_test.extend_turnip

data/spec/wikipedia_search_spec.rb

@@ -7,10 +7,15 @@ acceptance_test.configure({webapp_url: "http://www.wikipedia.org", timeout_in_se
 RSpec.describe 'Wikipedia Search' do
 
   before do
+    acceptance_test.setup
     puts "Using driver: #{Capybara.current_driver}."
     puts "Default wait time: #{Capybara.default_wait_time}."
   end
 
+  after do
+    acceptance_test.teardown
+  end
+
   it "uses selenium driver", driver: :selenium, exclude: false do
     visit('/')
 

data/spec/wikipedia_search_with_pages_spec.rb

@@ -1,16 +1,16 @@
+require 'test_helper'
+
 require 'acceptance_test'
 
 acceptance_test = AcceptanceTest.instance
-acceptance_test.configure_rspec
 acceptance_test.configure({webapp_url: "http://www.wikipedia.org", timeout_in_seconds: 10})
+acceptance_test.configure_rspec
 
-$: << File.expand_path('spec/support')
-
-require 'wikipedia/wikipedia_page_set'
+require 'pages/wikipedia_pages'
 
 RSpec.describe 'Wikipedia Search' do
 
-  let(:page_set) { WikipediaPageSet.new(page) }
+  let(:page_set) { WikipediaPages.new(page) }
 
   before do
     puts "Using driver: #{Capybara.current_driver}."
@@ -19,11 +19,11 @@ RSpec.describe 'Wikipedia Search' do
 
   it "searches on wikipedia web site", driver: :selenium do
     page_set.execute do
-      visit_page "/"
+      visit_home_page
 
-      enter_search_request "Capybara"
+      enter_word "Capybara"
 
-      click_search_button
+      submit_request
 
       expect(page).to have_content "Hydrochoerus hydrochaeris"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acceptance_test
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.6.0
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen
@@ -71,29 +71,33 @@ files:
 - features/wikipedia/wikipedia_search_from_csv.feature
 - lib/acceptance_test.rb
 - lib/acceptance_test/acceptance_test.rb
-- lib/acceptance_test/gherkin_helper.rb
+- lib/acceptance_test/driver_manager.rb
+- lib/acceptance_test/gherkin_ext.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/turnip_ext.rb
 - lib/acceptance_test/version.rb
+- lib/tasks/rspec.rake
 - spec/acceptance_config.yml
-- spec/features/data.csv
+- spec/data.csv
 - spec/features/search_with_drivers.feature
 - spec/features/search_with_examples_from_csv.feature
+- spec/features/search_with_pages.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/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_table_steps.rb
+- spec/test_helper.rb
 - spec/turnip_helper.rb
 - spec/wikipedia_search_spec.rb
 - spec/wikipedia_search_with_config_spec.rb
 - spec/wikipedia_search_with_pages_spec.rb
 - spec/wikipedia_search_with_steps.rb
-- turnip
 homepage: http://github.com/shvets/acceptance_test
 licenses:
 - MIT
@@ -124,16 +128,19 @@ test_files:
 - features/wikipedia/wikipedia_search.feature
 - features/wikipedia/wikipedia_search_from_csv.feature
 - spec/acceptance_config.yml
-- spec/features/data.csv
+- spec/data.csv
 - spec/features/search_with_drivers.feature
 - spec/features/search_with_examples_from_csv.feature
+- spec/features/search_with_pages.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/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_table_steps.rb
+- spec/test_helper.rb
 - spec/turnip_helper.rb
 - spec/wikipedia_search_spec.rb
 - spec/wikipedia_search_with_config_spec.rb

data/lib/acceptance_test/turnip_helper.rb

@@ -1,76 +0,0 @@
-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/spec/support/wikipedia/main_page.rb

@@ -1,13 +0,0 @@
-class MainPage < Page
-  def visit_page root
-    session.visit root
-  end
-
-  def enter_search_request request
-    session.fill_in "searchInput", :with => request
-  end
-
-  def click_search_button
-    session.find(".formBtn", match: :first).click
-  end
-end

data/turnip

@@ -1 +0,0 @@
-system "bundle exec rspec -r turnip/rspec #{ARGV.join(' ')}"