trusty-cms 7.1.3 → 8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f50633a419203ee6b0b6e35814de7af711b70dd362d5fe0f712543d31f1fc75
-  data.tar.gz: f5ccf44bd927e9a392e9979388c9d6f65ace4c1f965516d64936ee1da5e50d53
+  metadata.gz: 77d3850c23f30e1a9654c68e84bf5f34c3c7ebd3f0deaf5baadd91a34423eb3f
+  data.tar.gz: d21af2702b713670e01cd1f33ae95e8d2ea9803e1134921a8d76f90e2d75ec0d
 SHA512:
-  metadata.gz: 8324822cde6d47651420dc28038f51e629e1b411c276a0ddded87dac9587a571de5218e36452f929d0e5c55c4106aa47a21cf72f14e06c78b545c849cfafed6a
-  data.tar.gz: 4e4dc362cd53e8124eaba08331db95eb085fe28b8778776ceef121a7e3b993f379b26d2c56c17538962adca2e2b47eb0e834c16d6f67f4a45b4a6cbab9a33cb3
+  metadata.gz: 4847f7ef1367b73749feead54eae6d0c7ffa76d953b6ac6dd0c29af23cdfe11b0b4c9a26e8a9018b0d0200ae30818f65cb6aba4be1bc3e41a5e4c4089ac0cd0f
+  data.tar.gz: bdd09ed13ebc928624962d5d44b0eb82d63694a55a9fbcd5b50584a206ae998c81f5f68353c97738cb0a1e6c84f2fe158cb222bd37f22c3798f932f6346fbc07

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.1.3)
+    trusty-cms (8.0)
       RedCloth (= 4.3.4)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)
@@ -20,6 +20,7 @@ PATH
       highline (>= 1.7.8, < 3.2.0)
       image_processing
       kraken-io
+      mini_magick (~> 5.0)
       mini_racer
       mutex_m
       mysql2
@@ -29,7 +30,7 @@ PATH
       rack (>= 2.0.1, < 3.2.0)
       rack-cache (~> 1.7)
       radius (~> 0.8)
-      rails (~> 7.2.2.1)
+      rails (~> 8.0.0)
       rake (< 14.0)
       ransack (~> 4.2.1)
       rdoc (>= 5.1, < 9.0)
