diff --git a/Gemfile.lock b/Gemfile.lock
index d0cc52bd10b15..bdc38c947c42b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/QueueClassic/queue_classic.git
-  revision: 4cdc9b8e804badf7dea7078dd81092972d292c14
+  revision: 4260d8963ddef91bdb9ae390d93e811521b83350
   specs:
-    queue_classic (3.2.0.RC1)
+    queue_classic (4.0.0.pre.alpha1)
       pg (>= 0.17, < 2.0)
 
 GIT
@@ -100,40 +100,41 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activerecord-jdbc-adapter (52.1-java)
+    activerecord-jdbc-adapter (52.3-java)
       activerecord (~> 5.2.0)
-    activerecord-jdbcmysql-adapter (52.1-java)
-      activerecord-jdbc-adapter (= 52.1)
-      jdbc-mysql (~> 5.1.36)
-    activerecord-jdbcpostgresql-adapter (52.1-java)
-      activerecord-jdbc-adapter (= 52.1)
+    activerecord-jdbcmysql-adapter (52.3-java)
+      activerecord-jdbc-adapter (= 52.3)
+      jdbc-mysql (~> 5.1.36, < 9)
+    activerecord-jdbcpostgresql-adapter (52.3-java)
+      activerecord-jdbc-adapter (= 52.3)
       jdbc-postgres (>= 9.4, < 43)
-    activerecord-jdbcsqlite3-adapter (52.1-java)
-      activerecord-jdbc-adapter (= 52.1)
+    activerecord-jdbcsqlite3-adapter (52.3-java)
+      activerecord-jdbc-adapter (= 52.3)
       jdbc-sqlite3 (~> 3.8, < 3.30)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     amq-protocol (2.3.0)
     ansi (1.5.0)
     ast (2.4.0)
-    aws-eventstream (1.0.1)
-    aws-partitions (1.111.0)
-    aws-sdk-core (3.37.0)
-      aws-eventstream (~> 1.0)
+    aws-eventstream (1.0.3)
+    aws-partitions (1.221.0)
+    aws-sdk-core (3.68.1)
+      aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.0)
+      aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.11.0)
-      aws-sdk-core (~> 3, >= 3.26.0)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.23.1)
-      aws-sdk-core (~> 3, >= 3.26.0)
+    aws-sdk-kms (1.24.0)
+      aws-sdk-core (~> 3, >= 3.61.1)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.48.0)
+      aws-sdk-core (~> 3, >= 3.61.1)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-sns (1.8.1)
-      aws-sdk-core (~> 3, >= 3.37.0)
-      aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.3)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sns (1.19.0)
+      aws-sdk-core (~> 3, >= 3.61.1)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.1.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
     azure-core (0.1.15)
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
@@ -149,10 +150,8 @@ GEM
       beaneater (~> 1.0)
       concurrent-ruby (~> 1.0, >= 1.0.1)
       dante (> 0.1.5)
-    bcrypt (3.1.12)
-    bcrypt (3.1.12-java)
-    bcrypt (3.1.12-x64-mingw32)
-    bcrypt (3.1.12-x86-mingw32)
+    bcrypt (3.1.13)
+    bcrypt (3.1.13-java)
     beaneater (1.0.0)
     benchmark-ips (2.7.2)
     blade (0.7.1)
@@ -172,15 +171,15 @@ GEM
       childprocess
       faraday
       selenium-webdriver
-    bootsnap (1.4.4)
+    bootsnap (1.4.5)
       msgpack (~> 1.0)
-    bootsnap (1.4.4-java)
+    bootsnap (1.4.5-java)
       msgpack (~> 1.0)
     builder (3.2.3)
-    bunny (2.13.0)
+    bunny (2.14.3)
       amq-protocol (~> 2.3, >= 2.3.0)
