acceptance_test 1.10.11 → 1.10.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +8 -8
  2. data/CHANGES +1 -1
  3. data/lib/acceptance_test/acceptance_config.rb +18 -6
  4. data/lib/acceptance_test/version.rb +1 -1
  5. data/spec/spec_helper.rb +1 -1
  6. data/spec/wikipedia/{acceptance_config.yml → wikipedia.yml} +0 -0
  7. metadata +3 -3
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MzUyNjhmZGVjZGJhNzlkZmU2MDYwOTUwNTY5N2MzYTNkYmVkZWZiZQ==
4
+ NWRkY2IyYTg2MDEwMTc1ODE2ZTVlMjU2MmJkNmI2ZTQwYzY1YjkyMg==
5
5
  data.tar.gz: !binary |-
6
- N2E5YTU2Y2RiMzliMzQwZGE4NjAxNTNiY2YyMTMxMDY0NzhlOGYxNg==
6
+ MzQ3MDlmNWY3NjcyNTNhMDNiMDY4ODRiN2RhYWVkZjZlNzJiNDI2NQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- NDE4ZWNmY2VkZTBiODQyMWYwMTE4ZDRhNjQ0NDJmODljZTliMWEzZDM1Zjgx
10
- ZTQ4Y2ZjZDc4OWI3ZWMwOGUxNTM0ZjcyNWMyNzRlYjEzYTI3NTE4Y2UwY2Jh
11
- MTY0MzQzOThiZTRmMzIzYjlhMzU1NDEzZjhlMWQzM2FmYmYyNjY=
9
+ OTI3MzE0MTdlZTkzNWEzMzI4NzVhYjlkNGNlMTdhZmMyOTY3MDZhNjY3OTdm
10
+ ZDA1Y2ZhNGI3NjVmOWI5MjgxMmZiYThkMTFmYmFhMTY5NjI0ZmJkNWMxYTNk
11
+ ZWJjYjE4M2M4ZWM3MzY5OWMxZTc1NDlhYmQ5Y2YxNzdkMDZiYmY=
12
12
  data.tar.gz: !binary |-
13
- MWE1NTIwNzBkZDVkNDAzNTFjNzQ1NmNjZDkwNDk1YjAwYmMyMzQwNzdmZmYw
14
- ZDVmZDU2NDM4M2YxOTA2OGZmYTRjNmEzYWY3ODQ0MTgwMzQwNDA3OTg2ZjZl
15
- MWU1ZDRlM2IwNmU2ZTMyMGY0MWExYjNjYTY2MzQ2NmM3NDcwZjY=
13
+ OTM5YzVlZGFiMzBmMWNjZTk5NmM5ZjQzZWQ0MThhNTUzODE3MjI3YmI0YWM4
14
+ ZWQ2OWFiNDFiZjAwNGUzYjVkOWFmNmNiZGVjODYyY2U1MjExYjNmOGRjN2Nl
15
+ ZTk1MjZiM2Q2MmI1YjA0MWFiZGQwNWMzMTgyM2MzMGExZjI0ZDY=
data/CHANGES CHANGED
@@ -305,7 +305,7 @@
305
305
 
306
306
  * Update specs
307
307
 
308
- == Versions 1.10.5-1.10.11
308
+ == Versions 1.10.5-1.10.12
309
309
 
310
310
  * Bug fixes
311
311
 
data/lib/acceptance_test/acceptance_config.rb CHANGED
@@ -20,8 +20,8 @@ class AcceptanceConfig
20
20
 
21
21
  acceptance_test.enable_external_source data_reader # enable external source for gherkin
22
22
 
23
- config = acceptance_config_file ? HashWithIndifferentAccess.new(YAML.load_file(acceptance_config_file)) : {}
24
- acceptance_test.configure(config)
23
+ acceptance_config = acceptance_config_file ? HashWithIndifferentAccess.new(YAML.load_file(acceptance_config_file)) : {}
24
+ acceptance_test.configure(acceptance_config)
25
25
 
26
26
  if block_given?
27
27
  yield acceptance_test.config
