spec/paperclip/url_generator_spec.rb in kt-paperclip-5.4.0 vs spec/paperclip/url_generator_spec.rb in kt-paperclip-6.2.0

@@ -1,7 +1,6 @@
-# encoding: utf-8
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::UrlGenerator do
   it "uses the given interpolator" do
     expected = "the expected result"
     mock_interpolator = MockInterpolator.new(result: expected)
@@ -23,24 +22,24 @@
 
     url_generator = Paperclip::UrlGenerator.new(mock_attachment)
     url_generator.for(:style_name, {})
 
     assert mock_interpolator.has_interpolated_pattern?(default_url),
-      "expected the interpolator to be passed #{default_url.inspect} but it wasn't"
+           "expected the interpolator to be passed #{default_url.inspect} but it wasn't"
   end
 
   it "executes the default URL lambda when no file is assigned" do
     mock_interpolator = MockInterpolator.new
-    default_url = lambda {|attachment| "the #{attachment.class.name} default url" }
-    options = { interpolator: mock_interpolator, default_url: default_url}
+    default_url = lambda { |attachment| "the #{attachment.class.name} default url" }
+    options = { interpolator: mock_interpolator, default_url: default_url }
     mock_attachment = MockAttachment.new(options)
 
     url_generator = Paperclip::UrlGenerator.new(mock_attachment)
     url_generator.for(:style_name, {})
 
     assert mock_interpolator.has_interpolated_pattern?("the MockAttachment default url"),
