Refactor bundler-app helpers and test command

Author: AlexB52

bin/test/bundler-app

@@ -1,7 +1,14 @@
 #!/usr/bin/env bash
 
+FOLDER="features/bundler-app"
+
 bundle install
 bundle exec rake build
-cp -R features/support features/bundler-app/retest
-ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/bundler-app/retest.gem
-docker compose -f features/bundler-app/docker-compose.yml up --build --exit-code-from retest
+# cp -R features/support features/bundler-app/retest
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} "$FOLDER/retest.gem"
+
+if [[ "$1" == "--no-build" ]]; then
+	docker compose -f "$FOLDER/docker-compose.yml" up --exit-code-from retest
+else
+	docker compose -f "$FOLDER/docker-compose.yml" up --build --exit-code-from retest
+fi

features/bundler-app/retest/retest_test.rb

@@ -4,6 +4,3 @@
 require_relative 'retest_test/file_changes_test'
 
 $stdout.sync = true
-
-include FileHelper
-

features/bundler-app/retest/retest_test/file_changes_test.rb

@@ -1,4 +1,8 @@
 class FileChangesTest < Minitest::Test
+  include FileHelper
+  include OutputHelper
+  include CommandHelper
+
   def setup
     @command = 'retest'
   end
@@ -10,7 +14,7 @@ def teardown
   def test_start_retest
     launch_retest @command
 
-    assert_match <<~EXPECTED, @output.read
+    assert_match <<~EXPECTED, read_output
       Launching Retest...
       Ready to refactor! You can make file changes now
     EXPECTED
@@ -21,25 +25,29 @@ def test_modifying_existing_file
 
     modify_file('lib/bundler_app/bottles.rb')
 
-    assert_match "Test file: test/bundler_app/test_bottles.rb", @output.read
-    assert_match "12 runs, 12 assertions, 0 failures, 0 errors, 0 skips", @output.read
+    read_output do |output|
+      assert_match "Test file: test/bundler_app/test_bottles.rb", output
+      assert_match "12 runs, 12 assertions, 0 failures, 0 errors, 0 skips", output
+    end
   end
 
   def test_modifying_existing_test_file
     launch_retest @command
 
     modify_file('test/bundler_app/test_bottles.rb')
 
-    assert_match "Test file: test/bundler_app/test_bottles.rb", @output.read
-    assert_match "12 runs, 12 assertions, 0 failures, 0 errors, 0 skips", @output.read
+    read_output do |output|
+      assert_match "Test file: test/bundler_app/test_bottles.rb", output
+      assert_match "12 runs, 12 assertions, 0 failures, 0 errors, 0 skips", output
+    end
   end
 
   def test_creating_a_new_test_file
     launch_retest @command
 
     create_file 'test/bundler_app/test_foo.rb'
 
-    assert_match "Test file: test/bundler_app/test_foo.rb", @output.read
+    assert_match "Test file: test/bundler_app/test_foo.rb", read_output
 
   ensure
     delete_file 'test/bundler_app/test_foo.rb'
@@ -49,18 +57,18 @@ def test_creating_a_new_file
     launch_retest @command
 
     create_file 'lib/bundler_app/foo.rb'
-    assert_match <<~EXPECTED, @output.read
+    assert_match <<~EXPECTED, read_output
       FileNotFound - Retest could not find a matching test file to run.
     EXPECTED
 
     create_file 'test/bundler_app/test_foo.rb'
-    assert_match "Test file: test/bundler_app/test_foo.rb", @output.read
+    assert_match "Test file: test/bundler_app/test_foo.rb", read_output
 
     modify_file('lib/bundler_app/bottles.rb')
-    assert_match "Test file: test/bundler_app/test_bottles.rb", @output.read
+    assert_match "Test file: test/bundler_app/test_bottles.rb", read_output
 
     modify_file('lib/bundler_app/foo.rb')
-    assert_match "Test file: test/bundler_app/test_foo.rb", @output.read
+    assert_match "Test file: test/bundler_app/test_foo.rb", read_output
 
   ensure
     delete_file 'lib/bundler_app/foo.rb'
@@ -74,7 +82,7 @@ def test_untracked_file
     launch_retest @command
 
     modify_file 'lib/bundler_app/foo.rb'
-    assert_match "Test file: test/bundler_app/test_foo.rb", @output.read
+    assert_match "Test file: test/bundler_app/test_foo.rb", read_output
 
   ensure
     delete_file 'lib/bundler_app/foo.rb'

features/bundler-app/retest/support/test_helper.rb

@@ -1,4 +1,22 @@
-require_relative 'output_file'
+# Can be updated to all feature repositories with
+# $ bin/test/reset_helpers
+
+module OutputHelper
+  def read_output(output = @output)
+    result = ""
+    loop do
+      result += output.read_nonblock(1024)
+    rescue IO::WaitReadable
+      break
+    end
+
+    if block_given?
+      yield result
+    else
+      result
+    end
+  end
+end
 
 module FileHelper
   def default_sleep_seconds
@@ -41,19 +59,21 @@ def rename_file(path, new_path)
   end
 end
 
-def launch_retest(command, sleep_seconds: launch_sleep_seconds)
-  @rd, @input = IO.pipe
-  @output = OutputFile.new
-  @pid = Process.spawn command, out: @output.path, in: @rd
-  sleep sleep_seconds
-end
+module CommandHelper
+  def launch_retest(command, sleep_seconds: Float(ENV.fetch('LAUNCH_SLEEP_SECONDS', 1.5)))
+    require 'open3'
+    @input, @output, @stderr, @wait_thr = Open3.popen3(command)
+    @pid = @wait_thr[:pid]
+    sleep sleep_seconds
+  end
 
-def end_retest(file = nil, pid = nil)
-  @output&.delete
-  @rd&.close
-  @input&.close
-  if @pid
-    Process.kill('SIGHUP', @pid)
-    Process.detach(@pid)
+  def end_retest
+    @input&.close
+    @stderr&.close
+    @output&.close
+    if @pid
+      Process.kill('SIGHUP', @pid)
+      Process.detach(@pid)
+    end
   end
 end