acceptance_test 1.10.11 → 1.10.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzUyNjhmZGVjZGJhNzlkZmU2MDYwOTUwNTY5N2MzYTNkYmVkZWZiZQ==
+    NWRkY2IyYTg2MDEwMTc1ODE2ZTVlMjU2MmJkNmI2ZTQwYzY1YjkyMg==
   data.tar.gz: !binary |-
-    N2E5YTU2Y2RiMzliMzQwZGE4NjAxNTNiY2YyMTMxMDY0NzhlOGYxNg==
+    MzQ3MDlmNWY3NjcyNTNhMDNiMDY4ODRiN2RhYWVkZjZlNzJiNDI2NQ==
 SHA512:
   metadata.gz: !binary |-
-    NDE4ZWNmY2VkZTBiODQyMWYwMTE4ZDRhNjQ0NDJmODljZTliMWEzZDM1Zjgx
-    ZTQ4Y2ZjZDc4OWI3ZWMwOGUxNTM0ZjcyNWMyNzRlYjEzYTI3NTE4Y2UwY2Jh
-    MTY0MzQzOThiZTRmMzIzYjlhMzU1NDEzZjhlMWQzM2FmYmYyNjY=
+    OTI3MzE0MTdlZTkzNWEzMzI4NzVhYjlkNGNlMTdhZmMyOTY3MDZhNjY3OTdm
+    ZDA1Y2ZhNGI3NjVmOWI5MjgxMmZiYThkMTFmYmFhMTY5NjI0ZmJkNWMxYTNk
+    ZWJjYjE4M2M4ZWM3MzY5OWMxZTc1NDlhYmQ5Y2YxNzdkMDZiYmY=
   data.tar.gz: !binary |-
-    MWE1NTIwNzBkZDVkNDAzNTFjNzQ1NmNjZDkwNDk1YjAwYmMyMzQwNzdmZmYw
-    ZDVmZDU2NDM4M2YxOTA2OGZmYTRjNmEzYWY3ODQ0MTgwMzQwNDA3OTg2ZjZl
-    MWU1ZDRlM2IwNmU2ZTMyMGY0MWExYjNjYTY2MzQ2NmM3NDcwZjY=
+    OTM5YzVlZGFiMzBmMWNjZTk5NmM5ZjQzZWQ0MThhNTUzODE3MjI3YmI0YWM4
+    ZWQ2OWFiNDFiZjAwNGUzYjVkOWFmNmNiZGVjODYyY2U1MjExYjNmOGRjN2Nl
+    ZTk1MjZiM2Q2MmI1YjA0MWFiZGQwNWMzMTgyM2MzMGExZjI0ZDY=

data/CHANGES

@@ -305,7 +305,7 @@
 
 * Update specs
 
-== Versions 1.10.5-1.10.11
+== Versions 1.10.5-1.10.12
 
 * Bug fixes
 

data/lib/acceptance_test/acceptance_config.rb

@@ -20,8 +20,8 @@ class AcceptanceConfig
 
     acceptance_test.enable_external_source data_reader # enable external source for gherkin
 
-    config = acceptance_config_file ? HashWithIndifferentAccess.new(YAML.load_file(acceptance_config_file)) : {}
-    acceptance_test.configure(config)
+    acceptance_config = acceptance_config_file ? HashWithIndifferentAccess.new(YAML.load_file(acceptance_config_file)) : {}
+    acceptance_test.configure(acceptance_config)
 
     if block_given?
       yield acceptance_test.config
@@ -58,16 +58,28 @@ class AcceptanceConfig
     ENV['FORMAT'].nil? ? "xlsx" : ENV['FORMAT']
   end
 
+  def config_dir
+    ENV['CONFIG_DIR'] ?  ENV['CONFIG_DIR'] : "acceptance_config"
+  end
+
+  def data_dir
+    ENV['DATA_DIR'] ?  ENV['DATA_DIR'] : "acceptance_data"
+  end
+
+  def results_dir
+    ENV['RESULTS_DIR'] ?  ENV['RESULTS_DIR'] : "acceptance_results"
+  end
+
   def acceptance_config_file
-    ENV['CONFIG_FILE'] ? File.expand_path(ENV['CONFIG_FILE']) : detect_file("acceptance_config", "#{app_name}.yml")
+    detect_file(config_dir, "#{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)
+    detect_file(data_dir, name)
   end
 
-  def acceptance_results_file name="#{app_name}.#{format}"
-    ENV['RESULTS_DIR'] ? detect_file(ENV['RESULTS_DIR'], name) : detect_file("acceptance_results", name)
+  def acceptance_results_file
+    detect_file(results_dir, "#{app_name}.#{format}")
   end
 
   def webapp_url name=:webapp_url

data/lib/acceptance_test/version.rb

@@ -1,3 +1,3 @@
 class AcceptanceTest
-  VERSION = "1.10.11"
+  VERSION = "1.10.12"
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'acceptance_test/acceptance_config'
 
-ENV['CONFIG_FILE'] = "spec/wikipedia/acceptance_config.yml"
+ENV['CONFIG_DIR'] = "spec/wikipedia"
 ENV['DATA_DIR'] = "spec/wikipedia/acceptance_data"
 
 AcceptanceConfig.instance.configure "spec", "wikipedia"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acceptance_test
 version: !ruby/object:Gem::Version
-  version: 1.10.11
+  version: 1.10.12
 platform: ruby
 authors:
 - Alexander Shvets
@@ -259,7 +259,6 @@ files:
 - spec/acceptance/search_with_steps_spec.rb
 - spec/spec_helper.rb
 - spec/support/steps/common_steps.rb
-- spec/wikipedia/acceptance_config.yml
 - spec/wikipedia/acceptance_data/data.csv
 - spec/wikipedia/acceptance_data/data.yml
 - spec/wikipedia/features/search_with_drivers.feature
@@ -275,6 +274,7 @@ files:
 - spec/wikipedia/support/steps/search_with_scenario_outline_steps.rb
 - spec/wikipedia/support/steps/search_with_table_steps.rb
 - spec/wikipedia/support/wikipedia_pages.rb
+- spec/wikipedia/wikipedia.yml
 homepage: http://github.com/shvets/acceptance_test
 licenses:
 - MIT
@@ -311,7 +311,6 @@ test_files:
 - spec/acceptance/search_with_steps_spec.rb
 - spec/spec_helper.rb
 - spec/support/steps/common_steps.rb
-- spec/wikipedia/acceptance_config.yml
 - spec/wikipedia/acceptance_data/data.csv
 - spec/wikipedia/acceptance_data/data.yml
 - spec/wikipedia/features/search_with_drivers.feature
@@ -327,3 +326,4 @@ test_files:
 - spec/wikipedia/support/steps/search_with_scenario_outline_steps.rb
 - spec/wikipedia/support/steps/search_with_table_steps.rb
 - spec/wikipedia/support/wikipedia_pages.rb
+- spec/wikipedia/wikipedia.yml