Merge pull request #2305 from rspec/dont_double_include_pattern

Don't include default pattern when user specifies their own in Rake task.

Author: JonRowe

lib/rspec/core/rake_task.rb

@@ -102,6 +102,7 @@ def file_inclusion_specification
         if ENV['SPEC']
           FileList[ENV['SPEC']].sort
         elsif String === pattern && !File.exist?(pattern)
+          return if rspec_opts =~ /--pattern/
           "--pattern #{escape pattern}"
         else
           # Before RSpec 3.1, we used `FileList` to get the list of matched

spec/rspec/core/rake_task_spec.rb

@@ -66,6 +66,13 @@ def spec_command
         task.rspec_opts = "-Ifoo"
         expect(spec_command).to match(/#{task.rspec_path}.*-Ifoo/)
       end
+
+      it 'correctly excludes the default pattern if rspec_opts includes --pattern' do
+        task.rspec_opts = "--pattern some_specs"
+        expect(spec_command).to include("--pattern some_specs").and(
+          exclude(RSpec::Core::RakeTask::DEFAULT_PATTERN)
+        )
+      end
     end
 
     context "with pattern" do