acceptance_test 1.10.0 → 1.10.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODQ2NTYxZjI5MzA5MzEyZDc3NmViM2M1MGJhMmFhYTNhZGEwMzk2YQ==
+    MWQzODI5MGMwMTNjNWQ5Y2RjY2MyN2QyNjdiZThiZTgwZmFhOWU5ZQ==
   data.tar.gz: !binary |-
-    ODliM2U3YWNjM2IyYjMyMzdlZWQ3NjNlNDllNDg4NDI3MGU1M2ExNg==
+    YWM5ZTVkMjc1MjQ3OWY2MTc2Nzc4Y2NjODE1MTQxMzcyYmU0OTBmMg==
 SHA512:
   metadata.gz: !binary |-
-    OWM1MTAyYjdmMTU4ZWI1MjdkYTJhODBjZDE2OGVkZWUwNGFhYTllZTNiYmJi
-    MjUzOWUwZDYzODdlOWYzMzllZDA2M2FlZjcxZTBhZDY1MjZiNDhmOGU5ZTgz
-    NTM0Zjk2MzkwOGY5ZDhhMWI2OTk0Y2QxM2JkMWJkNGUwNWFjMTE=
+    OWVlNjU1OWU5NmRmOWIwZGNjZDQyMjA5MDM3YTFhZWI3YzY5NDJiZDQwZGM4
+    YWMwOWY3OWMyNTkzMTNiODkzYTViOGY0ZjQ5NjIwODc5YzRmZmVkZGFiZTEw
+    N2FlZWEyZDg5NWIwMzk2ZjcyNjFhNjE5N2NmNjJhYTViOTIwYjY=
   data.tar.gz: !binary |-
-    MDRmYzBiMDU2MjE5MTI4NzVjMzgzN2Y1MTI1NDc2ODcyZTUzYTdjOTU3YWVj
-    YTA3N2EyZjIxOTI5MDYwNjZhMDMzMmZmNmMyYThhYTRhYzgzZmE5ZTMwMTU1
-    N2JjZjgwYmZiNjgyYThhNGM3OGRiZTU1OGYxYmNlNjQyZmUyYzQ=
+    NGJlOGQ3OTcyNWY0N2NjOTcyNzQ0Y2QwZWM1NjU3OGZjYjAyZGQ2Y2NhZjg3
+    ZjgyNTExZmE1ZDZhMWMyNTU2ZjFmMjU5YTc4NzUwOWY1OTc4OTE5NDMwYzg3
+    YmMzZjIxOGEwZTE4ZmZjYzM4Njg1Zjc3NWUxM2FjMzY4MGY2MTU=

data/CHANGES

@@ -291,4 +291,8 @@
 
 == Version 1.10.0
 
-* Adding acceptance_config
+* Adding acceptance_config
+
+== Version 1.10.1
+
+* Bug fixes

data/Gemfile

@@ -7,6 +7,7 @@ end
 
 group :test, :default do
   gem "rspec"
+  gem "capybara-webkit", "~> 1.4.1"
 end
 
 group :default do
@@ -25,7 +26,6 @@ group :default do
 
   gem "turnip", "~> 1.2.4"
   gem "capybara", "~> 2.4.4"
-  gem "capybara-webkit", "~> 1.4.1", platforms: [:ruby]
   gem "selenium-webdriver", "~> 2.44.0"
   gem "capybara-firebug", "~> 2.1.0"
   gem "poltergeist", "~> 1.6.0"

data/acceptance_test.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
   
   spec.add_runtime_dependency "rspec", [">= 0"]
+  spec.add_runtime_dependency "capybara-webkit", ["~> 1.4.1"]
   spec.add_runtime_dependency "turnip", ["~> 1.2.4"]
   spec.add_runtime_dependency "capybara", ["~> 2.4.4"]
