diff options
| -rw-r--r-- | qa/.gitignore | 1 | ||||
| -rw-r--r-- | qa/qa/specs/parallel_runner.rb | 2 | ||||
| -rw-r--r-- | qa/spec/specs/parallel_runner_spec.rb | 12 |
3 files changed, 7 insertions, 8 deletions
diff --git a/qa/.gitignore b/qa/.gitignore index 6f23927e9c3..b0ae074ac07 100644 --- a/qa/.gitignore +++ b/qa/.gitignore @@ -1,4 +1,3 @@ tmp/ -.rspec_parallel .ruby-version urls.yml diff --git a/qa/qa/specs/parallel_runner.rb b/qa/qa/specs/parallel_runner.rb index c1212272dcb..b92fdb610b6 100644 --- a/qa/qa/specs/parallel_runner.rb +++ b/qa/qa/specs/parallel_runner.rb @@ -9,7 +9,7 @@ module QA def run(args) unless args.include?('--') - index = args.index { |opt| opt =~ %r{/features/} } + index = args.index { |opt| opt.include?('features') } args.insert(index, '--') if index end diff --git a/qa/spec/specs/parallel_runner_spec.rb b/qa/spec/specs/parallel_runner_spec.rb index e8ff9d3ff07..67d94a1f648 100644 --- a/qa/spec/specs/parallel_runner_spec.rb +++ b/qa/spec/specs/parallel_runner_spec.rb @@ -48,11 +48,11 @@ describe QA::Specs::ParallelRunner do subject.run([]) end -end -def expect_cli_arguments(arguments, env = { 'QA_RUNTIME_SCENARIO_ATTRIBUTES' => '{"parallel":true}' }) - cmd = "bundle exec parallel_test -t rspec --combine-stderr --serialize-stdout -- #{arguments.join(' ')}" - expect(Open3).to receive(:popen2e) - .with(hash_including(env), cmd) - .and_return(0) + def expect_cli_arguments(arguments, env = { 'QA_RUNTIME_SCENARIO_ATTRIBUTES' => '{"parallel":true}' }) + cmd = "bundle exec parallel_test -t rspec --combine-stderr --serialize-stdout -- #{arguments.join(' ')}" + expect(Open3).to receive(:popen2e) + .with(hash_including(env), cmd) + .and_return(0) + end end |