Merge pull request #219 from SuperGoodSoft/fix-ci

Fix postgres tests (updated commit)

Author: jarednorman

README.md

@@ -1,6 +1,6 @@
 # Solidus Paypal Commerce Platform
 
-[![Workflow Name](https://github.com/solidusio/solidus_starter_frontend/actions/workflows/test.yml/badge.svg)](https://github.com/solidusio/solidus_starter_frontend/actions/workflows/<WORKFLOW_FILE>)
+[![Workflow Name](https://github.com/solidusio/solidus_paypal_commerce_platform/actions/workflows/test.yml/badge.svg)](https://github.com/solidusio/solidus_paypal_commerce_platform/actions/workflows/<WORKFLOW_FILE>)
 [![codecov](https://codecov.io/gh/solidusio-contrib/solidus_paypal_commerce_platform/branch/main/graph/badge.svg?token=J8HCLE0CZW)](https://codecov.io/gh/solidusio-contrib/solidus_paypal_commerce_platform)
 
 The official PayPal integration of Solidus.

bin/dummy-app

@@ -15,7 +15,7 @@ test "$DB" = "sqlite" && export DB="sqlite3"
 
 rm -rf ./dummy-app
 rails_version=`bundle exec ruby -e'require "rails"; puts Rails.version'`
-rails _${rails_version}_ new dummy-app \
+bundle exec rails _${rails_version}_ new dummy-app \
   --database=${DB:-sqlite3} \
   --skip-git \
   --skip-keeps \
@@ -29,6 +29,25 @@ if [ ! -d "dummy-app" ]; then
 fi
 
 cd ./dummy-app
+
+if [ -n "$DB_HOST" ]; then
+  echo "~~~> Configuring database.yml for DB_HOST=$DB_HOST"
+  ruby -i -pe '
+    if $_ =~ /^  (pool|max_connections):/
+      $_ += "  host: <%= ENV.fetch(\"DB_HOST\", \"localhost\") %>\n"
+      $_ += "  username: <%= ENV[\"DB_USERNAME\"] %>\n"
+    end
+  ' config/database.yml
+fi
+
+echo "Generating manifest file"
+mkdir -p app/assets/config
+cat <<MANIFESTJS > app/assets/config/manifest.js
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
+MANIFESTJS
+
 unbundled bundle add solidus --github solidusio/solidus --branch "${BRANCH:-main}" --version '> 0.a'
 unbundled bundle exec rake db:drop db:create
 unbundled bundle exec rails generate solidus:install --auto-accept --payment-method=none --no-seed --no-sample "$@"

bin/sandbox

@@ -1,61 +1,99 @@
 #!/usr/bin/env bash
 
 set -e
+test -z "${DEBUG+empty_string}" || set -x
 
-case "$DB" in
-postgres|postgresql)
-  RAILSDB="postgresql"
-  ;;
-mysql)
-  RAILSDB="mysql"
-  ;;
-sqlite|'')
-  RAILSDB="sqlite3"
-  ;;
-*)
-  echo "Invalid DB specified: $DB"
-  exit 1
-  ;;
-esac
+test "$DB" = "sqlite" && export DB="sqlite3"
 
-if [ ! -z $SOLIDUS_BRANCH ]
+if [ -z "$SOLIDUS_BRANCH" ]
 then
-  BRANCH=$SOLIDUS_BRANCH
-else
-  BRANCH="main"
+  echo "~~> Use 'export SOLIDUS_BRANCH=[main|v4.0|...]' to control the Solidus branch"
+  SOLIDUS_BRANCH="main"
 fi
-
-extension_name="solidus_paypal_commerce_platform"
+echo "~~> Using branch $SOLIDUS_BRANCH of solidus"
 
 # Stay away from the bundler env of the containing extension.
 function unbundled {
-  ruby -rbundler -e'b = proc {system *ARGV}; Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&b) : Bundler.with_clean_env(&b)' -- "$@"
+  ruby -rbundler -e'
+      Bundler.with_unbundled_env {system *ARGV}' -- \
+        env BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES=true $@
 }
 
+echo "~~~> Removing the old sandbox"
 rm -rf ./sandbox
-rails new sandbox \
-  --database="$RAILSDB" \
+
+echo "~~~> Creating a pristine Rails app"
+rails_version=`bundle exec ruby -e'require "rails"; puts Rails.version'`
+
+# --skip-solid was added in Rails 8.0 to skip Solid Cache, Queue, and Cable
+# setup which is unnecessary for the sandbox and fails during generation.
+rails_major=$(echo "$rails_version" | cut -d. -f1)
+skip_solid_flag=""
+if [ "$rails_major" -ge 8 ] 2>/dev/null; then
+  skip_solid_flag="--skip-solid"
+fi
+
+bundle exec rails _${rails_version}_ new sandbox \
+  --database="${DB:-sqlite3}" \
   --skip-git \
   --skip-keeps \
   --skip-rc \
   --skip-bootsnap \
-  --skip-test
+  --skip-test \
+  $skip_solid_flag
 
 if [ ! -d "sandbox" ]; then
   echo 'sandbox rails application failed'
   exit 1
 fi
 
+echo "~~~> Adding solidus (with i18n) to the Gemfile"
 cd ./sandbox
-unbundled bundle add solidus --github solidusio/solidus --branch "${BRANCH:-main}" --version '> 0.a'
+
+if [ -n "$DB_HOST" ]; then
+  echo "~~~> Configuring database.yml for DB_HOST=$DB_HOST"
+  ruby -i -pe '
+    if $_ =~ /^  pool:/
+      $_ += "  host: <%= ENV.fetch(\"DB_HOST\", \"localhost\") %>\n"
+      $_ += "  username: <%= ENV[\"DB_USERNAME\"] %>\n"
+    end
+  ' config/database.yml
+fi
+
+cat <<RUBY >> Gemfile
+gem 'solidus', github: 'solidusio/solidus', branch: '$SOLIDUS_BRANCH'
+gem 'rails-i18n'
+gem 'solidus_i18n'
+gem 'solidus_auth_devise', github: "solidusio/solidus_auth_devise"
+
+# Ruby 4.0 removed benchmark from default gems, but ActiveSupport requires it.
+gem 'benchmark' if RUBY_VERSION >= '4.0'
+
+group :test, :development do
+  platforms :mri do
+    gem 'pry-byebug'
+  end
+end
+RUBY
+
+echo "Generating manifest file"
+mkdir -p app/assets/config
+cat <<MANIFESTJS > app/assets/config/manifest.js
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
+MANIFESTJS
+
+unbundled bundle install --gemfile Gemfile
+
 unbundled bundle exec rake db:drop db:create
-unbundled bundle exec rails generate solidus:install --payment-method=none --auto-accept "$@"
-unbundled bundle add ${extension_name} --path '../'
-unbundled bundle exec rails generate ${extension_name}:install --frontend=starter --migrate=true
+
+export FRONTEND="$PWD/../template.rb"
+unbundled bundle exec rails generate solidus:install \
+  --auto-accept \
+  $@
 
 echo
-echo "🚀 Sandbox app successfully created for ${extension_name}!"
-echo "🚀 Using $RAILSDB and Solidus $BRANCH"
-echo "🚀 Use 'export DB=[postgres|mysql|sqlite]' to control the DB adapter"
-echo "🚀 Use 'export SOLIDUS_BRANCH=<BRANCH-NAME>' to control the Solidus version"
-echo "🚀 This app is intended for test purposes."
+echo "🚀 Sandbox app successfully created for the storefront!"
+echo "🚀 Use 'export DB=[postgres|mysql|sqlite3]' to control the DB adapter"
+echo "🧪 This app is intended for test purposes."