-    byebug (10.0.2)
-    capybara (3.26.0)
+    byebug (11.0.1)
+    capybara (3.29.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -188,8 +187,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (~> 1.5)
       xpath (~> 3.2)
-    childprocess (1.0.1)
-      rake (< 13.0)
+    childprocess (3.0.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -201,15 +199,15 @@ GEM
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
     curses (1.0.2)
-    daemons (1.2.6)
-    dalli (2.7.9)
+    daemons (1.3.1)
+    dalli (2.7.10)
     dante (0.2.0)
     declarative (0.0.10)
     declarative-option (0.1.0)
-    delayed_job (4.1.5)
-      activesupport (>= 3.0, < 5.3)
-    delayed_job_active_record (4.1.3)
-      activerecord (>= 3.0, < 5.3)
+    delayed_job (4.1.8)
+      activesupport (>= 3.0, < 6.1)
+    delayed_job_active_record (4.1.4)
+      activerecord (>= 3.0, < 6.1)
       delayed_job (>= 3.0, < 5)
     digest-crc (0.4.1)
     em-http-request (1.1.5)
@@ -220,13 +218,13 @@ GEM
       http_parser.rb (>= 0.6.0)
     em-socksify (0.3.2)
       eventmachine (>= 1.0.0.beta.4)
-    erubi (1.8.0)
-    et-orbi (1.2.1)
+    erubi (1.9.0)
+    et-orbi (1.2.2)
       tzinfo
     event_emitter (0.2.6)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.15.3)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
@@ -238,61 +236,63 @@ GEM
       multi_json (>= 1.0.0)
       rack (>= 1.0.0)
       websocket-driver (>= 0.5.1)
-    faye-websocket (0.10.7)
+    faye-websocket (0.10.9)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
     ffi (1.11.1)
     ffi (1.11.1-java)
     ffi (1.11.1-x64-mingw32)
     ffi (1.11.1-x86-mingw32)
-    fugit (1.2.1)
+    fugit (1.3.3)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-api-client (0.25.0)
+    google-api-client (0.32.1)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.7.0)
+      googleauth (>= 0.5, < 0.10.0)
       httpclient (>= 2.8.1, < 3.0)
-      mime-types (~> 3.0)
+      mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
       signet (~> 0.10)
-    google-cloud-core (1.2.7)
+    google-cloud-core (1.3.1)
       google-cloud-env (~> 1.0)
-    google-cloud-env (1.0.5)
+    google-cloud-env (1.2.1)
       faraday (~> 0.11)
-    google-cloud-storage (1.15.0)
+    google-cloud-storage (1.21.1)
+      addressable (~> 2.5)
       digest-crc (~> 0.4)
-      google-api-client (~> 0.23)
+      google-api-client (~> 0.26)
       google-cloud-core (~> 1.2)
-      googleauth (~> 0.6.2)
-    googleauth (0.6.7)
+      googleauth (>= 0.6.2, < 0.10.0)
+      mini_mime (~> 1.0)
+    googleauth (0.9.0)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.7)
-    hashdiff (0.3.7)
+    hashdiff (1.0.0)
     hiredis (0.6.3)
     hiredis (0.6.3-java)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
     i18n (1.7.0)
       concurrent-ruby (~> 1.0)
-    image_processing (1.7.1)
-      mini_magick (~> 4.0)
+    image_processing (1.9.3)
+      mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.13, < 3)
     jaro_winkler (1.5.3)
     jaro_winkler (1.5.3-java)
-    jdbc-mysql (5.1.46)
-    jdbc-postgres (42.1.4)
-    jdbc-sqlite3 (3.20.1)
+    jdbc-mysql (5.1.47)
+    jdbc-postgres (42.2.6)
+    jdbc-sqlite3 (3.28.0)
     jmespath (1.4.0)
     json (2.2.0)
     json (2.2.0-java)
-    jwt (2.1.0)
+    jwt (2.2.1)
     kindlerb (1.2.0)
       mustache
       nokogiri
@@ -301,7 +301,7 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.2.3)
+    loofah (2.3.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -310,18 +310,15 @@ GEM
       mimemagic (~> 0.3.2)
     memoist (0.16.0)
     method_source (0.9.2)
-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
     mimemagic (0.3.3)
     mini_magick (4.9.5)
-    mini_mime (1.0.1)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.12.2)
-    minitest-bisect (1.4.0)
+    minitest-bisect (1.5.1)
       minitest-server (~> 1.0)