@@ -58,16 +58,28 @@ class AcceptanceConfig
58
58
  ENV['FORMAT'].nil? ? "xlsx" : ENV['FORMAT']
59
59
  end
60
60
 
61
+ def config_dir
62
+ ENV['CONFIG_DIR'] ? ENV['CONFIG_DIR'] : "acceptance_config"
63
+ end
64
+
65
+ def data_dir
66
+ ENV['DATA_DIR'] ? ENV['DATA_DIR'] : "acceptance_data"
67
+ end
68
+
69
+ def results_dir
70
+ ENV['RESULTS_DIR'] ? ENV['RESULTS_DIR'] : "acceptance_results"
71
+ end
72
+
61
73
  def acceptance_config_file
62
- ENV['CONFIG_FILE'] ? File.expand_path(ENV['CONFIG_FILE']) : detect_file("acceptance_config", "#{app_name}.yml")
74
+ detect_file(config_dir, "#{app_name}.yml")
63
75
  end
64
76
 
65
77
  def acceptance_data_file name="#{app_name}.#{format}"
66
- ENV['DATA_DIR'] ? detect_file(ENV['DATA_DIR'], name) : detect_file("acceptance_data", name)
78
+ detect_file(data_dir, name)
67
79
  end
68
80
 
69
- def acceptance_results_file name="#{app_name}.#{format}"
70
- ENV['RESULTS_DIR'] ? detect_file(ENV['RESULTS_DIR'], name) : detect_file("acceptance_results", name)
81
+ def acceptance_results_file
82
+ detect_file(results_dir, "#{app_name}.#{format}")
71
83
  end
72
84
 
73
85
  def webapp_url name=:webapp_url
data/lib/acceptance_test/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  class AcceptanceTest
2
- VERSION = "1.10.11"
2
+ VERSION = "1.10.12"
3
3
  end
data/spec/spec_helper.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  require 'acceptance_test/acceptance_config'
2
2
 
3
- ENV['CONFIG_FILE'] = "spec/wikipedia/acceptance_config.yml"
3
+ ENV['CONFIG_DIR'] = "spec/wikipedia"
4
4
  ENV['DATA_DIR'] = "spec/wikipedia/acceptance_data"
5
5
 
6
6
  AcceptanceConfig.instance.configure "spec", "wikipedia"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: acceptance_test
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.10.11
4
+ version: 1.10.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alexander Shvets
@@ -259,7 +259,6 @@ files:
259
259
  - spec/acceptance/search_with_steps_spec.rb
260
260
  - spec/spec_helper.rb
261
261
  - spec/support/steps/common_steps.rb
262
- - spec/wikipedia/acceptance_config.yml
263
262
  - spec/wikipedia/acceptance_data/data.csv
264
263
  - spec/wikipedia/acceptance_data/data.yml
265
264
  - spec/wikipedia/features/search_with_drivers.feature
@@ -275,6 +274,7 @@ files:
275
274
  - spec/wikipedia/support/steps/search_with_scenario_outline_steps.rb
276
275
  - spec/wikipedia/support/steps/search_with_table_steps.rb
277
276
  - spec/wikipedia/support/wikipedia_pages.rb
277
+ - spec/wikipedia/wikipedia.yml
278
278
  homepage: http://github.com/shvets/acceptance_test
279
279
  licenses:
280
280
  - MIT
@@ -311,7 +311,6 @@ test_files:
311
311
  - spec/acceptance/search_with_steps_spec.rb
312
312
  - spec/spec_helper.rb
313
313
  - spec/support/steps/common_steps.rb
314
- - spec/wikipedia/acceptance_config.yml
315
314
  - spec/wikipedia/acceptance_data/data.csv
316
315
  - spec/wikipedia/acceptance_data/data.yml
317
316
  - spec/wikipedia/features/search_with_drivers.feature
@@ -327,3 +326,4 @@ test_files:
327
326
  - spec/wikipedia/support/steps/search_with_scenario_outline_steps.rb
328
327
  - spec/wikipedia/support/steps/search_with_table_steps.rb
329
328
  - spec/wikipedia/support/wikipedia_pages.rb
329
+ - spec/wikipedia/wikipedia.yml