From 7c0ece3dfbcd553b19e6a96cdac80c660651f5b4 Mon Sep 17 00:00:00 2001
From: Raphael Reitzig <4246780+reitzig@users.noreply.github.com>
Date: Mon, 26 Jun 2023 09:00:24 +0200
Subject: [PATCH] fix(test): Move local test to more current fish ...

... by means of using a more current OS, and
fix a test helper that used a feature now removed from fish.
---
 .github/workflows/test.yml       |  2 +-
 test/Dockerfile                  | 12 +++++++-----
 test/features/support/helpers.rb |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 274ea9e..5ee35a6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - 'ubuntu-22.04'
+          - 'ubuntu-latest'
           - 'macos-latest'
     steps:
       - uses: actions/checkout@v3
diff --git a/test/Dockerfile b/test/Dockerfile
index 309e466..bc0d1e1 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -1,15 +1,17 @@
-FROM ruby:2.7-slim-buster
+FROM ubuntu
 
 # Install dependencies
 RUN apt-get update \
  && apt-get -y install \
-        fish \
+        build-essential \
         curl \
+        fish \
+        ruby \
+        ruby-dev \
         unzip \
         zip \
-        ruby-dev \
-        build-essential \
- && apt-get clean
+ && apt-get clean \
+ && gem install bundler
 
 WORKDIR app
 COPY test/Gemfile ./
diff --git a/test/features/support/helpers.rb b/test/features/support/helpers.rb
index 4ea155c..1b36c84 100644
--- a/test/features/support/helpers.rb
+++ b/test/features/support/helpers.rb
@@ -64,7 +64,7 @@ def run_fish_command(cmd)
     end.to_h
 
     out, status = Open3.capture2e(<<~FISH
-      fish -c '#{cmd} > #{files[:stdout]} ^ #{files[:stderr]}; \
+      fish -c '#{cmd} > #{files[:stdout]} 2> #{files[:stderr]}; \
                echo $status > #{files[:status]}; \
                env > #{files[:env]}; \
               '