-      path_expander (~> 1.0)
-    minitest-reporters (1.3.6)
+      path_expander (~> 1.1)
+    minitest-reporters (1.4.0)
       ansi
       builder
       minitest (>= 5.0)
@@ -331,19 +328,19 @@ GEM
     minitest-server (1.0.5)
       minitest (~> 5.0)
     mono_logger (1.1.0)
-    msgpack (1.2.10)
-    msgpack (1.2.10-java)
-    msgpack (1.2.10-x64-mingw32)
-    msgpack (1.2.10-x86-mingw32)
+    msgpack (1.3.1)
+    msgpack (1.3.1-java)
+    msgpack (1.3.1-x64-mingw32)
+    msgpack (1.3.1-x86-mingw32)
     multi_json (1.13.1)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     mustache (1.1.0)
     mustermann (1.0.3)
     mysql2 (0.5.2)
     mysql2 (0.5.2-x64-mingw32)
     mysql2 (0.5.2-x86-mingw32)
-    nio4r (2.4.0)
-    nio4r (2.4.0-java)
+    nio4r (2.5.2)
+    nio4r (2.5.2-java)
     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     nokogiri (1.10.4-java)
@@ -351,19 +348,19 @@ GEM
       mini_portile2 (~> 2.4.0)
     nokogiri (1.10.4-x86-mingw32)
       mini_portile2 (~> 2.4.0)
-    os (1.0.0)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    os (1.0.1)
+    parallel (1.18.0)
+    parser (2.6.5.0)
       ast (~> 2.4.0)
-    path_expander (1.0.3)
-    pg (1.1.3)
-    pg (1.1.3-x64-mingw32)
-    pg (1.1.3-x86-mingw32)
+    path_expander (1.1.0)
+    pg (1.1.4)
+    pg (1.1.4-x64-mingw32)
+    pg (1.1.4-x86-mingw32)
     psych (3.1.0)
-    public_suffix (3.0.3)
-    puma (4.1.0)
+    public_suffix (4.0.1)
+    puma (4.2.1)
       nio4r (~> 2.0)
-    puma (4.1.0-java)
+    puma (4.2.1-java)
       nio4r (~> 2.0)
     que (0.14.3)
     qunit-selenium (0.0.4)
@@ -372,9 +369,9 @@ GEM
     raabro (1.1.6)
     racc (1.4.15)
     rack (2.0.7)
-    rack-cache (1.8.0)
+    rack-cache (1.9.0)
       rack (>= 0.4)
-    rack-protection (2.0.5)
+    rack-protection (2.0.7)
       rack
     rack-proxy (0.6.5)
       rack
@@ -383,16 +380,16 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.2.0)
-      loofah (~> 2.2, >= 2.2.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
     rainbow (3.0.0)
-    rake (12.3.3)
+    rake (13.0.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    rdoc (6.0.4)
+    rdoc (6.2.0)
     redcarpet (3.2.3)
-    redis (4.1.2)
+    redis (4.1.3)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
     regexp_parser (1.6.0)
@@ -412,26 +409,26 @@ GEM
       resque (>= 1.26)
       rufus-scheduler (~> 3.2)
     retriable (3.1.2)
-    rubocop (0.74.0)
+    rubocop (0.75.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.3.0)
-      rubocop (>= 0.68.0)
-    rubocop-rails (2.0.0)
-      rack (>= 2.0)
-      rubocop (>= 0.70.0)
+    rubocop-performance (1.5.0)
+      rubocop (>= 0.71.0)
+    rubocop-rails (2.3.2)
+      rack (>= 1.1)
+      rubocop (>= 0.72.0)
     ruby-progressbar (1.10.1)
-    ruby-vips (2.0.13)
+    ruby-vips (2.0.15)
       ffi (~> 1.9)
     ruby_dep (1.5.0)
-    rubyzip (1.2.3)
+    rubyzip (2.0.0)
     rufus-scheduler (3.6.0)
       fugit (~> 1.1, >= 1.1.6)
-    safe_yaml (1.0.4)
+    safe_yaml (1.0.5)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.2.1)
@@ -448,13 +445,13 @@ GEM
       tilt
     sdoc (1.0.0)
       rdoc (>= 5.0)
-    selenium-webdriver (3.142.3)
-      childprocess (>= 0.5, < 2.0)
-      rubyzip (~> 1.2, >= 1.2.2)
-    sequel (5.14.0)
+    selenium-webdriver (3.142.6)
+      childprocess (>= 0.5, < 4.0)
+      rubyzip (>= 1.2.2)
+    sequel (5.25.0)
     serverengine (2.0.7)
       sigdump (~> 0.2.2)
-    sidekiq (6.0.0)
+    sidekiq (6.0.1)
       connection_pool (>= 2.2.2)
       rack (>= 2.0.0)
       rack-protection (>= 2.0.0)
@@ -465,10 +462,10 @@ GEM
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    sinatra (2.0.5)
+    sinatra (2.0.7)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.5)
+      rack-protection (= 2.0.7)
       tilt (~> 2.0)
     sneakers (2.11.0)
       bunny (~> 2.12)
