lib/testjour/cucumber_extensions/feature_file_finder.rb @@ -36,5 +36,5 @@ CLEAN.include ["pkg", "*.gem", "doc", "ri", "coverage"] desc 'Install the package as a gem.' task :install => [:clean, :package] do gem = Dir['pkg/*.gem'].first - sh "sudo gem install --local #{gem}" + sh "sudo gem install --no-rdoc --no-ri --local #{gem}" end Rakefile @@ -19,7 +19,7 @@ module Commands end def load_plain_text_features(files) - features = Cucumber::Ast::Features.new(configuration.ast_filter) + features = Cucumber::Ast::Features.new Array(files).each do |file| features.add_feature(parser.parse_file(file)) lib/testjour/commands/command.rb @@ -5,6 +5,7 @@ require "testjour/commands/command" require "testjour/http_queue" require "testjour/configuration" require "testjour/cucumber_extensions/step_counter" +require "testjour/cucumber_extensions/feature_file_finder" require "testjour/results_formatter" module Testjour @@ -21,10 +22,11 @@ module Commands if configuration.feature_files.any? queue_features + @started_slaves = 0 start_slaves - puts "Requested build from #{@started_slaves} slaves..." + puts "Requested build from #{@started_slaves} slaves... (Waiting for #{step_count} results)" puts print_results @@ -106,6 +108,7 @@ module Commands def count_steps(feature_files) features = load_plain_text_features(feature_files) visitor = Testjour::StepCounter.new(step_mother) + visitor.options = configuration.cucumber_configuration.options visitor.visit_features(features) return visitor.count end lib/testjour/commands/run.rb @@ -55,6 +55,7 @@ module Commands def execute_features(features) visitor = Testjour::HttpFormatter.new(step_mother, StringIO.new, configuration.queue_uri) + visitor.options = configuration.cucumber_configuration.options visitor.visit_features(features) end lib/testjour/commands/run_slave.rb @@ -72,10 +72,6 @@ module Testjour def step_mother Cucumber::Cli::Main.instance_variable_get("@step_mother") end - - def ast_filter - cucumber_configuration.ast_filter - end def mysql_mode? @options[:create_mysql_db] @@ -85,8 +81,26 @@ module Testjour [feature_files.size, max_local_slaves].min end + def parser + @parser ||= Cucumber::Parser::FeatureParser.new + end + + def load_plain_text_features(files) + features = Cucumber::Ast::Features.new + + Array(files).each do |file| + features.add_feature(parser.parse_file(file)) + end + + return features + end + def feature_files - cucumber_configuration.feature_files + features = load_plain_text_features(cucumber_configuration.feature_files) + visitor = Testjour::FeatureFileFinder.new(step_mother) + visitor.options = cucumber_configuration.options + visitor.visit_features(features) + return visitor.feature_files end def cucumber_configuration lib/testjour/configuration.rb 238b44fdc57fc91efc5459a2ea51d0a63db25acd Bryan Helmkamp bryan@brynary.com http://github.com/brynary/testjour/commit/d30716de9464185262605db19af36f89a44fcba8 d30716de9464185262605db19af36f89a44fcba8 2009-04-01T13:27:26-07:00 2009-04-01T13:21:44-07:00 Configure visitors with options (Cucumber 0.2.3 support) dfb9fb2c6f5cfc04d135e821676b163b513f1a4b Bryan Helmkamp bryan@brynary.com