Merge branch '2.x' into scope-alias-error-to-av

Author: josh

test/test_helper.rb

@@ -700,15 +700,15 @@ def test_ignores_missing_dependencies
     assert_includes paths, "missing.css.erb"
   end
 
-  if Sprockets::VERSION > "3"
+  if Sprockets::VERSION > "3.1"
     def test_asset_path_with_index_requires_exact_logical_path
       Sprockets::Rails::Helper.raise_runtime_errors = true
-      Sprockets::Rails::Helper.precompile = ["bundle.js"]
+      Sprockets::Rails::Helper.precompile = ["bundle/index.js"]
 
-      assert @view.asset_path("bundle.js")
+      assert @view.asset_path("bundle/index.js")
 
       assert_raises(Sprockets::Rails::Helper::AssetAliasUsed) do
-        assert @view.asset_path("bundle/index.js")
+        assert @view.asset_path("bundle.js")
       end
     end