Move rspec cli handling logic into Specs::Runner

Here we convert Specs::Runner#rspec to use keyword arguments[1] and pass named parameters rather than a pre-processed array of cli switches. This allows parameter to cli logic to live just in Specs::Runner. [1] https://robots.thoughtbot.com/ruby-2-keyword-arguments

Move rspec cli handling logic into Specs::Runner
cbc67b48 · Richard Clamp · c6faeb72 · cbc67b48 · cbc67b48
Commit cbc67b48 authored Oct 16, 2017 by Richard Clamp
Show whitespace changes
Inline Side-by-side

Showing with 15 additions and 4 deletions

entrypoint.rb qa/qa/scenario/entrypoint.rb +7 -3

runner.rb qa/qa/specs/runner.rb +8 -1

No files found.
--- a/qa/qa/scenario/entrypoint.rb
+++ b/qa/qa/scenario/entrypoint.rb
@@ -9,8 +9,8 @@ module QA
        @tags = tags
      end

-      def self.tag_switches
-        @tags.map { |tag| ['-t', tag.to_s] }
+      def self.get_tags
+        @tags
      end

      def perform(address, *files)
@@ -24,7 +24,11 @@ module QA
        Runtime::Release.perform_before_hooks

        Specs::Runner.perform do |specs|
-          specs.rspec('--tty', self.class.tag_switches, files.any? ? files : 'qa/specs/features')
+          specs.rspec(
+            tty: true,
+            tags: self.class.get_tags,
+            files: files.any? ? files : 'qa/specs/features'
+          )
        end
      end
    end

--- a/qa/qa/specs/runner.rb
+++ b/qa/qa/specs/runner.rb
@@ -5,7 +5,14 @@ module QA
    class Runner
      include Scenario::Actable

-      def rspec(*args)
+      def rspec(tty: false, tags: [], files: ['qa/specs/features'])
+        args = []
+        args << '--tty' if tty
+        tags.to_a.each do |tag|
+          args << ['-t', tag.to_s]
+        end
+        args << files
+
        RSpec::Core::Runner.run(args.flatten, $stderr, $stdout).tap do |status|
          abort if status.nonzero?
        end