Update the watchexec feature specs

Author: AlexB52

features/watchexec-ruby-app/Dockerfile

@@ -1,13 +1,15 @@
-FROM ruby:2.5.9-alpine3.13
+FROM rust:1.83.0-slim-bullseye
 
-ARG BUILD_PACKAGES="build-base git"
+ARG BUILD_PACKAGES="build-essentials git"
 
-RUN apk update && \
-    apk upgrade && \
-    apk add --update --no-cache $BUILD_PACKAGES && \
-    rm -rf /var/cache/apk/*
+RUN apt-get update -qq && \
+    apt-get install --no-install-recommends -y build-essential git ruby ruby-dev
+
+RUN cargo install cargo-binstall
+RUN cargo binstall watchexec-cli
 
 # throw errors if Gemfile has been modified since Gemfile.lock
+RUN gem install bundler
 RUN bundle config --global frozen 1
 
 WORKDIR /usr/src/app
@@ -18,11 +20,8 @@ ENV BUNDLER_VERSION 2.1
 ENV GEM_HOME="/usr/local/bundle"
 ENV PATH $GEM_HOME/bin:$GEM_HOME/gems/bin:$PATH
 
-COPY watchexec /usr/bin/
-
 COPY Gemfile Gemfile.lock retest.gem ./
-RUN gem update --system 3.2.3
-RUN gem install bundler -v 2.1.4
+
 RUN bundle config --delete frozen
 RUN bundle install
 RUN gem install retest.gem

features/watchexec-ruby-app/retest/retest_test.rb

@@ -1,4 +1,5 @@
 require 'retest'
+require 'byebug'
 require_relative 'support/test_helper'
 require 'minitest/autorun'
 require_relative 'retest_test/file_changes_test'
@@ -8,6 +9,7 @@
 $stdout.sync = true
 
 include FileHelper
+include OutputHelper
 
 module WatchexecRuby
   COMMAND = 'retest'

features/watchexec-ruby-app/retest/retest_test/file_changes_test.rb

@@ -7,7 +7,7 @@ def teardown
     def test_start_retest
       launch_retest(COMMAND)
 
-      assert_match <<~EXPECTED, @output.read
+      assert_match <<~EXPECTED, read_output
         Setup identified: [RUBY]. Using command: 'bundle exec ruby <test>'
         Watcher: [WATCHEXEC]
         Launching Retest...
@@ -16,50 +16,54 @@ def test_start_retest
     end
 
     def test_modifying_existing_file
-      launch_retest @command
+      launch_retest(COMMAND)
 
       modify_file('lib/bottles.rb')
 
-      assert_match "Test file: test/bottles_test.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/bottles_test.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
+      launch_retest(COMMAND)
 
       modify_file('test/bottles_test.rb')
 
-      assert_match "Test file: test/bottles_test.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/bottles_test.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
+      launch_retest(COMMAND)
 
       create_file 'foo_test.rb'
 
-      assert_match "Test file: foo_test.rb", @output.read
+      assert_match "Test file: foo_test.rb", read_output
 
     ensure
       delete_file 'foo_test.rb'
     end
 
     def test_creating_a_new_file
-      launch_retest @command
+      launch_retest(COMMAND)
 
       create_file '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 'foo_test.rb'
-      assert_match "Test file: foo_test.rb", @output.read
+      assert_match "Test file: foo_test.rb", read_output
 
       modify_file('lib/bottles.rb')
-      assert_match "Test file: test/bottles_test.rb", @output.read
+      assert_match "Test file: test/bottles_test.rb", read_output
 
       modify_file('foo.rb')
-      assert_match "Test file: foo_test.rb", @output.read
+      assert_match "Test file: foo_test.rb", read_output
 
     ensure
       delete_file 'foo.rb'
@@ -70,10 +74,10 @@ def test_untracked_file
       create_file 'foo.rb', should_sleep: false
       create_file 'foo_test.rb', should_sleep: false
 
-      launch_retest @command
+      launch_retest(COMMAND)
 
       modify_file 'foo.rb'
-      assert_match "Test file: foo_test.rb", @output.read
+      assert_match "Test file: foo_test.rb", read_output
 
     ensure
       delete_file 'foo.rb'

features/watchexec-ruby-app/retest/retest_test/matching_unmatching_command_test.rb

@@ -10,10 +10,10 @@ def test_displaying_options_on_matching_command
       launch_retest(COMMAND)
 
       create_file 'foo_test.rb'
-      assert_match "Test file: foo_test.rb", @output.read
+      assert_match "Test file: foo_test.rb", read_output
 
       modify_file('lib/bottles.rb')
-      assert_match <<~EXPECTED.chomp, @output.read
+      assert_match <<~EXPECTED.chomp, read_output
         We found few tests matching: lib/bottles.rb
 
         [0] - test/bottles_test.rb
@@ -28,7 +28,7 @@ def test_displaying_options_on_matching_command
       @input.write "2\n"
       wait
 
-      assert_match "Test file: foo_test.rb", @output.read
+      assert_match "Test file: foo_test.rb", read_output
 
     ensure
       delete_file 'foo_test.rb'

features/watchexec-ruby-app/retest/support/output_file.rb

@@ -1,7 +1,22 @@
 # Can be updated to all feature repositories with
 # $ bin/test/reset_helpers
 
-require_relative 'output_file'
+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
@@ -45,18 +60,19 @@ def rename_file(path, new_path)
 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
+  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
+def end_retest
   @input&.close
+  @stderr&.close
+  @output&.close
   if @pid
     Process.kill('SIGHUP', @pid)
     Process.detach(@pid)
   end
 end
+