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

@@ -1,67 +1,66 @@
 require 'test_helper'
 
 class DomainsTest < Imgix::Test
 
   def test_deterministically_choosing_a_path
-    client = Imgix::Client.new(:hosts => [
+    client = Imgix::Client.new(hosts: [
         "demos-1.imgix.net",
         "demos-2.imgix.net",
         "demos-3.imgix.net",
       ],
-      :token => '10adc394',
-      :include_library_param => false)
+      secure_url_token: '10adc394',
+      include_library_param: false)
 
     path = client.path('/bridge.png')
-    assert_equal 'http://demos-1.imgix.net/bridge.png?&s=13e68f249172e5f790344e85e7cdb14b', path.to_url
+    assert_equal 'https://demos-1.imgix.net/bridge.png?s=0233fd6de51f20f11cff6b452b7a9a05', path.to_url
 
     path = client.path('/flower.png')
-    assert_equal 'http://demos-2.imgix.net/flower.png?&s=7793669cc41d31fd21c26ede9709ef03', path.to_url
+    assert_equal 'https://demos-2.imgix.net/flower.png?s=02105961388864f85c04121ea7b50e08', path.to_url
   end
 
   def test_cycling_choosing_domain_in_order
-    client = Imgix::Client.new(:hosts => [
+    client = Imgix::Client.new(hosts: [
         "demos-1.imgix.net",
         "demos-2.imgix.net",
         "demos-3.imgix.net",
       ],
-      :token => '10adc394',
-      :shard_strategy => :cycle,
-      :include_library_param => false)
+      secure_url_token: '10adc394',
+      shard_strategy: :cycle,
+      include_library_param: false)
 
     path = client.path('/bridge.png')
-    assert_equal 'http://demos-1.imgix.net/bridge.png?&s=13e68f249172e5f790344e85e7cdb14b', path.to_url
+    assert_equal 'https://demos-1.imgix.net/bridge.png?s=0233fd6de51f20f11cff6b452b7a9a05', path.to_url
 
     path = client.path('/bridge.png')
-    assert_equal 'http://demos-2.imgix.net/bridge.png?&s=13e68f249172e5f790344e85e7cdb14b', path.to_url
+    assert_equal 'https://demos-2.imgix.net/bridge.png?s=0233fd6de51f20f11cff6b452b7a9a05', path.to_url
 
     path = client.path('/bridge.png')
-    assert_equal 'http://demos-3.imgix.net/bridge.png?&s=13e68f249172e5f790344e85e7cdb14b', path.to_url
+    assert_equal 'https://demos-3.imgix.net/bridge.png?s=0233fd6de51f20f11cff6b452b7a9a05', path.to_url
 
     path = client.path('/bridge.png')
-    assert_equal 'http://demos-1.imgix.net/bridge.png?&s=13e68f249172e5f790344e85e7cdb14b', path.to_url
+    assert_equal 'https://demos-1.imgix.net/bridge.png?s=0233fd6de51f20f11cff6b452b7a9a05', path.to_url
   end
 
   def test_strips_out_protocol
-    client = Imgix::Client.new(:host =>
-        "http://demos-1.imgix.net",
-        :token => '10adc394',
-      :include_library_param => false)
+    client = Imgix::Client.new(host: "http://demos-1.imgix.net",
+      secure_url_token: '10adc394',
+      include_library_param: false)
 
     path = client.path('/bridge.png')
-    assert_equal 'http://demos-1.imgix.net/bridge.png?&s=13e68f249172e5f790344e85e7cdb14b', path.to_url
+    assert_equal 'https://demos-1.imgix.net/bridge.png?s=0233fd6de51f20f11cff6b452b7a9a05', path.to_url
   end
 
   def test_with_full_paths
-    client = Imgix::Client.new(:hosts => [
+    client = Imgix::Client.new(hosts: [
         "demos-1.imgix.net",
         "demos-2.imgix.net",
         "demos-3.imgix.net",
       ],
-      :token => '10adc394',
-      :shard_strategy => :cycle,
-      :include_library_param => false)
+      secure_url_token: '10adc394',
+      shard_strategy: :cycle,
+      include_library_param: false)
 
     path = 'https://google.com/cats.gif'
-    assert_equal "http://demos-1.imgix.net/#{CGI.escape(path)}?&s=4c3ff935011f0d2251800e6a2bb68ee5", client.path(path).to_url
+    assert_equal "https://demos-1.imgix.net/#{CGI.escape(path)}?s=e686099fbba86fc2b8141d3c1ff60605", client.path(path).to_url
   end
 end