Merge pull request #2 from git-command/vs-fix-gh-workflows

Fix GitHub testing workflows

Author: codenamev

.github/workflows/multi-ruby-tests.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        ruby: ['2.6.9', '2.7.5', '3.0.3', '3.1.0 ']
+        ruby: ['2.7.5', '3.0.3', '3.1.0 ']
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2

spec/features/register_commands_in_workflow_file_spec.rb

@@ -39,8 +39,8 @@
       FileUtils.cp "#{fixtures_dir}/hello_command.rb", "#{project_dir}/.git-commands/hello.rb"
 
       run_system_call "#{git_cmd_path} help"
-      expect(last_command.output).
-        to include("faq, hello")
+      expect(last_command.output).to include("faq")
+      expect(last_command.output).to include("hello")
 
       run_system_call "#{git_cmd_path} faq --help"
       expect(last_command.output).
@@ -55,7 +55,8 @@
       FileUtils.rm_rf "#{project_dir}/.git-commands"
       run_system_call "#{git_cmd_path} help"
 
-      expect(last_command.output).to_not include("hello, faq")
+      expect(last_command.output).to_not include("faq")
+      expect(last_command.output).to_not include("hello")
     end
   end
 end

spec/features/run_plugin_command_spec.rb

@@ -22,7 +22,7 @@
     end
 
     it "outputs the current changes" do
-      run_system_call "#{git_cmd_path} git-helpers:current"
+      run_system_call "cd #{project_dir} && #{git_cmd_path} git-helpers:current"
       expect(last_command.output).
         to include("Updated README")
     end

spec/fixtures/plugins/git_helpers.rb

@@ -4,7 +4,7 @@
 
 command :current do |cmd|
   cmd.summary "Outputs all commits not on the base branch"
-  cmd.argument :base_branch, default: "master"
+  cmd.argument :base_branch, default: "main"
 
   cmd.on_run do |options|
     current_branch = system.run "git rev-parse --abbrev-ref HEAD"

spec/lib/git_commander/command/loaders/raw_spec.rb

@@ -125,7 +125,7 @@
 
         loader.load(raw_command_string)
 
-        expect(loader.result.errors.size).to be_zero
+        expect(loader.result.errors).to_not be_any
         expect(loader.result.plugins.size).to eq 1
         expect(loader.result.commands.size).to eq 2
 

spec/support/command_helpers.rb

@@ -5,7 +5,16 @@
 require "open3"
 
 module CommandHelpers
-  Command = Struct.new(:exit_status, :output, :error)
+  class SystemCallFailure < StandardError; end
+  Command = Struct.new(:exit_status, :output, :error) do
+    def failed?
+      exit_status != 0 && !error.to_s.empty?
+    end
+
+    def error_message_with_exit_status
+      "[exit status: #{exit_status}] #{error}"
+    end
+  end
 
   def fixtures_dir
     File.expand_path "#{Dir.pwd}/spec/fixtures"
@@ -31,6 +40,7 @@ def git_cmd_path
   def setup_environment
     setup_home_dir
     setup_project_dir
+    initialize_git_user
     initialize_git_repo
   end
 
@@ -48,21 +58,26 @@ def setup_project_dir
     FileUtils.mkdir_p project_dir
   end
 
+  def initialize_git_user
+    run_system_call 'git config --global user.name "GitHub Actions Bot"', fail_on_error: true
+    run_system_call 'git config --global user.email "<>"', fail_on_error: true
+  end
+
   def initialize_git_repo
-    run_system_call "touch README.md"
-    run_system_call "git init ."
-    run_system_call "git add README.md"
-    run_system_call 'git commit -am "Initial commit"'
+    run_system_call "touch README.md", fail_on_error: true
+    run_system_call "git init -b main .", fail_on_error: true
+    run_system_call "git add README.md", fail_on_error: true
+    run_system_call 'git commit -am "Initial commit"', fail_on_error: true
   end
 
-  def setup_working_branch(branch = "master")
-    run_system_call "git checkout -b #{branch}"
+  def setup_working_branch(branch = "main")
+    run_system_call "git checkout -b #{branch}", fail_on_error: true
   end
 
   def make_commit(message = "Changes")
-    run_system_call 'echo "Changes" >> README.md'
-    run_system_call "git add README.md"
-    run_system_call "git commit -am \"#{message}\""
+    run_system_call 'echo "Changes" >> README.md', fail_on_error: true
+    run_system_call "git add README.md", fail_on_error: true
+    run_system_call "git commit -am \"#{message}\"", fail_on_error: true
   end
 
   def command_helpers_teardown
@@ -89,16 +104,20 @@ def capture_io
     $stderr = orig_stderr
   end
 
-  def run_system_call(command_string)
+  def run_system_call(command_string, fail_on_error: false)
     last_command.output, last_command.error, last_command.exit_status = run_in_test_context do
       Open3.capture3(command_string)
     end
+
+    return unless fail_on_error && last_command.failed?
+
+    raise SystemCallFailure, <<~ERROR_MSG
+      System call '#{command_string}' failed to run: #{last_command.error_message_with_exit_status}
+    ERROR_MSG
   end
 
-  def run_in_test_context(&_block)
-    Dir.chdir project_dir do
-      yield
-    end
+  def run_in_test_context(&block)
+    Dir.chdir(project_dir, &block)
   end
 
   private