diff --git a/Appraisals b/Appraisals index fe8d666..857d069 100644 --- a/Appraisals +++ b/Appraisals @@ -1,13 +1,13 @@ # frozen_string_literal: true appraise "rails-7" do - gem "rails", github: "rails/rails", branch: "7-0-stable" + gem "railties", github: "rails/rails", branch: "7-0-stable" end appraise "rails-7-1" do - gem "rails", github: "rails/rails", branch: "7-1-stable" + gem "railties", github: "rails/rails", branch: "7-1-stable" end appraise "rails-main" do - gem "rails", github: "rails/rails", branch: "main" + gem "railties", github: "rails/rails", branch: "main" end diff --git a/Gemfile.lock b/Gemfile.lock index 5fb3788..04e6ea7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,37 +2,13 @@ PATH remote: . specs: solid_cache (0.2.0) - rails (>= 7) + activejob (>= 7) + activerecord (>= 7) + railties (>= 7) GEM remote: https://rubygems.org/ specs: - actioncable (7.1.2) - actionpack (= 7.1.2) - activesupport (= 7.1.2) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - zeitwerk (~> 2.6) - actionmailbox (7.1.2) - actionpack (= 7.1.2) - activejob (= 7.1.2) - activerecord (= 7.1.2) - activestorage (= 7.1.2) - activesupport (= 7.1.2) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.1.2) - actionpack (= 7.1.2) - actionview (= 7.1.2) - activejob (= 7.1.2) - activesupport (= 7.1.2) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp - rails-dom-testing (~> 2.2) actionpack (7.1.2) actionview (= 7.1.2) activesupport (= 7.1.2) @@ -43,13 +19,6 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.2) - actionpack (= 7.1.2) - activerecord (= 7.1.2) - activestorage (= 7.1.2) - activesupport (= 7.1.2) - globalid (>= 0.6.0) - nokogiri (>= 1.8.5) actionview (7.1.2) activesupport (= 7.1.2) builder (~> 3.1) @@ -65,12 +34,6 @@ GEM activemodel (= 7.1.2) activesupport (= 7.1.2) timeout (>= 0.4.0) - activestorage (7.1.2) - actionpack (= 7.1.2) - activejob (= 7.1.2) - activerecord (= 7.1.2) - activesupport (= 7.1.2) - marcel (~> 1.0) activesupport (7.1.2) base64 bigdecimal @@ -92,7 +55,6 @@ GEM concurrent-ruby (1.2.2) connection_pool (2.4.1) crass (1.0.6) - date (3.3.4) debug (1.9.1) irb (~> 1.10) reline (>= 0.3.8) @@ -112,28 +74,11 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - mail (2.8.1) - mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp - marcel (1.0.2) - mini_mime (1.1.5) minitest (5.20.0) mocha (2.1.0) ruby2_keywords (>= 0.0.5) mutex_m (0.2.0) mysql2 (0.5.5) - net-imap (0.4.9) - date - net-protocol - net-pop (0.1.2) - net-protocol - net-protocol (0.2.2) - timeout - net-smtp (0.4.0) - net-protocol - nio4r (2.7.0) nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) nokogiri (1.16.0-x86_64-darwin) @@ -156,20 +101,6 @@ GEM rackup (2.1.0) rack (>= 3) webrick (~> 1.8) - rails (7.1.2) - actioncable (= 7.1.2) - actionmailbox (= 7.1.2) - actionmailer (= 7.1.2) - actionpack (= 7.1.2) - actiontext (= 7.1.2) - actionview (= 7.1.2) - activejob (= 7.1.2) - activemodel (= 7.1.2) - activerecord (= 7.1.2) - activestorage (= 7.1.2) - activesupport (= 7.1.2) - bundler (>= 1.15.0) - railties (= 7.1.2) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -240,9 +171,6 @@ GEM concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) webrick (1.8.1) - websocket-driver (0.7.6) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) zeitwerk (2.6.12) PLATFORMS @@ -269,4 +197,4 @@ DEPENDENCIES sqlite3 BUNDLED WITH - 2.3.26 + 2.4.22 diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile index bb85a6c..d9e4e04 100644 --- a/gemfiles/rails_7.gemfile +++ b/gemfiles/rails_7.gemfile @@ -9,7 +9,7 @@ gem "mysql2" gem "pg" gem "sprockets-rails" gem "appraisal" -gem "rails", branch: "7-0-stable", git: "https://github.com/rails/rails.git" +gem "railties", branch: "7-0-stable", git: "https://github.com/rails/rails.git" group :rubocop do gem "rubocop", ">= 1.25.1", require: false diff --git a/gemfiles/rails_7.gemfile.lock b/gemfiles/rails_7.gemfile.lock index d9f3a45..454cd10 100644 --- a/gemfiles/rails_7.gemfile.lock +++ b/gemfiles/rails_7.gemfile.lock @@ -3,31 +3,6 @@ GIT revision: 71e29aaa0ffecf13da37428f7cbae110cd104689 branch: 7-0-stable specs: - actioncable (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.0.8) - actionpack (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activesupport (= 7.0.8) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp - rails-dom-testing (~> 2.0) actionpack (7.0.8) actionview (= 7.0.8) activesupport (= 7.0.8) @@ -36,13 +11,6 @@ GIT rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8) - actionpack (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) - globalid (>= 0.6.0) - nokogiri (>= 1.8.5) actionview (7.0.8) activesupport (= 7.0.8) builder (~> 3.1) @@ -57,13 +25,6 @@ GIT activerecord (7.0.8) activemodel (= 7.0.8) activesupport (= 7.0.8) - activestorage (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activesupport (= 7.0.8) - marcel (~> 1.0) - mini_mime (>= 1.1.0) activesupport (7.0.8) base64 bigdecimal @@ -73,20 +34,6 @@ GIT minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - rails (7.0.8) - actioncable (= 7.0.8) - actionmailbox (= 7.0.8) - actionmailer (= 7.0.8) - actionpack (= 7.0.8) - actiontext (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activemodel (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) - bundler (>= 1.15.0) - railties (= 7.0.8) railties (7.0.8) actionpack (= 7.0.8) activesupport (= 7.0.8) @@ -99,7 +46,9 @@ PATH remote: .. specs: solid_cache (0.2.0) - rails (>= 7) + activejob (>= 7) + activerecord (>= 7) + railties (>= 7) GEM remote: https://rubygems.org/ @@ -114,7 +63,6 @@ GEM builder (3.2.4) concurrent-ruby (1.2.2) crass (1.0.6) - date (3.3.4) debug (1.9.1) irb (~> 1.10) reline (>= 0.3.8) @@ -134,29 +82,12 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - mail (2.8.1) - mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp - marcel (1.0.2) method_source (1.0.0) - mini_mime (1.1.5) minitest (5.20.0) mocha (2.1.0) ruby2_keywords (>= 0.0.5) mutex_m (0.2.0) mysql2 (0.5.5) - net-imap (0.4.9) - date - net-protocol - net-pop (0.1.2) - net-protocol - net-protocol (0.2.2) - timeout - net-smtp (0.4.0) - net-protocol - nio4r (2.7.0) nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) nokogiri (1.16.0-x86_64-darwin) @@ -231,13 +162,9 @@ GEM sqlite3 (1.7.0-x86_64-linux) stringio (3.1.0) thor (1.3.0) - timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) - websocket-driver (0.7.6) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) zeitwerk (2.6.12) PLATFORMS @@ -253,7 +180,7 @@ DEPENDENCIES mocha mysql2 pg - rails! + railties! rubocop (>= 1.25.1) rubocop-md rubocop-minitest diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile index b3b0888..f0a2e5c 100644 --- a/gemfiles/rails_7_1.gemfile +++ b/gemfiles/rails_7_1.gemfile @@ -9,7 +9,7 @@ gem "mysql2" gem "pg" gem "sprockets-rails" gem "appraisal" -gem "rails", branch: "7-1-stable", git: "https://github.com/rails/rails.git" +gem "railties", branch: "7-1-stable", git: "https://github.com/rails/rails.git" group :rubocop do gem "rubocop", ">= 1.25.1", require: false diff --git a/gemfiles/rails_7_1.gemfile.lock b/gemfiles/rails_7_1.gemfile.lock index 14b5739..1cbc858 100644 --- a/gemfiles/rails_7_1.gemfile.lock +++ b/gemfiles/rails_7_1.gemfile.lock @@ -1,34 +1,8 @@ GIT remote: https://github.com/rails/rails.git - revision: 9a2bfebbc8e4800de58c26a5a119c3acad068664 + revision: 8040c05b4695e02ed17e6b4892008e66559c2877 branch: 7-1-stable specs: - actioncable (7.1.2) - actionpack (= 7.1.2) - activesupport (= 7.1.2) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - zeitwerk (~> 2.6) - actionmailbox (7.1.2) - actionpack (= 7.1.2) - activejob (= 7.1.2) - activerecord (= 7.1.2) - activestorage (= 7.1.2) - activesupport (= 7.1.2) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.1.2) - actionpack (= 7.1.2) - actionview (= 7.1.2) - activejob (= 7.1.2) - activesupport (= 7.1.2) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp - rails-dom-testing (~> 2.2) actionpack (7.1.2) actionview (= 7.1.2) activesupport (= 7.1.2) @@ -39,13 +13,6 @@ GIT rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.2) - actionpack (= 7.1.2) - activerecord (= 7.1.2) - activestorage (= 7.1.2) - activesupport (= 7.1.2) - globalid (>= 0.6.0) - nokogiri (>= 1.8.5) actionview (7.1.2) activesupport (= 7.1.2) builder (~> 3.1) @@ -61,12 +28,6 @@ GIT activemodel (= 7.1.2) activesupport (= 7.1.2) timeout (>= 0.4.0) - activestorage (7.1.2) - actionpack (= 7.1.2) - activejob (= 7.1.2) - activerecord (= 7.1.2) - activesupport (= 7.1.2) - marcel (~> 1.0) activesupport (7.1.2) base64 bigdecimal @@ -77,20 +38,6 @@ GIT minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - rails (7.1.2) - actioncable (= 7.1.2) - actionmailbox (= 7.1.2) - actionmailer (= 7.1.2) - actionpack (= 7.1.2) - actiontext (= 7.1.2) - actionview (= 7.1.2) - activejob (= 7.1.2) - activemodel (= 7.1.2) - activerecord (= 7.1.2) - activestorage (= 7.1.2) - activesupport (= 7.1.2) - bundler (>= 1.15.0) - railties (= 7.1.2) railties (7.1.2) actionpack (= 7.1.2) activesupport (= 7.1.2) @@ -104,7 +51,9 @@ PATH remote: .. specs: solid_cache (0.2.0) - rails (>= 7) + activejob (>= 7) + activerecord (>= 7) + railties (>= 7) GEM remote: https://rubygems.org/ @@ -120,7 +69,6 @@ GEM concurrent-ruby (1.2.2) connection_pool (2.4.1) crass (1.0.6) - date (3.3.4) debug (1.9.1) irb (~> 1.10) reline (>= 0.3.8) @@ -140,28 +88,11 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - mail (2.8.1) - mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp - marcel (1.0.2) - mini_mime (1.1.5) minitest (5.20.0) mocha (2.1.0) ruby2_keywords (>= 0.0.5) mutex_m (0.2.0) mysql2 (0.5.5) - net-imap (0.4.9) - date - net-protocol - net-pop (0.1.2) - net-protocol - net-protocol (0.2.2) - timeout - net-smtp (0.4.0) - net-protocol - nio4r (2.7.0) nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) nokogiri (1.16.0-x86_64-darwin) @@ -246,9 +177,6 @@ GEM concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) webrick (1.8.1) - websocket-driver (0.7.6) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) zeitwerk (2.6.12) PLATFORMS @@ -264,7 +192,7 @@ DEPENDENCIES mocha mysql2 pg - rails! + railties! rubocop (>= 1.25.1) rubocop-md rubocop-minitest diff --git a/gemfiles/rails_main.gemfile b/gemfiles/rails_main.gemfile index 55129ba..d9bc7d3 100644 --- a/gemfiles/rails_main.gemfile +++ b/gemfiles/rails_main.gemfile @@ -9,7 +9,7 @@ gem "mysql2" gem "pg" gem "sprockets-rails" gem "appraisal" -gem "rails", branch: "main", git: "https://github.com/rails/rails.git" +gem "railties", branch: "main", git: "https://github.com/rails/rails.git" group :rubocop do gem "rubocop", ">= 1.25.1", require: false diff --git a/gemfiles/rails_main.gemfile.lock b/gemfiles/rails_main.gemfile.lock index 7ca92d2..1d03b6a 100644 --- a/gemfiles/rails_main.gemfile.lock +++ b/gemfiles/rails_main.gemfile.lock @@ -1,34 +1,8 @@ GIT remote: https://github.com/rails/rails.git - revision: 1c3ae8719f2a127e1003916291e94305367a7dab + revision: f6f6b0542fd9ae6aebe3529baba358d521d64638 branch: main specs: - actioncable (7.2.0.alpha) - actionpack (= 7.2.0.alpha) - activesupport (= 7.2.0.alpha) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - zeitwerk (~> 2.6) - actionmailbox (7.2.0.alpha) - actionpack (= 7.2.0.alpha) - activejob (= 7.2.0.alpha) - activerecord (= 7.2.0.alpha) - activestorage (= 7.2.0.alpha) - activesupport (= 7.2.0.alpha) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.2.0.alpha) - actionpack (= 7.2.0.alpha) - actionview (= 7.2.0.alpha) - activejob (= 7.2.0.alpha) - activesupport (= 7.2.0.alpha) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp - rails-dom-testing (~> 2.2) actionpack (7.2.0.alpha) actionview (= 7.2.0.alpha) activesupport (= 7.2.0.alpha) @@ -40,13 +14,6 @@ GIT rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (7.2.0.alpha) - actionpack (= 7.2.0.alpha) - activerecord (= 7.2.0.alpha) - activestorage (= 7.2.0.alpha) - activesupport (= 7.2.0.alpha) - globalid (>= 0.6.0) - nokogiri (>= 1.8.5) actionview (7.2.0.alpha) activesupport (= 7.2.0.alpha) builder (~> 3.1) @@ -62,12 +29,6 @@ GIT activemodel (= 7.2.0.alpha) activesupport (= 7.2.0.alpha) timeout (>= 0.4.0) - activestorage (7.2.0.alpha) - actionpack (= 7.2.0.alpha) - activejob (= 7.2.0.alpha) - activerecord (= 7.2.0.alpha) - activesupport (= 7.2.0.alpha) - marcel (~> 1.0) activesupport (7.2.0.alpha) base64 bigdecimal @@ -77,20 +38,6 @@ GIT i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0, >= 2.0.5) - rails (7.2.0.alpha) - actioncable (= 7.2.0.alpha) - actionmailbox (= 7.2.0.alpha) - actionmailer (= 7.2.0.alpha) - actionpack (= 7.2.0.alpha) - actiontext (= 7.2.0.alpha) - actionview (= 7.2.0.alpha) - activejob (= 7.2.0.alpha) - activemodel (= 7.2.0.alpha) - activerecord (= 7.2.0.alpha) - activestorage (= 7.2.0.alpha) - activesupport (= 7.2.0.alpha) - bundler (>= 1.15.0) - railties (= 7.2.0.alpha) railties (7.2.0.alpha) actionpack (= 7.2.0.alpha) activesupport (= 7.2.0.alpha) @@ -104,7 +51,9 @@ PATH remote: .. specs: solid_cache (0.2.0) - rails (>= 7) + activejob (>= 7) + activerecord (>= 7) + railties (>= 7) GEM remote: https://rubygems.org/ @@ -120,7 +69,6 @@ GEM concurrent-ruby (1.2.2) connection_pool (2.4.1) crass (1.0.6) - date (3.3.4) debug (1.9.1) irb (~> 1.10) reline (>= 0.3.8) @@ -140,27 +88,10 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - mail (2.8.1) - mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp - marcel (1.0.2) - mini_mime (1.1.5) minitest (5.20.0) mocha (2.1.0) ruby2_keywords (>= 0.0.5) mysql2 (0.5.5) - net-imap (0.4.9) - date - net-protocol - net-pop (0.1.2) - net-protocol - net-protocol (0.2.2) - timeout - net-smtp (0.4.0) - net-protocol - nio4r (2.7.0) nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) nokogiri (1.16.0-x86_64-darwin) @@ -246,9 +177,6 @@ GEM unicode-display_width (2.5.0) useragent (0.16.10) webrick (1.8.1) - websocket-driver (0.7.6) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) zeitwerk (2.6.12) PLATFORMS @@ -264,7 +192,7 @@ DEPENDENCIES mocha mysql2 pg - rails! + railties! rubocop (>= 1.25.1) rubocop-md rubocop-minitest diff --git a/solid_cache.gemspec b/solid_cache.gemspec index 8b7b216..f2bc7b8 100644 --- a/solid_cache.gemspec +++ b/solid_cache.gemspec @@ -19,7 +19,10 @@ Gem::Specification.new do |spec| Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"] end - spec.add_dependency "rails", ">= 7" + rails_version = ">= 7" + spec.add_dependency "activerecord", rails_version + spec.add_dependency "activejob", rails_version + spec.add_dependency "railties", rails_version spec.add_development_dependency "debug" spec.add_development_dependency "mocha" end diff --git a/test/dummy/app/assets/stylesheets/application.css b/test/dummy/app/assets/stylesheets/application.css index 0ebd7fe..e69de29 100644 --- a/test/dummy/app/assets/stylesheets/application.css +++ b/test/dummy/app/assets/stylesheets/application.css @@ -1,15 +0,0 @@ -/* - * 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, vendor/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 - * 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. - * - *= require_tree . - *= require_self - */ diff --git a/test/dummy/app/channels/application_cable/channel.rb b/test/dummy/app/channels/application_cable/channel.rb deleted file mode 100644 index 9aec230..0000000 --- a/test/dummy/app/channels/application_cable/channel.rb +++ /dev/null @@ -1,6 +0,0 @@ -# frozen_string_literal: true - -module ApplicationCable - class Channel < ActionCable::Channel::Base - end -end diff --git a/test/dummy/app/channels/application_cable/connection.rb b/test/dummy/app/channels/application_cable/connection.rb deleted file mode 100644 index 8d6c2a1..0000000 --- a/test/dummy/app/channels/application_cable/connection.rb +++ /dev/null @@ -1,6 +0,0 @@ -# frozen_string_literal: true - -module ApplicationCable - class Connection < ActionCable::Connection::Base - end -end diff --git a/test/dummy/app/helpers/application_helper.rb b/test/dummy/app/helpers/application_helper.rb deleted file mode 100644 index 15b06f0..0000000 --- a/test/dummy/app/helpers/application_helper.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true - -module ApplicationHelper -end diff --git a/test/dummy/app/mailers/application_mailer.rb b/test/dummy/app/mailers/application_mailer.rb deleted file mode 100644 index 5cc63a0..0000000 --- a/test/dummy/app/mailers/application_mailer.rb +++ /dev/null @@ -1,6 +0,0 @@ -# frozen_string_literal: true - -class ApplicationMailer < ActionMailer::Base - default from: "from@example.com" - layout "mailer" -end diff --git a/test/dummy/app/views/layouts/application.html.erb b/test/dummy/app/views/layouts/application.html.erb index f72b4ef..e69de29 100644 --- a/test/dummy/app/views/layouts/application.html.erb +++ b/test/dummy/app/views/layouts/application.html.erb @@ -1,15 +0,0 @@ - - - - Dummy - - <%= csrf_meta_tags %> - <%= csp_meta_tag %> - - <%= stylesheet_link_tag "application" %> - - - - <%= yield %> - - diff --git a/test/dummy/app/views/layouts/mailer.html.erb b/test/dummy/app/views/layouts/mailer.html.erb deleted file mode 100644 index cbd34d2..0000000 --- a/test/dummy/app/views/layouts/mailer.html.erb +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - <%= yield %> - - diff --git a/test/dummy/app/views/layouts/mailer.text.erb b/test/dummy/app/views/layouts/mailer.text.erb deleted file mode 100644 index 37f0bdd..0000000 --- a/test/dummy/app/views/layouts/mailer.text.erb +++ /dev/null @@ -1 +0,0 @@ -<%= yield %> diff --git a/test/dummy/config/cable.yml b/test/dummy/config/cable.yml deleted file mode 100644 index 98367f8..0000000 --- a/test/dummy/config/cable.yml +++ /dev/null @@ -1,10 +0,0 @@ -development: - adapter: async - -test: - adapter: test - -production: - adapter: redis - url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> - channel_prefix: dummy_production diff --git a/test/dummy/config/environments/development.rb b/test/dummy/config/environments/development.rb index c8758ce..697e2f4 100644 --- a/test/dummy/config/environments/development.rb +++ b/test/dummy/config/environments/development.rb @@ -35,14 +35,6 @@ config.cache_store = :null_store end - # Store uploaded files on the local file system (see config/storage.yml for options). - config.active_storage.service = :local - - # Don't care if the mailer can't send. - config.action_mailer.raise_delivery_errors = false - - config.action_mailer.perform_caching = false - # Print deprecation notices to the Rails logger. config.active_support.deprecation = :log diff --git a/test/dummy/config/environments/production.rb b/test/dummy/config/environments/production.rb deleted file mode 100644 index d9e7b35..0000000 --- a/test/dummy/config/environments/production.rb +++ /dev/null @@ -1,95 +0,0 @@ -# frozen_string_literal: true - -require "active_support/core_ext/integer/time" - -Rails.application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - # Code is not reloaded between requests. - config.cache_classes = true - - # Eager load code on boot. This eager loads most of Rails and - # your application in memory, allowing both threaded web servers - # and those relying on copy on write to perform better. - # Rake tasks automatically ignore this option for performance. - config.eager_load = true - - # Full error reports are disabled and caching is turned on. - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] - # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). - # config.require_master_key = true - - # Disable serving static files from the `/public` folder by default since - # Apache or NGINX already handles this. - config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present? - - # Compress CSS using a preprocessor. - # config.assets.css_compressor = :sass - - # Do not fallback to assets pipeline if a precompiled asset is missed. - config.assets.compile = false - - # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.asset_host = "http://assets.example.com" - - # Specifies the header that your server uses for sending files. - # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache - # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX - - # Store uploaded files on the local file system (see config/storage.yml for options). - config.active_storage.service = :local - - # Mount Action Cable outside main process or domain. - # config.action_cable.mount_path = nil - # config.action_cable.url = "wss://example.com/cable" - # config.action_cable.allowed_request_origins = [ "http://example.com", /http:\/\/example.*/ ] - - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - # config.force_ssl = true - - # Include generic and useful information about system operation, but avoid logging too much - # information to avoid inadvertent exposure of personally identifiable information (PII). - config.log_level = :info - - # Prepend all log lines with the following tags. - config.log_tags = [ :request_id ] - - # Use a different cache store in production. - # config.cache_store = :mem_cache_store - - # Use a real queuing backend for Active Job (and separate queues per environment). - # config.active_job.queue_adapter = :resque - # config.active_job.queue_name_prefix = "dummy_production" - - config.action_mailer.perform_caching = false - - # Ignore bad email addresses and do not raise email delivery errors. - # Set this to true and configure the email server for immediate delivery to raise delivery errors. - # config.action_mailer.raise_delivery_errors = false - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation cannot be found). - config.i18n.fallbacks = true - - # Don't log any deprecations. - config.active_support.report_deprecations = false - - # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = ::Logger::Formatter.new - - # Use a different logger for distributed setups. - # require "syslog/logger" - # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name") - - if ENV["RAILS_LOG_TO_STDOUT"].present? - logger = ActiveSupport::Logger.new(STDOUT) - logger.formatter = config.log_formatter - config.logger = ActiveSupport::TaggedLogging.new(logger) - end - - # Do not dump schema after migrations. - config.active_record.dump_schema_after_migration = false -end diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb index 28504a9..dbf6f9c 100644 --- a/test/dummy/config/environments/test.rb +++ b/test/dummy/config/environments/test.rb @@ -35,15 +35,6 @@ # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false - # Store uploaded files on the local file system in a temporary directory. - config.active_storage.service = :test - - config.action_mailer.perform_caching = false - - # Tell Action Mailer not to deliver emails to the real world. - # The :test delivery method accumulates sent emails in the - # ActionMailer::Base.deliveries array. - config.action_mailer.delivery_method = :test # Print deprecation notices to the stderr. config.active_support.deprecation = :stderr diff --git a/test/dummy/config/storage.yml b/test/dummy/config/storage.yml deleted file mode 100644 index 4942ab6..0000000 --- a/test/dummy/config/storage.yml +++ /dev/null @@ -1,34 +0,0 @@ -test: - service: Disk - root: <%= Rails.root.join("tmp/storage") %> - -local: - service: Disk - root: <%= Rails.root.join("storage") %> - -# Use bin/rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) -# amazon: -# service: S3 -# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> -# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> -# region: us-east-1 -# bucket: your_own_bucket-<%= Rails.env %> - -# Remember not to checkin your GCS keyfile to a repository -# google: -# service: GCS -# project: your_project -# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> -# bucket: your_own_bucket-<%= Rails.env %> - -# Use bin/rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) -# microsoft: -# service: AzureStorage -# storage_account_name: your_account_name -# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> -# container: your_container_name-<%= Rails.env %> - -# mirror: -# service: Mirror -# primary: local -# mirrors: [ amazon, google, microsoft ] diff --git a/test/dummy/lib/assets/.keep b/test/dummy/lib/assets/.keep deleted file mode 100644 index e69de29..0000000