From c553e9ce845cfba54a0f94002c410ec7c6fae81d Mon Sep 17 00:00:00 2001 From: Alexandre Barret Date: Sun, 26 Jan 2025 16:26:22 +1300 Subject: [PATCH] Refactor test binaries to accept --nobuild option --- bin/test/hanami-app | 18 +++++++++++++----- bin/test/rails-app | 13 ++++++++++--- bin/test/rspec-rails | 13 ++++++++++--- bin/test/ruby-bare | 13 ++++++++++--- 4 files changed, 43 insertions(+), 14 deletions(-) diff --git a/bin/test/hanami-app b/bin/test/hanami-app index 0338bfca..cc8389e1 100755 --- a/bin/test/hanami-app +++ b/bin/test/hanami-app @@ -1,9 +1,17 @@ #!/usr/bin/env bash +FOLDER="features/hanami-app" + bundle install bundle exec rake build -cp -R features/support features/hanami-app/retest -ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/hanami-app/retest.gem -docker compose -f features/hanami-app/docker-compose.yml build -docker compose -f features/hanami-app/docker-compose.yml run retest sh bin/test_setup -docker compose -f features/hanami-app/docker-compose.yml up --exit-code-from retest \ No newline at end of file +cp -R features/support $FOLDER/retest +ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem + +if [[ "$1" == "--nobuild" ]]; then + docker compose -f $FOLDER/docker-compose.yml run retest sh bin/test_setup + docker compose -f $FOLDER/docker-compose.yml up --exit-code-from retest +else + docker compose -f $FOLDER/docker-compose.yml build + docker compose -f $FOLDER/docker-compose.yml run retest sh bin/test_setup + docker compose -f $FOLDER/docker-compose.yml up --exit-code-from retest +fi diff --git a/bin/test/rails-app b/bin/test/rails-app index b3161bd6..6b7e66c7 100755 --- a/bin/test/rails-app +++ b/bin/test/rails-app @@ -1,7 +1,14 @@ #!/usr/bin/env bash +FOLDER="features/rails-app" + bundle install bundle exec rake build -cp -R features/support features/rails-app/retest -ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/rails-app/retest.gem -docker compose -f features/rails-app/docker-compose.yml up --build --exit-code-from retest \ No newline at end of file +cp -R features/support $FOLDER/retest +ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem + +if [[ "$1" == "--nobuild" ]]; 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 diff --git a/bin/test/rspec-rails b/bin/test/rspec-rails index 6790d7d8..c8893222 100755 --- a/bin/test/rspec-rails +++ b/bin/test/rspec-rails @@ -1,7 +1,14 @@ #!/usr/bin/env bash +FOLDER="features/rspec-rails" + bundle install bundle exec rake build -cp -R features/support features/rspec-rails/retest -ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/rspec-rails/retest.gem -docker compose -f features/rspec-rails/docker-compose.yml up --build --exit-code-from retest \ No newline at end of file +cp -R features/support $FOLDER/retest +ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem + +if [[ "$1" == "--nobuild" ]]; 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 diff --git a/bin/test/ruby-bare b/bin/test/ruby-bare index 2e0e844e..f091e183 100755 --- a/bin/test/ruby-bare +++ b/bin/test/ruby-bare @@ -1,7 +1,14 @@ #!/usr/bin/env bash +FOLDER="features/ruby-bare" + bundle install bundle exec rake build -cp -R features/support features/ruby-bare/retest -ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/ruby-bare/retest.gem -docker compose -f features/ruby-bare/docker-compose.yml up --build --exit-code-from retest \ No newline at end of file +cp -R features/support $FOLDER/retest +ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem + +if [[ "$1" == "--nobuild" ]]; 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