Remove activestorage to not pull mimemagic

grosser · Mar 25, 2021 · 2041de7 · 2041de7
1 parent b83bcec
commit 2041de7
Show file tree

Hide file tree

Showing 22 changed files with 52 additions and 183 deletions.
diff --git a/spec/fixtures/rails60/.gitignore b/spec/fixtures/rails60/.gitignore
@@ -23,9 +23,6 @@
 !/tmp/pids/
 !/tmp/pids/.keep
 
-# Ignore uploaded files in development.
-/storage/*
-!/storage/.keep
 
 /public/assets
 .byebug_history

diff --git a/spec/fixtures/rails60/Gemfile b/spec/fixtures/rails60/Gemfile
@@ -1,7 +1,19 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
 
-gem 'rails', '6.0.3'
+rails_version = '6.0.3'
+
+gem 'actioncable', rails_version
+gem 'actionmailer', rails_version
+gem 'actionpack', rails_version
+gem 'actionview', rails_version
+gem 'activejob', rails_version
+gem 'activemodel', rails_version
+gem 'activerecord', rails_version
+gem 'activesupport', rails_version
+gem 'railties', rails_version
+gem 'sprockets-rails'
+
 gem 'sqlite3'
 gem 'tzinfo-data'
 gem 'parallel_tests', path: "../../../", group: :development
diff --git a/spec/fixtures/rails60/Gemfile.lock b/spec/fixtures/rails60/Gemfile.lock
@@ -11,13 +11,6 @@ GEM
       actionpack (= 6.0.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3)
-      actionpack (= 6.0.3)
-      activejob (= 6.0.3)
-      activerecord (= 6.0.3)
-      activestorage (= 6.0.3)
-      activesupport (= 6.0.3)
-      mail (>= 2.7.1)
     actionmailer (6.0.3)
       actionpack (= 6.0.3)
       actionview (= 6.0.3)
@@ -31,12 +24,6 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3)
-      actionpack (= 6.0.3)
-      activerecord (= 6.0.3)
-      activestorage (= 6.0.3)
-      activesupport (= 6.0.3)
-      nokogiri (>= 1.8.5)
     actionview (6.0.3)
       activesupport (= 6.0.3)
       builder (~> 3.1)
@@ -51,11 +38,6 @@ GEM
     activerecord (6.0.3)
       activemodel (= 6.0.3)
       activesupport (= 6.0.3)
-    activestorage (6.0.3)
-      actionpack (= 6.0.3)
-      activejob (= 6.0.3)
-      activerecord (= 6.0.3)
-      marcel (~> 0.3.1)
     activesupport (6.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
@@ -75,11 +57,7 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
     method_source (1.0.0)
-    mimemagic (0.3.7)
-      nokogiri (~> 1.11.2)
     mini_mime (1.0.2)
     minitest (5.14.4)
     nio4r (2.5.7)
@@ -92,21 +70,6 @@ GEM
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.3)
-      actioncable (= 6.0.3)
-      actionmailbox (= 6.0.3)
-      actionmailer (= 6.0.3)
-      actionpack (= 6.0.3)
-      actiontext (= 6.0.3)
-      actionview (= 6.0.3)
-      activejob (= 6.0.3)
-      activemodel (= 6.0.3)
-      activerecord (= 6.0.3)
-      activestorage (= 6.0.3)
-      activesupport (= 6.0.3)
-      bundler (>= 1.3.0)
-      railties (= 6.0.3)
-      sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
@@ -143,8 +106,17 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  actioncable (= 6.0.3)
+  actionmailer (= 6.0.3)
+  actionpack (= 6.0.3)
+  actionview (= 6.0.3)
+  activejob (= 6.0.3)
+  activemodel (= 6.0.3)
+  activerecord (= 6.0.3)
+  activesupport (= 6.0.3)
   parallel_tests!
-  rails (= 6.0.3)
+  railties (= 6.0.3)
+  sprockets-rails
   sqlite3
   tzinfo-data
 

diff --git a/spec/fixtures/rails60/app/javascript/packs/application.js b/spec/fixtures/rails60/app/javascript/packs/application.js
@@ -5,7 +5,6 @@
 
 require("@rails/ujs").start()
 require("turbolinks").start()
-require("@rails/activestorage").start()
 require("channels")
 
 

diff --git a/spec/fixtures/rails60/config/application.rb b/spec/fixtures/rails60/config/application.rb
@@ -5,11 +5,11 @@
 require "active_model/railtie"
 require "active_job/railtie"
 require "active_record/railtie"
-require "active_storage/engine"
+# require "active_storage/engine"
 require "action_controller/railtie"
 require "action_mailer/railtie"
-require "action_mailbox/engine"
-require "action_text/engine"
+# require "action_mailbox/engine"
+# require "action_text/engine"
 require "action_view/railtie"
 require "action_cable/engine"
 # require "sprockets/railtie"

diff --git a/spec/fixtures/rails60/config/environments/development.rb b/spec/fixtures/rails60/config/environments/development.rb
@@ -28,9 +28,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
 

diff --git a/spec/fixtures/rails60/config/environments/production.rb b/spec/fixtures/rails60/config/environments/production.rb
@@ -29,9 +29,6 @@
   # 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'

diff --git a/spec/fixtures/rails60/config/environments/test.rb b/spec/fixtures/rails60/config/environments/test.rb
@@ -30,9 +30,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.

diff --git a/spec/fixtures/rails60/config/storage.yml b/spec/fixtures/rails60/config/storage.yml
diff --git a/spec/fixtures/rails60/package.json b/spec/fixtures/rails60/package.json
@@ -4,7 +4,6 @@
   "dependencies": {
     "@rails/ujs": "^6.0.0",
     "turbolinks": "^5.2.0",
-    "@rails/activestorage": "^6.0.0",
     "@rails/actioncable": "^6.0.0"
   },
   "version": "0.1.0"

diff --git a/spec/fixtures/rails60/storage/.keep b/spec/fixtures/rails60/storage/.keep
diff --git a/spec/fixtures/rails61/.gitignore b/spec/fixtures/rails61/.gitignore
@@ -22,9 +22,6 @@
 !/tmp/pids/
 !/tmp/pids/.keep
 
-# Ignore uploaded files in development.
-/storage/*
-!/storage/.keep
 
 /public/assets
 .byebug_history

diff --git a/spec/fixtures/rails61/Gemfile b/spec/fixtures/rails61/Gemfile
@@ -1,7 +1,19 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
 
-gem 'rails', '6.1.3'
+rails_version = '6.1.3'
+
+gem 'actioncable', rails_version
+gem 'actionmailer', rails_version
+gem 'actionpack', rails_version
+gem 'actionview', rails_version
+gem 'activejob', rails_version
+gem 'activemodel', rails_version
+gem 'activerecord', rails_version
+gem 'activesupport', rails_version
+gem 'railties', rails_version
+gem 'sprockets-rails'
+
 gem 'sqlite3'
 gem 'tzinfo-data'
 gem 'parallel_tests', path: "../../../", group: :development
diff --git a/spec/fixtures/rails61/Gemfile.lock b/spec/fixtures/rails61/Gemfile.lock
@@ -12,13 +12,6 @@ GEM
       activesupport (= 6.1.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.3)
-      actionpack (= 6.1.3)
-      activejob (= 6.1.3)
-      activerecord (= 6.1.3)
-      activestorage (= 6.1.3)
-      activesupport (= 6.1.3)
-      mail (>= 2.7.1)
     actionmailer (6.1.3)
       actionpack (= 6.1.3)
       actionview (= 6.1.3)
@@ -33,12 +26,6 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.3)
-      actionpack (= 6.1.3)
-      activerecord (= 6.1.3)
-      activestorage (= 6.1.3)
-      activesupport (= 6.1.3)
-      nokogiri (>= 1.8.5)
     actionview (6.1.3)
       activesupport (= 6.1.3)
       builder (~> 3.1)
@@ -53,13 +40,6 @@ GEM
     activerecord (6.1.3)
       activemodel (= 6.1.3)
       activesupport (= 6.1.3)
-    activestorage (6.1.3)
-      actionpack (= 6.1.3)
-      activejob (= 6.1.3)
-      activerecord (= 6.1.3)
-      activesupport (= 6.1.3)
-      marcel (~> 0.3.1)
-      mimemagic (~> 0.3.2)
     activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
@@ -79,11 +59,7 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
     method_source (1.0.0)
-    mimemagic (0.3.7)
-      nokogiri (~> 1.11.2)
     mini_mime (1.0.2)
     minitest (5.14.4)
     nio4r (2.5.7)
@@ -96,21 +72,6 @@ GEM
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.3)
-      actioncable (= 6.1.3)
-      actionmailbox (= 6.1.3)
-      actionmailer (= 6.1.3)
-      actionpack (= 6.1.3)
-      actiontext (= 6.1.3)
-      actionview (= 6.1.3)
-      activejob (= 6.1.3)
-      activemodel (= 6.1.3)
-      activerecord (= 6.1.3)
-      activestorage (= 6.1.3)
-      activesupport (= 6.1.3)
-      bundler (>= 1.15.0)
-      railties (= 6.1.3)
-      sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
@@ -146,8 +107,17 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  actioncable (= 6.1.3)
+  actionmailer (= 6.1.3)
+  actionpack (= 6.1.3)
+  actionview (= 6.1.3)
+  activejob (= 6.1.3)
+  activemodel (= 6.1.3)
+  activerecord (= 6.1.3)
+  activesupport (= 6.1.3)
   parallel_tests!
-  rails (= 6.1.3)
+  railties (= 6.1.3)
+  sprockets-rails
   sqlite3
   tzinfo-data
 

diff --git a/spec/fixtures/rails61/app/javascript/packs/application.js b/spec/fixtures/rails61/app/javascript/packs/application.js
@@ -5,9 +5,7 @@
 
 import Rails from "@rails/ujs"
 import Turbolinks from "turbolinks"
-import * as ActiveStorage from "@rails/activestorage"
 import "channels"
 
 Rails.start()
 Turbolinks.start()
-ActiveStorage.start()
diff --git a/spec/fixtures/rails61/config/application.rb b/spec/fixtures/rails61/config/application.rb
@@ -5,11 +5,11 @@
 require "active_model/railtie"
 require "active_job/railtie"
 require "active_record/railtie"
-require "active_storage/engine"
+# require "active_storage/engine"
 require "action_controller/railtie"
 require "action_mailer/railtie"
-require "action_mailbox/engine"
-require "action_text/engine"
+# require "action_mailbox/engine"
+# require "action_text/engine"
 require "action_view/railtie"
 require "action_cable/engine"
 # require "sprockets/railtie"

diff --git a/spec/fixtures/rails61/config/environments/development.rb b/spec/fixtures/rails61/config/environments/development.rb
@@ -30,9 +30,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
 

diff --git a/spec/fixtures/rails61/config/environments/production.rb b/spec/fixtures/rails61/config/environments/production.rb
@@ -31,9 +31,6 @@
   # 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'

diff --git a/spec/fixtures/rails61/config/environments/test.rb b/spec/fixtures/rails61/config/environments/test.rb
@@ -32,9 +32,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.