merge master and resolve conflicts

1 files changed, 5 insertions, 2 deletions

diff --git a/qa/qa/specs/runner.rb b/qa/qa/specs/runner.rb
index 5b5699d8a93..fea0ef94df3 100644
--- a/qa/qa/specs/runner.rb
+++ b/qa/qa/specs/runner.rb
@@ -5,10 +5,12 @@ module QA
     class Runner < Scenario::Template
       attr_accessor :tty, :tags, :options
 
+      DEFAULT_TEST_PATH_ARGS = ['--', File.expand_path('./features', __dir__)].freeze
+
       def initialize
         @tty = false
         @tags = []
-        @options = [File.expand_path('./features', __dir__)]
+        @options = []
       end
 
       def perform
@@ -18,10 +20,11 @@ module QA
         if tags.any?
           tags.each { |tag| args.push(['--tag', tag.to_s]) }
         else
-          args.push(%w[--tag ~orchestrated])
+          args.push(%w[--tag ~orchestrated]) unless (%w[-t --tag] & options).any?
         end
 
         args.push(options)
+        args.push(DEFAULT_TEST_PATH_ARGS) unless options.any? { |opt| opt =~ %r{/features/} }
 
         Runtime::Browser.configure!