@@ -46,68 +47,67 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.4)
-    actioncable (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actioncable (8.0.5.1)
+      actionpack (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionmailbox (8.0.5.1)
+      actionpack (= 8.0.5.1)
+      activejob (= 8.0.5.1)
+      activerecord (= 8.0.5.1)
+      activestorage (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
       mail (>= 2.8.0)
-    actionmailer (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionmailer (8.0.5.1)
+      actionpack (= 8.0.5.1)
+      actionview (= 8.0.5.1)
+      activejob (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.1)
-      actionview (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionpack (8.0.5.1)
+      actionview (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
       nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actiontext (8.0.5.1)
+      actionpack (= 8.0.5.1)
+      activerecord (= 8.0.5.1)
+      activestorage (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionview (8.0.5.1)
+      activesupport (= 8.0.5.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activejob (8.0.5.1)
+      activesupport (= 8.0.5.1)
       globalid (>= 0.3.6)
-    activemodel (7.2.2.1)
-      activesupport (= 7.2.2.1)
-    activerecord (7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activemodel (8.0.5.1)
+      activesupport (= 8.0.5.1)
+    activerecord (8.0.5.1)
+      activemodel (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
       timeout (>= 0.4.0)
-    activestorage (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activestorage (8.0.5.1)
+      actionpack (= 8.0.5.1)
+      activejob (= 8.0.5.1)
+      activerecord (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
       marcel (~> 1.0)
-    activestorage-validator (0.4.0)
-      rails (>= 6.1.0)
-    activesupport (7.2.2.1)
+    activestorage-validator (0.8.0)
+      rails (>= 7.2.0)
+    activesupport (8.0.5.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -119,6 +119,7 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     acts_as_list (1.2.6)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
@@ -147,7 +148,7 @@ GEM
     chunky_png (1.4.0)
     cliver (0.3.2)
     coderay (1.1.3)
-    concurrent-ruby (1.3.7)
+    concurrent-ruby (1.3.8)
     connection_pool (3.0.2)
     crass (1.0.7)
     css_parser (3.0.0)
@@ -155,13 +156,13 @@ GEM
       ssrf_filter (~> 1.5)
     csso-rails (0.9.0)
       execjs (>= 1)
-    csv (3.3.0)
+    csv (3.3.6)
     database_cleaner (2.1.0)
       database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.2.0)
+    database_cleaner-active_record (2.2.2)
       activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
-    database_cleaner-core (2.0.1)
+      database_cleaner-core (~> 2.0)
+    database_cleaner-core (2.1.0)
     date (3.5.1)
     delocalize (1.2.0)
       rails (>= 2)
@@ -178,32 +179,31 @@ GEM
       rotp (~> 6.0)
     diff-lcs (1.6.2)
     diffy (3.4.4)
-    docile (1.4.1)
     drb (2.2.3)
-    erb (6.0.4)
+    erb (6.0.6)
     erubi (1.13.1)
-    execjs (2.10.0)
+    execjs (2.10.1)
     factory_bot (6.6.0)
       activesupport (>= 6.1.0)
     factory_bot_rails (6.5.1)
       factory_bot (~> 6.5)
       railties (>= 6.1.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-aarch64-linux-musl)
-    ffi (1.17.0-arm-linux-gnu)
-    ffi (1.17.0-arm-linux-musl)
-    ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x86-linux-gnu)
-    ffi (1.17.0-x86-linux-musl)
-    ffi (1.17.0-x86_64-darwin)
-    ffi (1.17.0-x86_64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-musl)
+    ffi (1.17.4-aarch64-linux-gnu)
+    ffi (1.17.4-aarch64-linux-musl)
+    ffi (1.17.4-arm-linux-gnu)
+    ffi (1.17.4-arm-linux-musl)
+    ffi (1.17.4-arm64-darwin)
+    ffi (1.17.4-x86-linux-gnu)
+    ffi (1.17.4-x86-linux-musl)
+    ffi (1.17.4-x86_64-darwin)
+    ffi (1.17.4-x86_64-linux-gnu)
+    ffi (1.17.4-x86_64-linux-musl)
     file_validators (3.0.0)
       activemodel (>= 3.2)
       mime-types (>= 1.0)
-    globalid (1.2.1)
+    globalid (1.4.0)
       activesupport (>= 6.1)
-    haml (6.3.0)
+    haml (6.3.1)
       temple (>= 0.8.2)
       thor
       tilt
@@ -214,15 +214,13 @@ GEM
       railties (>= 5.1)
     highline (3.1.2)
       reline
-    httparty (0.22.0)
+    httparty (0.24.2)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     i18n (1.15.2)
       concurrent-ruby (~> 1.0)
-    image_processing (1.13.0)
-      mini_magick (>= 4.9.5, < 5)
-      ruby-vips (>= 2.0.17, < 3)
+    image_processing (2.0.2)
     io-console (0.8.2)
     irb (1.18.0)
       pp (>= 0.6.0)
@@ -231,7 +229,7 @@ GEM
       reline (>= 0.4.2)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.8.1)
+    json (2.21.2)
     kraken-io (0.1.3)
       activesupport
       httparty
@@ -240,34 +238,36 @@ GEM
     launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
-    libv8-node (18.19.0.0)
-    libv8-node (18.19.0.0-aarch64-linux)
-    libv8-node (18.19.0.0-aarch64-linux-musl)
-    libv8-node (18.19.0.0-arm64-darwin)
-    libv8-node (18.19.0.0-x86_64-darwin)
-    libv8-node (18.19.0.0-x86_64-linux)
-    libv8-node (18.19.0.0-x86_64-linux-musl)
+    libv8-node (24.12.0.1)
+    libv8-node (24.12.0.1-aarch64-linux)
+    libv8-node (24.12.0.1-aarch64-linux-musl)
+    libv8-node (24.12.0.1-arm64-darwin)
+    libv8-node (24.12.0.1-x86_64-darwin)
+    libv8-node (24.12.0.1-x86_64-linux)
+    libv8-node (24.12.0.1-x86_64-linux-musl)
     logger (1.7.0)
     loofah (2.25.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.8.1)
+    mail (2.9.1)
+      logger
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.4)
-    matrix (0.4.2)
+    marcel (1.2.1)
+    matrix (0.4.3)
     method_source (1.1.0)
-    mime-types (3.6.0)
+    mime-types (3.7.0)
+      logger
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2026.0701)
+    mini_magick (5.3.2)
       logger
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.1105)
-    mini_magick (4.13.2)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    mini_racer (0.16.0)
-      libv8-node (~> 18.19.0.0)
+    mini_racer (0.21.4)
+      libv8-node (~> 24.12.0.1)
     minitest (6.0.6)
       drb (~> 2.0)
       prism (~> 1.5)
@@ -275,8 +275,9 @@ GEM
       bigdecimal (>= 3.1, < 5)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
-    mysql2 (0.5.6)
-    net-imap (0.5.15)
+    mysql2 (0.5.7)
+      bigdecimal
+    net-imap (0.6.6)
       date
       net-protocol
     net-pop (0.1.2)
@@ -285,7 +286,7 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    nio4r (2.7.4)
+    nio4r (2.7.5)
     nokogiri (1.19.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -342,20 +343,20 @@ GEM
     rackup (2.3.1)
       rack (>= 3)
     radius (0.8.0)
-    rails (7.2.2.1)
-      actioncable (= 7.2.2.1)
-      actionmailbox (= 7.2.2.1)
-      actionmailer (= 7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actiontext (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    rails (8.0.5.1)
+      actioncable (= 8.0.5.1)
+      actionmailbox (= 8.0.5.1)
+      actionmailer (= 8.0.5.1)
+      actionpack (= 8.0.5.1)
+      actiontext (= 8.0.5.1)
+      actionview (= 8.0.5.1)
+      activejob (= 8.0.5.1)
+      activemodel (= 8.0.5.1)
+      activerecord (= 8.0.5.1)
+      activestorage (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
       bundler (>= 1.15.0)
-      railties (= 7.2.2.1)
+      railties (= 8.0.5.1)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
@@ -365,20 +366,21 @@ GEM
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    railties (8.0.5.1)
+      actionpack (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rake (13.4.2)
     ransack (4.2.1)
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
       i18n
-    rbs (4.0.3)
+    rbs (4.1.2)
       logger
       prism (>= 1.6.0)
       tsort
@@ -387,7 +389,7 @@ GEM
       prism (>= 1.6.0)
       rbs (>= 4.0.0)
       tsort
-    regexp_parser (2.9.2)
+    regexp_parser (2.12.0)
     reline (0.6.3)
       io-console (~> 0.5)
     request_store (1.7.0)
@@ -406,12 +408,12 @@ GEM
       chunky_png (~> 1.0)
       rqrcode_core (~> 2.0)
     rqrcode_core (2.1.0)
-    rspec-core (3.13.4)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-rails (7.1.1)
@@ -422,12 +424,9 @@ GEM
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-support (3.13.4)
+    rspec-support (3.13.7)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    ruby-vips (2.2.2)
-      ffi (~> 1.12)
-      logger
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
@@ -439,15 +438,11 @@ GEM
       sprockets-rails
       tilt
     securerandom (0.4.1)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
-    simplecov-lcov (0.8.0)
-    simplecov_json_formatter (0.1.4)
-    sprockets (4.2.1)
+    simplecov (1.0.3)
+    simplecov-lcov (0.9.0)
+    sprockets (4.2.2)
       concurrent-ruby (~> 1.0)
+      logger
       rack (>= 2.2.4, < 4)
     sprockets-rails (3.5.2)
       actionpack (>= 6.1)
@@ -456,9 +451,9 @@ GEM
     ssrf_filter (1.5.0)
     stringex (2.8.6)
     stringio (3.2.0)
-    temple (0.10.3)
+    temple (0.10.4)
     thor (1.5.0)
-    tilt (2.4.0)
+    tilt (2.8.0)
     timeout (0.6.1)
     trustygems (0.2.1)
       rake
@@ -467,7 +462,7 @@ GEM
       concurrent-ruby (~> 1.0)
     uglifier (4.2.1)
       execjs (>= 0.3.0, < 3)
-    uri (1.0.4)
+    uri (1.1.1)
     useragent (0.16.11)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -478,7 +473,7 @@ GEM
     will_paginate (4.0.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.8.2)
+    zeitwerk (2.8.3)
 
 PLATFORMS
   aarch64-linux

data/config/application.rb

@@ -17,7 +17,11 @@ end
 module TrustyCms
   class Application < Rails::Application
     include TrustyCms::Initializer
-    config.load_defaults 7.2
+    config.load_defaults 8.0
+
+    # Rails 8.1 will make `to_time` always preserve the receiver's timezone.
+    # Opt in now to silence the deprecation and get the new behavior.
+    config.active_support.to_time_preserves_timezone = :zone
 
     Rails.autoloaders.log!
     # Enable the asset pipeline

data/lib/string_extensions/string_extensions.rb

@@ -14,8 +14,10 @@ class String
   end
 
   unless methods.include?('parameterize')
-    def parameterize(sep = '-')
-      remove_formatting.downcase.replace_whitespace(sep).collapse(sep)
+    def parameterize(separator = '-', preserve_case: false, locale: nil)
+      separator = '-' unless separator.is_a?(String)
+      slug = remove_formatting.replace_whitespace(separator).collapse(separator)
+      preserve_case ? slug : slug.downcase
     end
   end
 

data/lib/trusty_cms/version.rb

@@ -1,3 +1,3 @@
 module TrustyCms
-  VERSION = '7.1.3'.freeze
+  VERSION = '8.0'.freeze
 end

data/spec/controllers/admin/assets_controller_spec.rb

@@ -0,0 +1,124 @@
+require 'spec_helper'
+require 'rack/test'
+
+# Exercises Admin::AssetsController, which overrides the ResourceController CRUD
+# with custom upload handling (process_uploaded_asset, maybe_compress,
+# failure_response, set_owner_or_editor). Uses the JSON/partial endpoints so the
+# specs don't depend on the asset-pipeline-heavy admin HTML layout. High-value
+# regression net for a Rails/Ruby upgrade — file uploads and content-type
+# negotiation are common breakage points.
+RSpec.describe Admin::AssetsController, type: :controller do
+  routes { TrustyCms::Application.routes }
+
+  let(:user) { create(:admin) }
+  let(:fixtures_path) { TrustyCms::Engine.root.join('spec', 'fixtures', 'files') }
+
+  before do
+    # approved_content_types derives from the AssetType registry, which is empty
+    # by default; register the canonical set (shared with asset_spec) so uploads
+    # of text/plain, images, etc. can be approved. See AssetTypeRegistry.
+    register_standard_asset_types
+
+    # public_url generation needs a host; controller specs don't set one on the
+    # Disk service the way a real request would.
+    @previous_active_storage_url_options = ActiveStorage::Current.url_options
+    ActiveStorage::Current.url_options = { host: 'test.host', protocol: 'http' }
+
+    allow(controller).to receive(:authenticate_user!).and_return(true)
+    allow(controller).to receive(:current_user).and_return(user)
+  end
+
+  after do
+    ActiveStorage::Current.url_options = @previous_active_storage_url_options
+  end
+
+  # A plain stub (not an rspec double) so it can be assigned in an `around`
+  # hook, which runs outside the per-test double lifecycle. api_key: nil makes
+  # should_compress? false, so uploads skip Kraken compression.
+  around do |example|
+    original_kraken = defined?($kraken) ? $kraken : nil
+    $kraken = Struct.new(:api_key).new(nil)
+    example.run
+    $kraken = original_kraken
+  end
+
+  def upload(filename, content_type)
+    Rack::Test::UploadedFile.new(fixtures_path.join(filename), content_type)
+  end
+
+  describe 'POST #uploader' do
+    it 'returns the asset url when the upload succeeds' do
+      expect {
+        post :uploader, params: { upload: upload('sample.txt', 'text/plain') }, format: :json
+      }.to change(Asset, :count).by(1)
+
+      expect(response).to have_http_status(:ok)
+      expect(JSON.parse(response.body)).to have_key('url')
+    end
+
+    it 'records the uploading user as owner/editor' do
+      post :uploader, params: { upload: upload('sample.txt', 'text/plain') }, format: :json
+
+      asset = Asset.last
+      expect(asset.created_by_id).to eq(user.id)
+      expect(asset.updated_by_id).to eq(user.id)
+    end
+
+    it 'returns unsupported media type for disallowed content types' do
+      expect(Asset).not_to receive(:create)
+
+      post :uploader, params: { upload: upload('sample.txt', 'application/x-unsupported') }, format: :json
+
+      expect(response).to have_http_status(:unsupported_media_type)
+      expect(JSON.parse(response.body)['error']).to eq('Unsupported file type.')
+      expect(flash[:error]).to eq('Unsupported file type.')
+    end
+
+    it 'rejects the generic octet-stream content type with a notice' do
+      post :uploader, params: { upload: upload('sample.txt', 'application/octet-stream') }, format: :json
+
+      expect(response).to have_http_status(:unprocessable_entity)
+      expect(JSON.parse(response.body)['error']).to match(/valid extension/)
+      expect(flash[:notice]).to match(/valid extension/)
+    end
+
+    it 'returns unprocessable entity when no file is provided' do
+      post :uploader, params: {}, format: :json
+
+      expect(response).to have_http_status(:unprocessable_entity)
+      expect(JSON.parse(response.body)['error']).to eq('No file uploaded.')
+      expect(flash[:error]).to eq('No file uploaded.')
+    end
+  end
+
+  describe 'POST #create' do
+    it 'creates an asset from an uploaded file and redirects (HTML)' do
+      expect {
+        post :create, params: { asset: { asset: [upload('sample.txt', 'text/plain')] } }
+      }.to change(Asset, :count).by(1)
+
+      expect(response).to be_redirect
+    end
+
+    it 'redirects back to new with a flash error when the upload is unsupported' do
+      expect {
+        post :create, params: { asset: { asset: [upload('sample.txt', 'application/x-unsupported')] } }
+      }.not_to change(Asset, :count)
+
+      expect(response).to redirect_to(new_admin_asset_path)
+      expect(flash[:error]).to eq('Unsupported file type.')
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    it 'destroys the asset and redirects' do
+      asset = Asset.create!(asset: upload('sample.txt', 'text/plain'), caption: '')
+
+      expect {
+        delete :destroy, params: { id: asset.id }
+      }.to change(Asset, :count).by(-1)
+
+      expect(response).to be_redirect
+    end
+  end
+end