Merge pull request #418 from cucumber/pretty_formatter_spec

Pretty formatter spec

lib/cucumber/cli/options.rb

@@ -54,17 +54,15 @@ def self.parse(args, out_stream, error_stream, options = {})
         new(out_stream, error_stream, options).parse!(args)
       end
 
-      attr_reader :profiles, :skip_profile_information
-
       def initialize(out_stream = STDOUT, error_stream = STDERR, options = {})
         @out_stream   = out_stream
         @error_stream = error_stream
 
         @default_profile = options[:default_profile]
-        @skip_profile_information = options[:skip_profile_information]
         @profiles = []
         @overridden_paths = []
         @options = default_options
+        @options[:skip_profile_information] = options[:skip_profile_information]
 
         @quiet = @disable_profile_loading = nil
       end
@@ -317,8 +315,8 @@ def filters
 
     protected
 
-      attr_reader :options, :expanded_args
-      protected :options, :expanded_args
+      attr_reader :options, :profiles, :expanded_args
+      protected :options, :profiles, :expanded_args
 
     private
 
@@ -357,6 +355,8 @@ def merge_profiles
             Options.parse(profile_args, @out_stream, @error_stream, :skip_profile_information  => true)
           )
         end
+
+        @options[:profiles] = @profiles
       end
 
       def default_profile_should_be_used?

lib/cucumber/formatter/console.rb

@@ -193,8 +193,8 @@ def empty_messages
       end
 
       def print_profile_information
-        return if @options.skip_profile_information || @options.profiles.empty?
-        profiles = @options.profiles
+        return if @options[:skip_profile_information] || @options[:profiles].nil? || @options[:profiles].empty?
+        profiles = @options[:profiles]
         profiles_sentence = ''
         profiles_sentence = profiles.size == 1 ? profiles.first :
           "#{profiles[0...-1].join(', ')} and #{profiles.last}"

lib/cucumber/formatter/pretty.rb

@@ -158,7 +158,7 @@ def step_name(keyword, step_match, status, source_indent, background, file_colon
       end
 
       def doc_string(string)
-        return if @hide_this_step
+        return if @options[:no_multiline] || @hide_this_step
         s = %{"""\n#{string}\n"""}.indent(@indent)
         s = s.split("\n").map{|l| l =~ /^\s+$/ ? '' : l}.join("\n")
         @io.puts(format_string(s, @current_step.status))