combine multiple pattern arguments

Author: JonRowe

lib/rspec/core/option_parser.rb

@@ -179,7 +179,11 @@ def parser(options)
         end
 
         parser.on('-P', '--pattern PATTERN', 'Load files matching pattern (default: "spec/**/*_spec.rb").') do |o|
-          options[:pattern] = o
+          if options[:pattern]
+            options[:pattern] += ',' + o
+          else
+            options[:pattern] = o
+          end
         end
 
         parser.on('--exclude-pattern PATTERN',

spec/rspec/core/option_parser_spec.rb

@@ -214,6 +214,10 @@ def generate_help_text
           options = Parser.parse([option, 'spec/**/*.spec'])
           expect(options[:pattern]).to eq('spec/**/*.spec')
         end
+        it 'will combine multple patterns' do
+          options = Parser.parse([option, 'spec/**/*.spec', option, 'tests/**/*.spec'])
+          expect(options[:pattern]).to eq('spec/**/*.spec,tests/**/*.spec')
+        end
       end
     end