-      %{expected the interpolator to be passed "the MockAttachment default url", but it wasn't}
+           %{expected the interpolator to be passed "the MockAttachment default url", but it wasn't}
   end
 
   it "executes the method named by the symbol as the default URL when no file is assigned" do
     mock_model = FakeModel.new
     default_url = :to_s
@@ -54,21 +53,21 @@
 
     url_generator = Paperclip::UrlGenerator.new(mock_attachment)
     url_generator.for(:style_name, {})
 
     assert mock_interpolator.has_interpolated_pattern?(mock_model.to_s),
-      %{expected the interpolator to be passed #{mock_model.to_s}, but it wasn't}
+           %{expected the interpolator to be passed #{mock_model}, but it wasn't}
   end
 
   it "URL-escapes spaces if asked to" do
     expected = "the expected result"
     mock_interpolator = MockInterpolator.new(result: expected)
     options = { interpolator: mock_interpolator }
     mock_attachment = MockAttachment.new(options)
     url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
-    result = url_generator.for(:style_name, {escape: true})
+    result = url_generator.for(:style_name, escape: true)
 
     assert_equal "the%20expected%20result", result
   end
 
   it "escapes the result of the interpolator using a method on the object, if asked to escape" do
@@ -80,11 +79,11 @@
     mock_interpolator = MockInterpolator.new(result: expected)
     options = { interpolator: mock_interpolator }
     mock_attachment = MockAttachment.new(options)
     url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
-    result = url_generator.for(:style_name, {escape: true})
+    result = url_generator.for(:style_name, escape: true)
 
     assert_equal "the escaped result", result
   end
 
   it "leaves spaces unescaped as asked to" do
@@ -92,11 +91,11 @@
     mock_interpolator = MockInterpolator.new(result: expected)
     options = { interpolator: mock_interpolator }
     mock_attachment = MockAttachment.new(options)
     url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
-    result = url_generator.for(:style_name, {escape: false})
+    result = url_generator.for(:style_name, escape: false)
 
     assert_equal "the expected result", result
   end
 
   it "defaults to leaving spaces unescaped" do
@@ -116,11 +115,11 @@
     mock_interpolator = MockInterpolator.new(result: expected)
     options = { interpolator: mock_interpolator, responds_to_updated_at: false }
     mock_attachment = MockAttachment.new(options)
     url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
-    result = url_generator.for(:style_name, {timestamp: true})
+    result = url_generator.for(:style_name, timestamp: true)
 
     assert_equal expected, result
   end
 
   it "produces URLs without the updated_at value when the updated_at value is nil" do
@@ -132,11 +131,11 @@
       interpolator: mock_interpolator,
     }
     mock_attachment = MockAttachment.new(options)
     url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
-    result = url_generator.for(:style_name, {timestamp: true})
+    result = url_generator.for(:style_name, timestamp: true)
 
     assert_equal expected, result
   end
 
   it "produces URLs with the updated_at when it exists" do
@@ -145,11 +144,11 @@
     mock_interpolator = MockInterpolator.new(result: expected)
     options = { interpolator: mock_interpolator, updated_at: updated_at }
     mock_attachment = MockAttachment.new(options)
     url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
-    result = url_generator.for(:style_name, {timestamp: true})
+    result = url_generator.for(:style_name, timestamp: true)
 
     assert_equal "#{expected}?#{updated_at}", result
   end
 
   it "produces URLs with the updated_at when it exists, separated with a & if a ? follow by = already exists" do
@@ -158,11 +157,11 @@
     mock_interpolator = MockInterpolator.new(result: expected)
     options = { interpolator: mock_interpolator, updated_at: updated_at }
     mock_attachment = MockAttachment.new(options)
     url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
-    result = url_generator.for(:style_name, {timestamp: true})
+    result = url_generator.for(:style_name, timestamp: true)
 
     assert_equal "#{expected}&#{updated_at}", result
   end
 
   it "produces URLs without the updated_at when told to do as much" do
@@ -171,11 +170,11 @@
     mock_interpolator = MockInterpolator.new(result: expected)
     options = { interpolator: mock_interpolator, updated_at: updated_at }
     mock_attachment = MockAttachment.new(options)
     url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
-    result = url_generator.for(:style_name, {timestamp: false})
+    result = url_generator.for(:style_name, timestamp: false)
 
     assert_equal expected, result
   end
 
   it "produces the correct URL when the instance has a file name" do
@@ -190,33 +189,23 @@
 
     url_generator = Paperclip::UrlGenerator.new(mock_attachment)
     url_generator.for(:style_name, {})
 
     assert mock_interpolator.has_interpolated_pattern?(expected),
-      "expected the interpolator to be passed #{expected.inspect} but it wasn't"
+           "expected the interpolator to be passed #{expected.inspect} but it wasn't"
   end
 
-  it "doesn't emit deprecation warnings" do
-    expected = "the expected result"
-    mock_interpolator = MockInterpolator.new(result: expected)
-    options = { interpolator: mock_interpolator }
-    mock_attachment = MockAttachment.new(options)
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
-
-    expect { url_generator.for(:style_name, escape: true) }.to_not(output(/URI\.(un)?escape is obsolete/).to_stderr)
-  end
-
   describe "should be able to escape (, ), [, and ]." do
-    def generate(expected, updated_at=nil)
+    def generate(expected, updated_at = nil)
       mock_interpolator = MockInterpolator.new(result: expected)
       options = { interpolator: mock_interpolator, updated_at: updated_at }
       mock_attachment = MockAttachment.new(options)
       url_generator = Paperclip::UrlGenerator.new(mock_attachment)
       def url_generator.respond_to(params)
         false if params == :escape
       end
-      url_generator.for(:style_name, {escape: true, timestamp: !!updated_at})
+      url_generator.for(:style_name, escape: true, timestamp: !!updated_at)
     end
 
     it "not timestamp" do
       expected = "the(expected)result[]"
       assert_equal "the%28expected%29result%5B%5D", generate(expected)
@@ -224,9 +213,9 @@
 
     it "timestamp" do
       expected = "the(expected)result[]"
       updated_at = 1231231234
       assert_equal "the%28expected%29result%5B%5D?#{updated_at}",
-        generate(expected, updated_at)
+                   generate(expected, updated_at)
     end
   end
 end