-  spec.add_runtime_dependency "capybara-webkit", ["~> 1.4.1"]
   spec.add_runtime_dependency "selenium-webdriver", ["~> 2.44.0"]
   spec.add_runtime_dependency "capybara-firebug", ["~> 2.1.0"]
   spec.add_runtime_dependency "poltergeist", ["~> 1.6.0"]

data/lib/acceptance_test/acceptance_config.rb

@@ -1,31 +1,30 @@
 require 'singleton'
 require 'yaml'
 require 'csv'
+require 'selenium/webdriver'
 require 'active_support/core_ext/hash'
 require 'acceptance_test'
 
-require 'turnip/capybara'
 require 'gnawrnip'
 
 class AcceptanceConfig
   include Singleton
 
-  def configure app_name=nil
+  def configure workspace, app_name=nil
     @app_name = app_name
 
-    load_support_code "spec"
+    load_support_code workspace
 
     acceptance_test = AcceptanceTest.instance
 
-    #acceptance_test.enable_external_source data_reader # enable external source for gherkin
+    acceptance_test.enable_external_source data_reader # enable external source for gherkin
 
-    RSpec.configure do |config|
-       config_file = acceptance_config_file(app_name)
-       acceptance_config = config_file ? HashWithIndifferentAccess.new(YAML.load_file(config_file)) : {}
+    acceptance_config = acceptance_config_file ? HashWithIndifferentAccess.new(YAML.load_file(acceptance_config_file)) : {}
 
-      acceptance_test.configure(acceptance_config)
+    acceptance_test.configure(acceptance_config)
 
-      acceptance_test.configure_turnip 'tmp/report.html', "test"
+    RSpec.configure do |config|
+      configure_turnip
 
       config.before(:type => :feature) do |example|
         acceptance_test.setup page, example.metadata
@@ -49,12 +48,69 @@ class AcceptanceConfig
     ENV['ACCEPTANCE_ENV'].nil? ? "development" : ENV['ACCEPTANCE_ENV']
   end
 
-  def acceptance_config_file app_name
-    ENV['CONFIG_FILE'] ? File.expand_path(ENV['CONFIG_FILE']) : detect_file("acceptance_config", app_name, ".yml")
+  def format
+    ENV['FORMAT'].nil? ? "xlsx" : ENV['FORMAT']
+  end
+
+  def acceptance_config_file
+    ENV['CONFIG_FILE'] ? File.expand_path(ENV['CONFIG_FILE']) : detect_file("acceptance_config", "#{app_name}.yml")
+  end
+
+  def acceptance_data_file name="#{app_name}.#{format}"
+    ENV['DATA_DIR'] ? detect_file(ENV['DATA_DIR'], name) : detect_file("acceptance_data", name)
+  end
+
+  def screenshots_dir
+    AcceptanceTest.instance.config[:screenshots_dir]
+  end
+
+  def upload_dir
+    AcceptanceTest.instance.config[:upload_dir]
+  end
+
+  def upload_dev_dir
+    AcceptanceTest.instance.config[:upload_dev_dir]
   end
 
   private
 
+  def configure_turnip
+    report_file = turnip_report_file(app_name)
+
+    configure_turnip_formatter report_file, app_name
+
+    configure_gnawrnip
+  end
+
+  def configure_turnip_formatter report_file, report_name
+    require 'turnip_formatter'
+
+    RSpec.configure do |config|
+      config.add_formatter RSpecTurnipFormatter, report_file
+    end
+
+    TurnipFormatter.configure do |config|
+      config.title = "#{report_name[0].upcase+report_name[1..-1]} Acceptance"
+    end
+  end
+
+  def configure_gnawrnip
+    Gnawrnip.configure do |c|
+      c.make_animation = true
+      c.max_frame_size = 1024 # pixel
+    end
+
+    Gnawrnip.ready!
+  end
+
+  def turnip_report_file name=nil
+    name = ENV['TURNIP_REPORT_PREFIX'] if ENV['TURNIP_REPORT_PREFIX']
+
+    file_name = name.nil? ? "acceptance-report.html" : "#{name}-acceptance-report.html"
+
+    File.expand_path("tmp/#{file_name}")
+  end
+
   def load_support_code basedir
     target = nil
 
