better code for checking if bundle exec is needed

Author: stefannibrasil

spec/support/acceptance/helpers/step_helpers.rb

@@ -92,11 +92,7 @@ def create_rails_application
     end
 
     def rails_new_command
-      if ruby_gt_4_0?
-        "rails new #{fs.project_directory} --database=#{database.adapter_name} --skip-bundle --skip-javascript --no-rc --skip-bootsnap"
-      else
-        "bundle exec rails new #{fs.project_directory} --database=#{database.adapter_name} --skip-bundle --skip-javascript --no-rc --skip-bootsnap"
-      end
+      "#{additional_command} rails new #{fs.project_directory} --database=#{database.adapter_name} --skip-bundle --skip-javascript --no-rc --skip-bootsnap"
     end
 
     def configure_routes
@@ -130,5 +126,11 @@ def run_rspec_tests(*paths)
     def run_rspec_suite
       run_rake_tasks('spec', env: { SPEC_OPTS: '-fd' })
     end
+
+    def additional_command
+      unless ruby_gt_4_0?
+        'bundle exec'
+      end
+    end
   end
 end

spec/support/unit/rails_application.rb

@@ -93,11 +93,7 @@ def rails_new
     end
 
     def rails_new_command
-      if ruby_gt_4_0?
-        "rails new #{fs.project_directory} --database=#{database.adapter_name} --skip-bundle --skip-javascript --no-rc --skip-bootsnap"
-      else
-        "bundle exec rails new #{fs.project_directory} --database=#{database.adapter_name} --skip-bundle --skip-javascript --no-rc --skip-bootsnap"
-      end
+      "#{additional_command} rails new #{fs.project_directory} --database=#{database.adapter_name} --skip-bundle --skip-javascript --no-rc --skip-bootsnap"
     end
 
     def fix_available_locales_warning
@@ -150,21 +146,13 @@ class DevelopmentRecord < ActiveRecord::Base
 
     def add_action_text_migration
       fs.within_project do
-        if ruby_gt_4_0?
-          run_command! 'rake action_text:install:migrations'
-        else
-          run_command! 'bundle exec rake action_text:install:migrations'
-        end
+        run_command! "#{additional_command} rake action_text:install:migrations"
       end
     end
 
     def add_active_storage_migration
       fs.within_project do
-        if ruby_gt_4_0?
-          run_command! 'rake active_storage:install:migrations'
-        else
-          run_command! 'bundle exec rake active_storage:install:migrations'
-        end
+        run_command! "#{additional_command} rake active_storage:install:migrations"
       end
     end
 
@@ -182,28 +170,15 @@ def load_environment
     end
 
     def run_migrations
-      if ruby_gt_4_0?
-        fs.within_project do
-          run_command! 'rake db:drop:all'
-          run_command! 'rake db:create RAILS_ENV=test'
-          run_command! 'rake db:create RAILS_ENV=development'
-          run_command! 'rake db:create RAILS_ENV=production'
-        end
-
-        fs.within_project do
-          run_command! 'rake db:migrate'
-        end
-      else
-        fs.within_project do
-          run_command! 'bundle exec rake db:drop:all'
-          run_command! 'bundle exec rake db:create RAILS_ENV=test'
-          run_command! 'bundle exec rake db:create RAILS_ENV=development'
-          run_command! 'bundle exec rake db:create RAILS_ENV=production'
-        end
-
-        fs.within_project do
-          run_command! 'bundle exec rake db:migrate'
-        end
+      fs.within_project do
+        run_command! "#{additional_command} rake db:drop:all"
+        run_command! "#{additional_command} rake db:create RAILS_ENV=test"
+        run_command! "#{additional_command} rake db:create RAILS_ENV=development"
+        run_command! "#{additional_command} rake db:create RAILS_ENV=production"
+      end
+
+      fs.within_project do
+        run_command! "#{additional_command} rake db:migrate"
       end
     end
 
@@ -225,5 +200,11 @@ def run_command!(*args)
     def rails_version
       bundle.version_of('rails')
     end
+
+    def additional_command
+      unless ruby_gt_4_0?
+        'bundle exec'
+      end
+    end
   end
 end