From a724efacd593dcdaf6d9ca99860be13a8dd176aa Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Wed, 6 Apr 2016 16:21:57 -0300 Subject: [PATCH] cucumber.yml: Improve format --- config/cucumber.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/config/cucumber.yml b/config/cucumber.yml index d4c36df..a2d97f6 100644 --- a/config/cucumber.yml +++ b/config/cucumber.yml @@ -1,20 +1,25 @@ -<% base_requires = '-r features/support -r features/step_definitions' %> -<% default_options = "--format progress --strict --tags ~@selenium --tags ~@selenium-fixme --tags ~@fixme --exclude features/support/selenium.rb #{base_requires}" %> <% - default_options += ' --color' if $stdout.isatty + base_requires = '-r features/support -r features/step_definitions' + default_options = "--format progress --strict --tags ~@selenium --tags ~@selenium-fixme --tags ~@fixme --exclude features/support/selenium.rb #{base_requires}" + default_options << ' --color' if $stdout.isatty + selenium_options = "--strict --tags @selenium #{base_requires}" %> -<% selenium_options = "--strict --tags @selenium #{base_requires}" %> default: <%= default_options %> selenium: <%= selenium_options %> -<% enabled_plugins = Dir.glob(File.join('config', 'plugins', '*')).map{|path| plugin = File.basename(path); plugin if File.exist?(File.join('features', 'plugins', plugin)) }.compact %> +<% + enabled_plugins = Dir.glob(File.join('config', 'plugins', '*')).map do |path| + plugin = File.basename(path) + plugin if File.exist? File.join('features', 'plugins', plugin) + end.compact -<% enabled_plugins.each do |plugin| %> -<% plugin_features_path = File.join('features', 'plugins', plugin) %> -<% plugin_base_requires = '' %> -<% plugin_base_requires += " -r features/plugins/#{plugin}/support" if File.exist?(File.join(plugin_features_path, 'support')) %> -<% plugin_base_requires += " -r features/plugins/#{plugin}/step_definitions" if File.exist?(File.join(plugin_features_path, 'step_definitions')) %> + enabled_plugins.each do |plugin| + plugin_features_path = File.join('features', 'plugins', plugin) + plugin_base_requires = '' + plugin_base_requires << " -r features/plugins/#{plugin}/support" if File.exist? File.join(plugin_features_path, 'support') + plugin_base_requires << " -r features/plugins/#{plugin}/step_definitions" if File.exist? File.join(plugin_features_path, 'step_definitions') +%> <%= "#{plugin}: #{default_options} #{plugin_base_requires}" %> <%= "#{plugin}_selenium: #{selenium_options} #{plugin_base_requires}" %> <% end %> -- libgit2 0.21.2