refactor: Rearrange context blocks in run_spec.rb

Author: kaorukobo

spec/unit/run_spec.rb

@@ -26,7 +26,7 @@
       "[\e[32m#{uuid}\e[0m] Running \e[33;1mecho hello\e[0m\n",
       "[\e[32m#{uuid}\e[0m] \thello\n",
       "[\e[32m#{uuid}\e[0m] Finished in x seconds with exit status 0 " \
-      "(\e[32;1msuccessful\e[0m)\n"
+        "(\e[32;1msuccessful\e[0m)\n"
     ])
   end
 
@@ -48,87 +48,6 @@
     ])
   end
 
-  # TODO:
-  #   Move "with xxx option" context to the end of
-  #   the describe block to follow RSpec style guide.
-
-  context "with uuid option" do
-    it "runs command successfully with logging without uuid set globally" do
-      output = StringIO.new
-      command = TTY::Command.new(output: output, uuid: false)
-
-      command.run(:echo, "hello")
-      output.rewind
-
-      lines = output.readlines
-      lines.last.gsub!(/\d+\.\d+/, "x")
-      expect(lines).to eq(
-        generic_colored_log_lines(prefix: nil)
-      )
-    end
-
-    it "runs command successfully with logging without uuid set locally" do
-      output = StringIO.new
-      command = TTY::Command.new(output: output)
-
-      command.run(:echo, "hello", uuid: false)
-      output.rewind
-
-      lines = output.readlines
-      lines.last.gsub!(/\d+\.\d+/, "x")
-      expect(lines).to eq(
-        generic_colored_log_lines(prefix: nil)
-      )
-    end
-  end
-
-  context "with tag option" do
-    it "prints the tag set globally" do
-      output = StringIO.new
-      tag = "task"
-      command = TTY::Command.new(output: output, tag: tag)
-
-      command.run(:echo, "hello")
-
-      output.rewind
-      lines = output.readlines
-      lines.last.gsub!(/\d+\.\d+/, "x")
-      expect(lines).to eq(
-        generic_colored_log_lines(prefix: tag)
-      )
-    end
-
-    it "prints the tag set locally" do
-      output = StringIO.new
-      tag = "task"
-      command = TTY::Command.new(output: output)
-
-      command.run(:echo, "hello", tag: tag)
-
-      output.rewind
-      lines = output.readlines
-      lines.last.gsub!(/\d+\.\d+/, "x")
-      expect(lines).to eq(
-        generic_colored_log_lines(prefix: tag)
-      )
-    end
-
-    it "prints the tag even if uuid is set to false" do
-      output = StringIO.new
-      tag = "task"
-      command = TTY::Command.new(output: output, tag: tag, uuid: false)
-
-      command.run(:echo, "hello")
-
-      output.rewind
-      lines = output.readlines
-      lines.last.gsub!(/\d+\.\d+/, "x")
-      expect(lines).to eq(
-        generic_colored_log_lines(prefix: tag)
-      )
-    end
-  end
-
   it "runs command and fails with logging" do
     non_zero_exit = fixtures_path("non_zero_exit")
     output = StringIO.new
@@ -145,7 +64,7 @@
       "[\e[32m#{uuid}\e[0m] Running \e[33;1mruby #{non_zero_exit}\e[0m\n",
       "[\e[32m#{uuid}\e[0m] \tnooo\n",
       "[\e[32m#{uuid}\e[0m] Finished in x seconds with exit status 1 " \
-      "(\e[31;1mfailed\e[0m)\n"
+        "(\e[31;1mfailed\e[0m)\n"
     ])
   end
 
@@ -209,12 +128,12 @@
       "[\e[32m#{uuid}\e[0m] Running \e[33;1mruby #{phased_output}\e[0m\n",
       "[\e[32m#{uuid}\e[0m] \t..........\n",
       "[\e[32m#{uuid}\e[0m] Finished in x seconds with exit status 0 " \
-      "(\e[32;1msuccessful\e[0m)\n"
+        "(\e[32;1msuccessful\e[0m)\n"
     ])
   end
 
   it "does not persist environment variables",
-     unless: RSpec::Support::OS.windows? do
+    unless: RSpec::Support::OS.windows? do
     output = StringIO.new
     command = TTY::Command.new(output: output)
 
@@ -234,14 +153,91 @@
     expect(lines[0]).to include("Running \e[33;1mecho hello\e[0m\n")
   end
 
+  context "with uuid option" do
+    it "runs command successfully with logging without uuid set globally" do
+      output = StringIO.new
+      command = TTY::Command.new(output: output, uuid: false)
+
+      command.run(:echo, "hello")
+      output.rewind
+
+      lines = output.readlines
+      lines.last.gsub!(/\d+\.\d+/, "x")
+      expect(lines).to eq(
+        generic_colored_log_lines(prefix: nil)
+      )
+    end
+
+    it "runs command successfully with logging without uuid set locally" do
+      output = StringIO.new
+      command = TTY::Command.new(output: output)
+
+      command.run(:echo, "hello", uuid: false)
+      output.rewind
+
+      lines = output.readlines
+      lines.last.gsub!(/\d+\.\d+/, "x")
+      expect(lines).to eq(
+        generic_colored_log_lines(prefix: nil)
+      )
+    end
+  end
+
+  context "with tag option" do
+    it "prints the tag set globally" do
+      output = StringIO.new
+      tag = "task"
+      command = TTY::Command.new(output: output, tag: tag)
+
+      command.run(:echo, "hello")
+
+      output.rewind
+      lines = output.readlines
+      lines.last.gsub!(/\d+\.\d+/, "x")
+      expect(lines).to eq(
+        generic_colored_log_lines(prefix: tag)
+      )
+    end
+
+    it "prints the tag set locally" do
+      output = StringIO.new
+      tag = "task"
+      command = TTY::Command.new(output: output)
+
+      command.run(:echo, "hello", tag: tag)
+
+      output.rewind
+      lines = output.readlines
+      lines.last.gsub!(/\d+\.\d+/, "x")
+      expect(lines).to eq(
+        generic_colored_log_lines(prefix: tag)
+      )
+    end
+
+    it "prints the tag even if uuid is set to false" do
+      output = StringIO.new
+      tag = "task"
+      command = TTY::Command.new(output: output, tag: tag, uuid: false)
+
+      command.run(:echo, "hello")
+
+      output.rewind
+      lines = output.readlines
+      lines.last.gsub!(/\d+\.\d+/, "x")
+      expect(lines).to eq(
+        generic_colored_log_lines(prefix: tag)
+      )
+    end
+  end
+
   # Generates the expected log lines in colored mode, with/without `[prefix]`
   def generic_colored_log_lines(prefix: nil)
     if prefix
       [
         "[\e[32m#{prefix}\e[0m] Running \e[33;1mecho hello\e[0m\n",
         "[\e[32m#{prefix}\e[0m] \thello\n",
         "[\e[32m#{prefix}\e[0m] Finished in x seconds with exit status 0 " \
-        "(\e[32;1msuccessful\e[0m)\n"
+          "(\e[32;1msuccessful\e[0m)\n"
       ]
     else
       [