@@ -476,7 +473,7 @@ GEM
       rake
       serverengine (~> 2.0.5)
       thor
-    sprockets (3.7.2)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-export (1.0.0)
@@ -484,9 +481,9 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.0)
-    stackprof (0.2.12)
-    sucker_punch (2.1.1)
+    sqlite3 (1.4.1)
+    stackprof (0.2.13)
+    sucker_punch (2.1.2)
       concurrent-ruby (~> 1.0)
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
@@ -495,16 +492,16 @@ GEM
     thor (0.20.3)
     thread_safe (0.3.6)
     thread_safe (0.3.6-java)
-    tilt (2.0.9)
-    turbolinks (5.2.0)
+    tilt (2.0.10)
+    turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2018.7)
+    tzinfo-data (1.2019.3)
       tzinfo (>= 1.0.0)
     uber (0.1.0)
-    uglifier (4.1.19)
+    uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.6.0)
     useragent (0.16.10)
@@ -514,24 +511,24 @@ GEM
       json (>= 1.8)
       nokogiri (~> 1.6)
     wdm (0.1.1)
-    webdrivers (4.0.0)
+    webdrivers (4.1.3)
       nokogiri (~> 1.6)
-      rubyzip (~> 1.0)
-      selenium-webdriver (~> 3.0)
-    webmock (3.4.2)
+      rubyzip (>= 1.3.0)
+      selenium-webdriver (>= 3.0, < 4.0)
+    webmock (3.7.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
-    webpacker (4.0.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    webpacker (4.0.7)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
     websocket (1.2.8)
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-driver (0.7.0-java)
+    websocket-driver (0.7.1-java)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zeitwerk (2.2.0)
diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb
index 7623e8e352857..ef419d14d10b7 100644
--- a/railties/test/application/asset_debugging_test.rb
+++ b/railties/test/application/asset_debugging_test.rb
@@ -13,6 +13,11 @@ def setup
 
       app_file "app/assets/javascripts/application.js", "//= require_tree ."
       app_file "app/assets/javascripts/xmlhr.js", "function f1() { alert(); }"
+      app_file "app/assets/config/manifest.js", <<~JS
+        //= link_tree ../images
+        //= link_directory ../stylesheets .css
+        //= link_directory ../javascripts .js
+      JS
       app_file "app/views/posts/index.html.erb", "<%= javascript_include_tag 'application' %>"
 
       app_file "config/routes.rb", <<-RUBY
@@ -49,7 +54,7 @@ class ::PostsController < ActionController::Base ; end
       assert_no_match(/<script src="\/assets\/xmlhr-([0-z]+)\.js"><\/script>/, last_response.body)
     end
 
-    test "assets aren't concatenated when compile is true is on and debug_assets params is true" do
+    test "assets are debug when compile is true is on and debug_assets params is true" do
       add_to_env_config "production", "config.assets.compile = true"
 
       # Load app env
@@ -58,8 +63,7 @@ class ::PostsController < ActionController::Base ; end
       class ::PostsController < ActionController::Base ; end
 
       get "/posts?debug_assets=true"
-      assert_match(/<script src="\/assets\/application(\.self)?-([0-z]+)\.js\?body=1"><\/script>/, last_response.body)
-      assert_match(/<script src="\/assets\/xmlhr(\.self)?-([0-z]+)\.js\?body=1"><\/script>/, last_response.body)
+      assert_match(/<script src="\/assets\/application(\.debug|\.self)?-([0-z]+)\.js(\?body=1)?"><\/script>/, last_response.body)
     end
 
     test "public path and tag methods are not over-written by the asset pipeline" do
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 651897d8f386c..e9c8cba8d4da0 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -43,6 +43,7 @@ def clean_assets!
 
     def assert_file_exists(filename)
       globbed = Dir[filename]
+      assert Dir.exist?(File.dirname(filename)), "Directory #{File.dirname(filename)} does not exist"
       assert globbed.one?, "Found #{globbed.size} files matching #{filename}. All files in the directory: #{Dir.entries(File.dirname(filename)).inspect}"
     end
 
@@ -106,7 +107,7 @@ class User < ActiveRecord::Base; raise 'should not be reached'; end
       end
     end
 
-    test "precompile application.js and application.css and all other non JS/CSS files" do
+    test "precompile application.js and application.css and all other non JS/CSS files if manifest requests" do
       app_file "app/assets/javascripts/application.js", "alert();"
       app_file "app/assets/stylesheets/application.css", "body{}"
 
@@ -119,6 +120,12 @@ class User < ActiveRecord::Base; raise 'should not be reached'; end
       app_file "app/assets/javascripts/something.else.js.erb", "alert();"
       app_file "app/assets/stylesheets/something.else.css.erb", "body{}"
 
+      app_file "app/assets/config/manifest.js", <<~JS
+        //= link_tree ../images
+        //= link_directory ../stylesheets .css
+        //= link_directory ../javascripts .js
+      JS
+
       images_should_compile = ["a.png", "happyface.png", "happy_face.png", "happy.face.png",
                                "happy-face.png", "happy.happy_face.png", "happy_happy.face.png",
                                "happy.happy.face.png", "-happy.png", "-happy.face.png",
@@ -158,7 +165,7 @@ class User < ActiveRecord::Base; raise 'should not be reached'; end
 
       precompile!
 
-      assert_file_exists("#{app_path}/public/assets/something/index-*.js")
+      assert_file_exists("#{app_path}/public/assets/something-*.js")
     end
 
     test "precompile use assets defined in app env config" do
@@ -172,6 +179,7 @@ class User < ActiveRecord::Base; raise 'should not be reached'; end
 
     test "sprockets cache is not shared between environments" do
       app_file "app/assets/images/rails.png", "notactuallyapng"
+      remove_file "app/assets/stylesheets/application.css"
       app_file "app/assets/stylesheets/application.css.erb", "body { background: '<%= asset_path('rails.png') %>'; }"
       add_to_env_config "production", 'config.assets.prefix = "production_assets"'
 
@@ -220,30 +228,31 @@ class User < ActiveRecord::Base; raise 'should not be reached'; end
 
     test "precompile creates a manifest file with all the assets listed" do
       app_file "app/assets/images/rails.png", "notactuallyapng"
+      remove_file "app/assets/stylesheets/application.css"
       app_file "app/assets/stylesheets/application.css.erb", "<%= asset_path('rails.png') %>"
-      app_file "app/assets/javascripts/application.js", "alert();"
 
       precompile!
 
       manifest = Dir["#{app_path}/public/assets/.sprockets-manifest-*.json"].first
       assets = ActiveSupport::JSON.decode(File.read(manifest))
-      assert_match(/application-([0-z]+)\.js/, assets["assets"]["application.js"])
       assert_match(/application-([0-z]+)\.css/, assets["assets"]["application.css"])
+      assert_match(/rails-([0-z]+)\.png/, assets["assets"]["rails.png"])
     end
 
     test "the manifest file should be saved by default in the same assets folder" do
-      app_file "app/assets/javascripts/application.js", "alert();"
+      app_file "app/assets/stylesheets/test.css", "a{color: red}"
       add_to_config "config.assets.prefix = '/x'"
 
       precompile!
 
       manifest = Dir["#{app_path}/public/x/.sprockets-manifest-*.json"].first
       assets = ActiveSupport::JSON.decode(File.read(manifest))
-      assert_match(/application-([0-z]+)\.js/, assets["assets"]["application.js"])
+      assert_match(/test-([0-z]+)\.css/, assets["assets"]["test.css"])
     end
 
     test "assets do not require any assets group gem when manifest file is present" do
       app_file "app/assets/javascripts/application.js", "alert();"
+      app_file "app/assets/config/manifest.js", "//= link application.js"
       add_to_env_config "production", "config.public_file_server.enabled = true"
 
       precompile! RAILS_ENV: "production"
@@ -264,6 +273,7 @@ class User < ActiveRecord::Base; raise 'should not be reached'; end
 
     test "precompile properly refers files referenced with asset_path" do
       app_file "app/assets/images/rails.png", "notactuallyapng"
+      remove_file "app/assets/stylesheets/application.css"
       app_file "app/assets/stylesheets/application.css.erb", "p { background-image: url(<%= asset_path('rails.png') %>) }"
 
       precompile!
@@ -275,6 +285,7 @@ class User < ActiveRecord::Base; raise 'should not be reached'; end
     test "precompile shouldn't use the digests present in manifest.json" do
       app_file "app/assets/images/rails.png", "notactuallyapng"
 
+      remove_file "app/assets/stylesheets/application.css"
       app_file "app/assets/stylesheets/application.css.erb", "p { background-image: url(<%= asset_path('rails.png') %>) }"
 
       precompile! RAILS_ENV: "production"
@@ -293,6 +304,7 @@ class User < ActiveRecord::Base; raise 'should not be reached'; end
 
     test "precompile appends the MD5 hash to files referenced with asset_path and run in production with digest true" do
       app_file "app/assets/images/rails.png", "notactuallyapng"
+      remove_file "app/assets/stylesheets/application.css"
       app_file "app/assets/stylesheets/application.css.erb", "p { background-image: url(<%= asset_path('rails.png') %>) }"
 
       precompile! RAILS_ENV: "production"
@@ -410,9 +422,11 @@ class ::PostsController < ActionController::Base ; end
       app_file "app/models/post.rb", "class Post; end"
       app_file "app/assets/javascripts/application.js", "//= require_tree ."
       app_file "app/assets/javascripts/xmlhr.js.erb", "<%= Post.name %>"
+      app_file "app/assets/config/manifest.js", "//= link application.js"
 
       precompile!
 
+      assert_file_exists("#{app_path}/public/assets/application-*.js")
       assert_match(/Post;/, File.read(Dir["#{app_path}/public/assets/application-*.js"].first))
     end
 
@@ -461,9 +475,9 @@ class ::PostsController < ActionController::Base ; end
       class ::PostsController < ActionController::Base; end
 
       get "/posts", {}, { "HTTPS" => "off" }
-      assert_match('src="http://example.com/assets/application.self.js', last_response.body)
+      assert_match('src="http://example.com/assets/application.debug.js', last_response.body)
       get "/posts", {}, { "HTTPS" => "on" }
-      assert_match('src="https://example.com/assets/application.self.js', last_response.body)
+      assert_match('src="https://example.com/assets/application.debug.js', last_response.body)
     end
 
     test "asset URLs should be protocol-relative if no request is in scope" do
@@ -495,6 +509,11 @@ def app_with_assets_in_view
         app_file "app/assets/javascripts/application.js", "//= require_tree ."
         app_file "app/assets/javascripts/xmlhr.js", "function f1() { alert(); }"
         app_file "app/views/posts/index.html.erb", "<%= javascript_include_tag 'application' %>"
+        app_file "app/assets/config/manifest.js", <<~JS
+          //= link_tree ../images
+          //= link_directory ../stylesheets .css
+          //= link_directory ../javascripts .js
+        JS
 
         app_file "config/routes.rb", <<-RUBY
         Rails.application.routes.draw do