Simplify test scripts

testdouble · Sep 25, 2024 · fa1f2ee · fa1f2ee
1 parent d0d4a91
commit fa1f2ee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/script/test b/script/test
@@ -9,7 +9,7 @@ bundle
 
 echo "---> Running tests"
 bundle exec rake
-./script/test_example_app $@
+BUNDLE_GEMFILE="${1-Gemfile}" ./script/test_example_app
 
 bundle exec rake test
 

diff --git a/script/test_example_app b/script/test_example_app
@@ -2,27 +2,17 @@
 
 set -e
 
-gemfile="${1-Gemfile}"
-
-run_example_tests() {
-  bundle
-  yarn install
-
-  # test a normal test run
-  bundle exec rake db:test:prepare
-  NODE_OPTIONS=--openssl-legacy-provider RAILS_ENV=test bundle exec rake assets:precompile
-  bundle exec rake cypress:run
-
-  # test that passing options works (by printing help)
-  if ! bundle exec rake cypress:run CYPRESS_RAILS_CYPRESS_OPTS="-h" | grep -q "Usage: cypress run \[options\]"; then
-    echo "Failed to pass options to cypress run"
-    exit 1
-  fi
-}
-
-
 cd example
-
-echo "---> Running example tests with ${gemfile}"
-BUNDLE_GEMFILE=$gemfile run_example_tests
-
+bundle
+yarn install
+
+# test a normal test run
+bundle exec rake db:test:prepare
+NODE_OPTIONS=--openssl-legacy-provider RAILS_ENV=test bundle exec rake assets:precompile
+bundle exec rake cypress:run
+
+# test that passing options works (by printing help)
+if ! bundle exec rake cypress:run CYPRESS_RAILS_CYPRESS_OPTS="-h" | grep -q "Usage: cypress run \[options\]"; then
+  echo "Failed to pass options to cypress run"
+  exit 1
+fi