Merge pull request #750 from Fryguy/dummy_rails7

Update dummy app to Rails 7.0.8.4
ManageIQ · Aug 30, 2024 · 08097e7 · 08097e7
2 parents 3de3c4c + 77bea1a
commit 08097e7
Show file tree

Hide file tree

Showing 41 changed files with 172 additions and 228 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,7 +15,6 @@ jobs:
         - '3.0'
         - '3.1'
         rails-version:
-        - '6.1'
         - '7.0'
     services:
       postgres:

diff --git a/Gemfile b/Gemfile
@@ -16,9 +16,7 @@ require File.join(Bundler::Plugin.index.load_paths("bundler-inject")[0], "bundle
 minimum_version =
   case ENV.fetch('TEST_RAILS_VERSION', nil)
   when "7.0"
-    "~>7.0.8"
-  else
     # Default local bundling to use this version for generating migrations
-    "~>6.1.4"
+    "~>7.0.8"
   end
 gem "rails", minimum_version
diff --git a/spec/dummy/.gitattributes b/spec/dummy/.gitattributes
@@ -0,0 +1,7 @@
+# See https://git-scm.com/docs/gitattributes for more about git attribute files.
+
+# Mark the database schema as having been generated.
+db/schema.rb linguist-generated
+
+# Mark any vendored files as having been vendored.
+vendor/* linguist-vendored
diff --git a/spec/dummy/.gitignore b/spec/dummy/.gitignore
@@ -21,9 +21,11 @@
 # Ignore uploaded files in development.
 /storage/*
 !/storage/.keep
+/tmp/storage/*
+!/tmp/storage/
+!/tmp/storage/.keep
 
 /public/assets
-.byebug_history
 
 # Ignore master key for decrypting credentials and more.
 /config/master.key

diff --git a/spec/dummy/Rakefile b/spec/dummy/Rakefile
@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require_relative 'config/application'
+require_relative "config/application"
 
 Rails.application.load_tasks
diff --git a/spec/dummy/app/assets/stylesheets/application.css b/spec/dummy/app/assets/stylesheets/application.css
@@ -2,11 +2,11 @@
  * This is a manifest file that'll be compiled into application.css, which will include all the files
  * listed below.
  *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's
+ * Any CSS (and SCSS, if configured) file within this directory, lib/assets/stylesheets, or any plugin's
  * vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
  * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS
  * files in this directory. Styles in this file should be added after the last require_* statement.
  * It is generally better to create a new file per style scope.
  *

diff --git a/spec/dummy/app/javascript/channels/consumer.js b/spec/dummy/app/javascript/channels/consumer.js
diff --git a/spec/dummy/app/javascript/channels/index.js b/spec/dummy/app/javascript/channels/index.js
diff --git a/spec/dummy/app/javascript/packs/application.js b/spec/dummy/app/javascript/packs/application.js
diff --git a/spec/dummy/app/mailers/application_mailer.rb b/spec/dummy/app/mailers/application_mailer.rb
@@ -1,4 +1,4 @@
 class ApplicationMailer < ActionMailer::Base
-  default from: 'from@example.com'
-  layout 'mailer'
+  default from: "from@example.com"
+  layout "mailer"
 end
diff --git a/spec/dummy/app/models/application_record.rb b/spec/dummy/app/models/application_record.rb
@@ -1,3 +1,3 @@
 class ApplicationRecord < ActiveRecord::Base
-  self.abstract_class = true
+  primary_abstract_class
 end
diff --git a/spec/dummy/app/views/layouts/application.html.erb b/spec/dummy/app/views/layouts/application.html.erb
@@ -2,11 +2,11 @@
 <html>
   <head>
     <title>Dummy</title>
+    <meta name="viewport" content="width=device-width,initial-scale=1">
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
 
-    <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
   </head>
 
   <body>

diff --git a/spec/dummy/bin/rails b/spec/dummy/bin/rails
@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../config/application', __dir__)
-require_relative '../config/boot'
-require 'rails/commands'
+APP_PATH = File.expand_path("../config/application", __dir__)
+require_relative "../config/boot"
+require "rails/commands"
diff --git a/spec/dummy/bin/rake b/spec/dummy/bin/rake
@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-require_relative '../config/boot'
-require 'rake'
+require_relative "../config/boot"
+require "rake"
 Rake.application.run
diff --git a/spec/dummy/bin/setup b/spec/dummy/bin/setup
@@ -1,36 +1,33 @@
 #!/usr/bin/env ruby
-require 'fileutils'
+require "fileutils"
 
 # path to your application root.
-APP_ROOT = File.expand_path('..', __dir__)
+APP_ROOT = File.expand_path("..", __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
 end
 
 FileUtils.chdir APP_ROOT do
-  # This script is a way to setup or update your development environment automatically.
-  # This script is idempotent, so that you can run it at anytime and get an expectable outcome.
+  # This script is a way to set up or update your development environment automatically.
+  # This script is idempotent, so that you can run it at any time and get an expectable outcome.
   # Add necessary setup steps to this file.
 
-  puts '== Installing dependencies =='
-  system! 'gem install bundler --conservative'
-  system('bundle check') || system!('bundle install')
-
-  # Install JavaScript dependencies
-  # system('bin/yarn')
+  puts "== Installing dependencies =="
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?('config/database.yml')
-  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
+  # unless File.exist?("config/database.yml")
+  #   FileUtils.cp "config/database.yml.sample", "config/database.yml"
   # end
 
   puts "\n== Preparing database =="
-  system! 'bin/rails db:prepare'
+  system! "bin/rails db:prepare"
 
   puts "\n== Removing old logs and tempfiles =="
-  system! 'bin/rails log:clear tmp:clear'
+  system! "bin/rails log:clear tmp:clear"
 
   puts "\n== Restarting application server =="
-  system! 'bin/rails restart'
+  system! "bin/rails restart"
 end
diff --git a/spec/dummy/bin/yarn b/spec/dummy/bin/yarn
diff --git a/spec/dummy/config.ru b/spec/dummy/config.ru
@@ -1,5 +1,6 @@
 # This file is used by Rack-based servers to start the application.
 
-require_relative 'config/environment'
+require_relative "config/environment"
 
 run Rails.application
+Rails.application.load_server
diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb
@@ -1,19 +1,23 @@
-require_relative 'boot'
+require_relative "boot"
 
-require 'rails/all'
+require "rails/all"
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
 module Dummy
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults Rails::VERSION::STRING.to_f
 
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration can go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded after loading
-    # the framework and any gems in your application.
+    # Configuration for the application, engines, and railties goes here.
+    #
+    # These settings can be overridden in specific environments using the files
+    # in config/environments, which are processed later.
+    #
+    # config.time_zone = "Central Time (US & Canada)"
+    # config.eager_load_paths << Rails.root.join("extras")
 
     # HACK: Temporary override of the default setting until we can update the
     # migration specs to honor it.

diff --git a/spec/dummy/config/boot.rb b/spec/dummy/config/boot.rb
@@ -1,3 +1,3 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../../Gemfile", __dir__)
 
-require 'bundler/setup' # Set up gems listed in the Gemfile.
+require "bundler/setup" # Set up gems listed in the Gemfile.
diff --git a/spec/dummy/config/credentials.yml.enc b/spec/dummy/config/credentials.yml.enc
@@ -1 +1 @@
-oiIf1Y+qNWVE1jEKZ4/3Z65QM0K+10X5NxTYTGl+a8lVK+uzvZWieC2L8pY9Mr9APee6Q3sa2vYY/eZxmt8QroCs8IBC/PtS85WGS6gGNA6AJ2pTF3vae+ena4dWXjSWe2pDsgp1N+87qtSTfWHElVZ6v6iPqGcNryiI7BQRsfFk+ViAY57tW9o7nUKAA34TQeELiqTOwUPnCQGnpPc3X+rji+ZAaGPgUeXdWe187x0U8UBL7Hb805Dn2dDahnE3bgCE1lqOdvdsQVk5+mfxQ8wtg3PGba3hPDt/TNx4BnNfzYtmIXpKd8VGZnYs3Ltjd3ZV29Qy3SKp9Lrap2dTTNZ8+djGUJQbl2n7XX9zX4AM77GZ2ZARylQYJxJQykjpcnMd2SgVwfOX6PaiYnFihWpkaj6ag8eV6B5X--6kdjfr/7h6Czlc02--KnWFZqSVFBWitLLXyiUkvg==
+Yxkt5W1Zg072FWMc4rrotXZAhLf+tftpT0oyifNXWtku5z42ZVgFQz6OJzZ0JK1r3G0rYEe+UI9Z99c/SQRNK2/8eR1NcU/TeGwWRA5LbFHWz4bZNCmZxls3hHx4Poe/BMGEP8OhMb+R8pHpWzO8U4DwtUbyOJfFnBL+CCaMxiVnKweo1ooUGiZ/U4oYeIwszvbWxcROiWpnitJxwX+xgkeIXhFz1EDrScS45a75MJ3jTW3G2vEJtEHf8Xa1/+/hIjmfkv6v9p1UdX2ff7rlMJtsBkjL8tgJfVX6KGYyD3m3xb+Z8JkqJqZTg3RkV99YvW/4b304xamowtouAH1PJLdielZlRxYkUx1V1iUqYN2IYiO30J7dWljboQewcPJCBLjrPMFaznezIUSkvjvorQjj1HwUyP67sFbv--M74pk+55PaCnIJ9X--Fuq6lUqx7x/TYwWyALv3ZQ==
diff --git a/spec/dummy/config/environment.rb b/spec/dummy/config/environment.rb
@@ -1,5 +1,5 @@
 # Load the Rails application.
-require_relative 'application'
+require_relative "application"
 
 # Initialize the Rails application.
 Rails.application.initialize!
diff --git a/spec/dummy/config/environments/development.rb b/spec/dummy/config/environments/development.rb
@@ -1,8 +1,10 @@
+require "active_support/core_ext/integer/time"
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  # In the development environment your application's code is reloaded on
-  # every request. This slows down response time but is perfect for development
+  # In the development environment your application's code is reloaded any time
+  # it changes. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
@@ -12,15 +14,18 @@
   # Show full error reports.
   config.consider_all_requests_local = true
 
+  # Enable server timing
+  config.server_timing = true
+
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
-  if Rails.root.join('tmp', 'caching-dev.txt').exist?
+  if Rails.root.join("tmp/caching-dev.txt").exist?
     config.action_controller.perform_caching = true
     config.action_controller.enable_fragment_cache_logging = true
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
-      'Cache-Control' => "public, max-age=#{2.days.to_i}"
+      "Cache-Control" => "public, max-age=#{2.days.to_i}"
     }
   else
     config.action_controller.perform_caching = false
@@ -39,6 +44,12 @@
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
@@ -48,7 +59,9 @@
   # Raises error for missing translations.
   # config.i18n.raise_on_missing_translations = true
 
-  # Use an evented file watcher to asynchronously detect changes in source code,
-  # routes, locales, etc. This feature depends on the listen gem.
-  # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+  # Annotate rendered view with file names.
+  # config.action_view.annotate_rendered_view_with_filenames = true
+
+  # Uncomment if you wish to allow Action Cable access from any origin.
+  # config.action_cable.disable_request_forgery_protection = true
 end