@@ -82,26 +138,47 @@ class AcceptanceConfig
     end
  end
 
-  def detect_file dir, app_type, ext
-    path1 = "#{dir}/#{app_type}-#{environment}#{ext}"
-    path2 = "#{dir}/#{app_type}#{ext}"
+  def detect_file dir, name
+    ext = File.extname(name)
+    basename = File.basename(name)
+    basename = basename[0..basename.size-ext.size-1]
+
+    path1 = "#{dir}/#{basename}-#{environment}#{ext}"
+    path2 = "#{dir}/#{basename}#{ext}"
 
-    full_path = File.expand_path(path1)
+    full_path1 = File.expand_path(path1)
+    full_path2 = File.expand_path(path2)
 
-    File.exist?(full_path) ? full_path : File.expand_path(path2)
+    File.exist?(full_path1) ? full_path1 : full_path2
   end
 
   def data_reader
     lambda do |source_path|
-      ext = File.extname(source_path)
+      path = acceptance_data_file detect_file_from_script(source_path)
+
+      puts "Reading data from: #{path}"
+
+      ext = File.extname(path)
 
       if ext == '.csv'
-        CSV.read(File.expand_path(source_path))
+        CSV.read(File.expand_path(path))
       elsif ext == '.yml'
-        YAML.load_file(File.expand_path(source_path))
+        YAML.load_file(File.expand_path(path))
       end
     end
   end
 
-end
+  def detect_file_from_script source_path
+    path = source_path % {acceptance_env: environment, format: format}
 
+    if File.exist? File.expand_path(path)
+      path
+    else
+      dir = File.dirname(source_path)
+      name = File.basename(source_path).gsub("-", '')
+      source_path = (dir == ".") ? name : "#{dir}/#{name}"
+
+      (source_path % {acceptance_env: '', format: format})
+    end
+  end
+end

data/lib/acceptance_test/acceptance_test.rb

@@ -89,33 +89,6 @@ class AcceptanceTest
     GherkinExt.enable_external_source data_reader
   end
 
-  def configure_turnip report_file, report_name
-    configure_turnip_formatter report_file, report_name
-
-    configure_gnawrnip
-  end
-
-  def configure_turnip_formatter report_file, report_name
-    require 'turnip_formatter'
-
-    RSpec.configure do |config|
-      config.add_formatter RSpecTurnipFormatter, report_file
-    end
-
-    TurnipFormatter.configure do |config|
-      config.title = "#{report_name[0].upcase+report_name[1..-1]} Acceptance"
-    end
-  end
-
-  def configure_gnawrnip
-    Gnawrnip.configure do |c|
-      c.make_animation = true
-      c.max_frame_size = 1024 # pixel
-    end
-
-    Gnawrnip.ready!
-  end
-
   private
 
   def driver metadata

data/lib/acceptance_test/version.rb

@@ -1,3 +1,3 @@
 class AcceptanceTest
-  VERSION = "1.10.0"
+  VERSION = "1.10.1"
 end

data/spec/spec_helper.rb

