Remove legacy processor deprecations from tests

rails · Jun 22, 2016 · d892b63 · d892b63
1 parent 7ba68cc
commit d892b63
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 32 deletions.
diff --git a/test/sprockets_test.rb b/test/sprockets_test.rb
@@ -197,3 +197,12 @@ def write(filename, contents, mtime = nil)
     end
   end
 end
+
+module Sprockets
+  module SilenceDeprecation
+    def self.silence(&block)
+      Deprecation.silence(&block)
+    end
+  end
+end
+
diff --git a/test/test_context.rb b/test/test_context.rb
@@ -112,15 +112,22 @@ def render(context, locals = {})
   test "block custom processor" do
     require 'base64'
 
-    @env.register_preprocessor 'text/css', :data_uris do |context, data|
-      data.gsub(/url\(\"(.+?)\"\)/) do
-        path = context.resolve($1, compat: true)
-        context.depend_on(path)
-        data = Base64.encode64(File.open(path, "rb") { |f| f.read })
-        "url(data:image/png;base64,#{data})"
+    klass = Class.new do
+      def self.call(input)
+        data   = input[:data]
+        result = data.gsub(/url\(\"(.+?)\"\)/) do
+          context = input[:environment].context_class.new(input)
+          path = context.resolve($1, compat: true)
+          context.depend_on(path)
+          data = Base64.encode64(File.open(path, "rb") { |f| f.read })
+          "url(data:image/png;base64,#{data})"
+        end
+        { data: result }
       end
     end
 
+    @env.register_preprocessor 'text/css', klass
+
     assert_equal ".pow {\n  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZoAAAEsCAMAAADNS4U5AAAAGXRFWHRTb2Z0\n",
       @env["sprite2.css"].to_s.lines.to_a[0..1].join
     assert_equal 58240, @env["sprite2.css"].length

diff --git a/test/test_encoding.rb b/test/test_encoding.rb
@@ -46,7 +46,12 @@ def setup
   end
 
   test "read processed BINARY asset" do
-    @env.register_postprocessor('image/png', :noop_processor) { |context, data| data }
+    klass = Class.new do
+      def self.call(input)
+        input[:data]
+      end
+    end
+    @env.register_postprocessor('image/png', klass)
     data = @env['binary.png'].to_s
     assert_equal "\x89PNG\r\n\x1A\n\x00\x00\x00".force_encoding("BINARY"),
       data[0..10]

diff --git a/test/test_environment.rb b/test/test_environment.rb
@@ -539,43 +539,53 @@ def setup
   end
 
   test "register global block preprocessor" do
-    old_size = new_environment.preprocessors['text/css'].size
-    Sprockets.register_preprocessor('text/css', :foo) { |context, data| data }
-    assert_equal old_size+1, new_environment.preprocessors['text/css'].size
-    Sprockets.unregister_preprocessor('text/css', :foo)
-    assert_equal old_size, new_environment.preprocessors['text/css'].size
+    Sprockets::SilenceDeprecation.silence do
+      old_size = new_environment.preprocessors['text/css'].size
+      Sprockets.register_preprocessor('text/css', :foo) { |context, data| data }
+      assert_equal old_size+1, new_environment.preprocessors['text/css'].size
+      Sprockets.unregister_preprocessor('text/css', :foo)
+      assert_equal old_size, new_environment.preprocessors['text/css'].size
+    end
   end
 
   test "unregister custom block preprocessor" do
-    old_size = @env.preprocessors['text/css'].size
-    @env.register_preprocessor('text/css', :foo) { |context, data| data }
-    assert_equal old_size+1, @env.preprocessors['text/css'].size
-    @env.unregister_preprocessor('text/css', :foo)
-    assert_equal old_size, @env.preprocessors['text/css'].size
+    Sprockets::SilenceDeprecation.silence do
+      old_size = @env.preprocessors['text/css'].size
+      @env.register_preprocessor('text/css', :foo) { |context, data| data }
+      assert_equal old_size+1, @env.preprocessors['text/css'].size
+      @env.unregister_preprocessor('text/css', :foo)
+      assert_equal old_size, @env.preprocessors['text/css'].size
+    end
   end
 
   test "unregister custom block postprocessor" do
-    old_size = @env.postprocessors['text/css'].size
-    @env.register_postprocessor('text/css', :foo) { |context, data| data }
-    assert_equal old_size+1, @env.postprocessors['text/css'].size
-    @env.unregister_postprocessor('text/css', :foo)
-    assert_equal old_size, @env.postprocessors['text/css'].size
+    Sprockets::SilenceDeprecation.silence do
+      old_size = @env.postprocessors['text/css'].size
+      @env.register_postprocessor('text/css', :foo) { |context, data| data }
+      assert_equal old_size+1, @env.postprocessors['text/css'].size
+      @env.unregister_postprocessor('text/css', :foo)
+      assert_equal old_size, @env.postprocessors['text/css'].size
+    end
   end
 
   test "register global block postprocessor" do
-    old_size = new_environment.postprocessors['text/css'].size
-    Sprockets.register_postprocessor('text/css', :foo) { |context, data| data }
-    assert_equal old_size+1, new_environment.postprocessors['text/css'].size
-    Sprockets.unregister_postprocessor('text/css', :foo)
-    assert_equal old_size, new_environment.postprocessors['text/css'].size
+    Sprockets::SilenceDeprecation.silence do
+      old_size = new_environment.postprocessors['text/css'].size
+      Sprockets.register_postprocessor('text/css', :foo) { |context, data| data }
+      assert_equal old_size+1, new_environment.postprocessors['text/css'].size
+      Sprockets.unregister_postprocessor('text/css', :foo)
+      assert_equal old_size, new_environment.postprocessors['text/css'].size
+    end
   end
 
   test "unregister custom block bundle processor" do
-    old_size = @env.bundle_processors['text/css'].size
-    @env.register_bundle_processor('text/css', :foo) { |context, data| data }
-    assert_equal old_size+1, @env.bundle_processors['text/css'].size
-    @env.unregister_bundle_processor('text/css', :foo)
-    assert_equal old_size, @env.bundle_processors['text/css'].size
+    Sprockets::SilenceDeprecation.silence do
+      old_size = @env.bundle_processors['text/css'].size
+      @env.register_bundle_processor('text/css', :foo) { |context, data| data }
+      assert_equal old_size+1, @env.bundle_processors['text/css'].size
+      @env.unregister_bundle_processor('text/css', :foo)
+      assert_equal old_size, @env.bundle_processors['text/css'].size
+    end
   end
 
   test "register global bundle processor" do