test/units/path_test.rb in imgix-0.3.5 vs test/units/path_test.rb in imgix-1.0.0

@@ -1,18 +1,18 @@
 require 'test_helper'
 
 class PathTest < Imgix::Test
   def test_creating_a_path
     path = client.path('/images/demo.png')
-    assert_equal 'http://demo.imgix.net/images/demo.png?&s=3c1d676d4daf28c044dd83e8548f834a', path.to_url
+    assert_equal 'https://demo.imgix.net/images/demo.png?s=2c7c157eaf23b06a0deb2f60b81938c4', path.to_url
 
     path = client.path('images/demo.png')
-    assert_equal 'http://demo.imgix.net/images/demo.png?&s=3c1d676d4daf28c044dd83e8548f834a', path.to_url
+    assert_equal 'https://demo.imgix.net/images/demo.png?s=2c7c157eaf23b06a0deb2f60b81938c4', path.to_url
   end
 
   def test_signing_path_with_param
-    url = 'http://demo.imgix.net/images/demo.png?w=200&s=da421114ca238d1f4a927b889f67c34e'
+    url = 'https://demo.imgix.net/images/demo.png?w=200&s=da421114ca238d1f4a927b889f67c34e'
     path = client.path('/images/demo.png')
     path.width = 200
 
     assert_equal url, path.to_url
 
@@ -22,55 +22,63 @@
     path = client.path('/images/demo.png')
     assert_equal url, path.width(200).to_url
   end
 
   def test_resetting_defaults
-    url = 'http://demo.imgix.net/images/demo.png?w=200&s=da421114ca238d1f4a927b889f67c34e'
+    url = 'https://demo.imgix.net/images/demo.png?w=200&s=da421114ca238d1f4a927b889f67c34e'
     path = client.path('/images/demo.png')
     path.height = 300
 
     assert_equal url, path.defaults.to_url(w: 200)
   end
 
   def test_path_with_multiple_params
-    url = 'http://demo.imgix.net/images/demo.png?h=200&w=200&s=d570a1ecd765470f7b34a69b56718a7a'
+    url = 'https://demo.imgix.net/images/demo.png?h=200&w=200&s=d570a1ecd765470f7b34a69b56718a7a'
     path = client.path('/images/demo.png')
 
     assert_equal url, path.to_url(h: 200, w: 200)
 
     path = client.path('/images/demo.png')
     assert_equal url, path.height(200).width(200).to_url
   end
 
   def test_path_with_multi_value_param_safely_encoded
-    url = 'http://demo.imgix.net/images/demo.png?markalign=middle%2Ccenter&s=f0d0e28a739f022638f4ba6dddf9b694'
+    url = 'https://demo.imgix.net/images/demo.png?markalign=middle%2Ccenter&s=f0d0e28a739f022638f4ba6dddf9b694'
     path = client.path('/images/demo.png')
 
     assert_equal url, path.markalign('middle', 'center').to_url
   end
 
   def test_host_is_required
     assert_raises(ArgumentError) {Imgix::Client.new}
   end
 
   def test_token_is_optional
-    client = Imgix::Client.new(host: 'demo.imgix.net', :include_library_param => false)
-    url = 'http://demo.imgix.net/images/demo.png?'
+    client = Imgix::Client.new(host: 'demo.imgix.net', include_library_param: false)
+    url = 'https://demo.imgix.net/images/demo.png'
     path = client.path('/images/demo.png')
 
     assert_equal url, path.to_url
   end
 
+  def test_https_is_optional
+    client = Imgix::Client.new(host: 'demo.imgix.net', include_library_param: false, use_https: false)
+    url = 'http://demo.imgix.net/images/demo.png'
+    path = client.path('/images/demo.png')
+
+    assert_equal url, path.to_url
+  end
+
   def test_full_url
     path = 'https://google.com/cats.gif'
 
-    assert_equal "http://demo.imgix.net/#{CGI.escape(path)}?&s=4c3ff935011f0d2251800e6a2bb68ee5", client.path(path).to_url
+    assert_equal "https://demo.imgix.net/#{CGI.escape(path)}?s=e686099fbba86fc2b8141d3c1ff60605", client.path(path).to_url
   end
 
   def test_full_url_with_a_space
     path = 'https://my-demo-site.com/files/133467012/avatar icon.png'
-    assert_equal "http://demo.imgix.net/#{CGI.escape(path)}?&s=8943817bed50811f6ceedd8f4b84169d", client.path(path).to_url
+    assert_equal "https://demo.imgix.net/#{CGI.escape(path)}?s=35ca40e2e7b6bd208be2c4f7073f658e", client.path(path).to_url
   end
 
   def test_include_library_param
     client = Imgix::Client.new(host: 'demo.imgix.net') # enabled by default
     url = client.path('/images/demo.png').to_url
@@ -88,8 +96,8 @@
   end
 
 private
 
   def client
-    @client ||= Imgix::Client.new(:host => 'demo.imgix.net', :token => '10adc394', :include_library_param => false)
+    @client ||= Imgix::Client.new(host: 'demo.imgix.net', secure_url_token: '10adc394', include_library_param: false)
   end
 end