@@ -1,51 +1,6 @@
-require 'yaml'
-require 'csv'
-require 'active_support/core_ext/hash'
-
-$: << File.expand_path('spec/support')
-$: << File.expand_path('spec/wikipedia/support')
-
-require 'acceptance_test'
-
-require 'turnip/capybara'
-require 'gnawrnip'
-
-require 'steps/search_with_drivers_steps'
-require 'steps/search_with_pages_steps'
-require 'steps/search_with_scenario_outline_steps'
-require 'steps/search_with_table_steps'
-
-acceptance_test = AcceptanceTest.instance
-
-RSpec.configure do |conf|
-  conf.before(:type => :feature) do
-    config_name = File.expand_path("spec/wikipedia/acceptance_config.yml")
-    config = config_name ? HashWithIndifferentAccess.new(YAML.load_file(config_name)) : {}
-
-    acceptance_test.configure(config)
-
-    # acceptance_test.configure(webapp_url: 'http://www.wikipedia.org')
-    # acceptance_test.register_driver(:webkit)
-    # acceptance_test.register_driver(:poltergeist)
-
-    acceptance_test.configure_turnip 'tmp/report.html', "test"
-
-    acceptance_test.setup
-  end
-
-  conf.after(:type => :feature) do
-    acceptance_test.teardown
-  end
-end
-
-# ENV['CONFIG_FILE'] = "spec/wikipedia/acceptance_config.yml"
-#
-# require 'acceptance_test/acceptance_config'
-#
-# AcceptanceConfig.instance.configure "wikipedia"
-
-
-
-
+require 'acceptance_test/acceptance_config'
 
+ENV['CONFIG_FILE'] = "spec/wikipedia/acceptance_config.yml"
+ENV['DATA_DIR'] = "spec/wikipedia/acceptance_data"
 
+AcceptanceConfig.instance.configure "spec", "wikipedia"

data/spec/wikipedia/features/search_with_scenario_outline2.feature

@@ -13,4 +13,4 @@ Feature: Using Wikipedia
 
     Examples:
       | keyword | result | something_else |
-      | file:spec/wikipedia/data.csv ||             |
+      | file:data.csv ||             |

data/spec/wikipedia/features/search_with_scenario_outline3.feature

@@ -13,4 +13,4 @@ Feature: Using Wikipedia
 
     Examples:
       | keyword | result |something_else |
-      | file:spec/wikipedia/data.yml, key:test1 || |
+      | file:data.yml, key:test1 || |

data/spec/wikipedia/features/search_with_scenario_outline4.feature

@@ -12,4 +12,4 @@ Feature: Using Wikipedia
     Then I should see "<result>"
 
   Examples:
-    | file:spec/wikipedia/data.yml, key:test2 |
+    | file:data.yml, key:test2 |

data/spec/wikipedia/support/steps/search_with_scenario_outline_steps.rb

@@ -1,19 +1,3 @@
-require 'csv'
-
-# enable external source for gherkin
-
-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_scenario_outline do
 
   step "I am within wikipedia.com" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acceptance_test
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Alexander Shvets
@@ -25,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: turnip
+  name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: turnip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 1.2.4
 - !ruby/object:Gem::Dependency
-  name: capybara-webkit
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 2.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 2.4.4
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -260,8 +260,8 @@ files:
 - spec/wikipedia/acceptance/search_with_pages_spec.rb
 - spec/wikipedia/acceptance/search_with_steps_spec.rb
 - spec/wikipedia/acceptance_config.yml
-- spec/wikipedia/data.csv
-- spec/wikipedia/data.yml
+- spec/wikipedia/acceptance_data/data.csv
+- spec/wikipedia/acceptance_data/data.yml
 - spec/wikipedia/features/search_with_drivers.feature
 - spec/wikipedia/features/search_with_pages.feature
 - spec/wikipedia/features/search_with_scenario_outline1.feature
@@ -295,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Simplifies congiguration and run of acceptance tests.
@@ -312,8 +312,8 @@ test_files:
 - spec/wikipedia/acceptance/search_with_pages_spec.rb
 - spec/wikipedia/acceptance/search_with_steps_spec.rb
 - spec/wikipedia/acceptance_config.yml
-- spec/wikipedia/data.csv
-- spec/wikipedia/data.yml
+- spec/wikipedia/acceptance_data/data.csv
+- spec/wikipedia/acceptance_data/data.yml
 - spec/wikipedia/features/search_with_drivers.feature
 - spec/wikipedia/features/search_with_pages.feature
 - spec/wikipedia/features/search_with_scenario_outline1.feature