stripe 1.18.0 → 1.30.0

data/test/stripe/subscription_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../../test_helper', __FILE__)
 module Stripe
   class SubscriptionTest < Test::Unit::TestCase
     should "subscriptions should be listable" do
-      @mock.expects(:get).once.returns(test_response(test_customer))
+      @mock.expects(:get).once.returns(make_response(make_customer))
 
       customer = Stripe::Customer.retrieve('test_customer')
 
@@ -11,7 +11,7 @@ module Stripe
     end
 
     should "subscriptions should be refreshable" do
-      @mock.expects(:get).twice.returns(test_response(test_customer), test_response(test_subscription(:id => 'refreshed_subscription')))
+      @mock.expects(:get).twice.returns(make_response(make_customer), make_response(make_subscription(:id => 'refreshed_subscription')))
 
       customer = Stripe::Customer.retrieve('test_customer')
       subscription = customer.subscriptions.first
@@ -21,20 +21,20 @@ module Stripe
     end
 
     should "subscriptions should be deletable" do
-      @mock.expects(:get).once.returns(test_response(test_customer))
+      @mock.expects(:get).once.returns(make_response(make_customer))
       customer = Stripe::Customer.retrieve('test_customer')
       subscription = customer.subscriptions.first
 
-      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions/#{subscription.id}?at_period_end=true", nil, nil).returns(test_response(test_subscription))
+      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions/#{subscription.id}?at_period_end=true", nil, nil).returns(make_response(make_subscription))
       subscription.delete :at_period_end => true
 
-      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions/#{subscription.id}", nil, nil).returns(test_response(test_subscription))
+      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions/#{subscription.id}", nil, nil).returns(make_response(make_subscription))
       subscription.delete
     end
 
     should "subscriptions should be updateable" do
-      @mock.expects(:get).once.returns(test_response(test_customer))
-      @mock.expects(:post).once.returns(test_response(test_subscription({:status => 'active'})))
+      @mock.expects(:get).once.returns(make_response(make_customer))
+      @mock.expects(:post).once.returns(make_response(make_subscription({:status => 'active'})))
 
       customer = Stripe::Customer.retrieve('test_customer')
       subscription = customer.subscriptions.first
@@ -47,8 +47,8 @@ module Stripe
     end
 
     should "create should return a new subscription" do
-      @mock.expects(:get).once.returns(test_response(test_customer))
-      @mock.expects(:post).once.returns(test_response(test_subscription(:id => 'test_new_subscription')))
+      @mock.expects(:get).once.returns(make_response(make_customer))
+      @mock.expects(:post).once.returns(make_response(make_subscription(:id => 'test_new_subscription')))
 
       customer = Stripe::Customer.retrieve('test_customer')
       subscription = customer.subscriptions.create(:plan => 'silver')
@@ -56,15 +56,15 @@ module Stripe
     end
 
     should "be able to delete a subscriptions's discount" do
-      @mock.expects(:get).once.returns(test_response(test_customer))
-      @mock.expects(:post).once.returns(test_response(test_subscription(:id => 'test_new_subscription')))
+      @mock.expects(:get).once.returns(make_response(make_customer))
+      @mock.expects(:post).once.returns(make_response(make_subscription(:id => 'test_new_subscription')))
 
 
-      customer = Stripe::Customer.retrieve("test_customer")
+      customer = Stripe::Customer.retrieve('test_customer')
       subscription = customer.subscriptions.create(:plan => 'silver')
 
       url = "#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions/test_new_subscription/discount"
-      @mock.expects(:delete).once.with(url, nil, nil).returns(test_response(test_delete_discount_response))
+      @mock.expects(:delete).once.with(url, nil, nil).returns(make_response(make_delete_discount_response))
       subscription.delete_discount
       assert_equal nil, subscription.discount
     end

data/test/stripe/transfer_test.rb

@@ -3,22 +3,22 @@ require File.expand_path('../../test_helper', __FILE__)
 module Stripe
   class TransferTest < Test::Unit::TestCase
     should "retrieve should retrieve transfer" do
-      @mock.expects(:get).once.returns(test_response(test_transfer))
+      @mock.expects(:get).once.returns(make_response(make_transfer))
       transfer = Stripe::Transfer.retrieve('tr_test_transfer')
       assert_equal 'tr_test_transfer', transfer.id
     end
 
     should "create should create a transfer" do
-      @mock.expects(:post).once.returns(test_response(test_transfer))
+      @mock.expects(:post).once.returns(make_response(make_transfer))
       transfer = Stripe::Transfer.create
       assert_equal "tr_test_transfer", transfer.id
     end
 
     should "cancel should cancel a transfer" do
-      @mock.expects(:get).once.returns(test_response(test_transfer))
+      @mock.expects(:get).once.returns(make_response(make_transfer))
       transfer = Stripe::Transfer.retrieve('tr_test_transfer')
 
-      @mock.expects(:post).once.with('https://api.stripe.com/v1/transfers/tr_test_transfer/cancel', nil, '').returns(test_response(test_canceled_transfer))
+      @mock.expects(:post).once.with('https://api.stripe.com/v1/transfers/tr_test_transfer/cancel', nil, '').returns(make_response(make_canceled_transfer))
       transfer.cancel
     end
   end

data/test/stripe/util_test.rb

@@ -2,7 +2,48 @@ require File.expand_path('../../test_helper', __FILE__)
 
 module Stripe
   class UtilTest < Test::Unit::TestCase
-    should "symbolize_names should convert names to symbols" do
+    should "#encode_parameters should prepare parameters for an HTTP request" do
+      params = {
+        :a => 3,
+        :b => "+foo?",
+        :c => "bar&baz",
+        :d => { :a => "a", :b => "b" },
+        :e => [0, 1],
+      }
+      assert_equal(
+        "a=3&b=%2Bfoo%3F&c=bar%26baz&d[a]=a&d[b]=b&e[]=0&e[]=1",
+        Stripe::Util.encode_parameters(params)
+      )
+    end
+
+    should "#url_encode should prepare strings for HTTP" do
+      assert_equal "foo",      Stripe::Util.url_encode("foo")
+      assert_equal "foo",      Stripe::Util.url_encode(:foo)
+      assert_equal "foo%2B",   Stripe::Util.url_encode("foo+")
+      assert_equal "foo%26",   Stripe::Util.url_encode("foo&")
+      assert_equal "foo[bar]", Stripe::Util.url_encode("foo[bar]")
+    end
+
+    should "#flatten_params should encode parameters according to Rails convention" do
+      params = {
+        :a => 3,
+        :b => "foo?",
+        :c => "bar&baz",
+        :d => { :a => "a", :b => "b" },
+        :e => [0, 1],
+      }
+      assert_equal([
+        ["a",    3],
+        ["b",    "foo?"],
+        ["c",    "bar&baz"],
+        ["d[a]", "a"],
+        ["d[b]", "b"],
+        ["e[]",  0],
+        ["e[]",  1],
+      ], Stripe::Util.flatten_params(params))
+    end
+
+    should "#symbolize_names should convert names to symbols" do
       start = {
         'foo' => 'bar',
         'array' => [{ 'foo' => 'bar' }],
@@ -26,34 +67,9 @@ module Stripe
       assert_equal(finish, symbolized)
     end
 
-    should "parse a nil opts argument" do
-      api_key, headers = Stripe::Util.parse_opts(nil)
-      assert_equal({}, headers)
-      assert_equal(nil, api_key)
-    end
-
-    should "parse a string opts argument" do
-      api_key, headers = Stripe::Util.parse_opts('foo')
-      assert_equal({}, headers)
-      assert_equal('foo', api_key)
-    end
-
-    should "parse a hash opts argument with just api_key" do
-      api_key, headers = Stripe::Util.parse_opts({:api_key => 'foo'})
-      assert_equal({}, headers)
-      assert_equal('foo', api_key)
-    end
-
-    should "parse a hash opts argument with just idempotency_key" do
-      api_key, headers = Stripe::Util.parse_opts({:idempotency_key => 'foo'})
-      assert_equal({:idempotency_key => 'foo'}, headers)
-      assert_equal(nil, api_key)
-    end
-
-    should "parse a hash opts argument both idempotency_key and api_key" do
-      api_key, headers = Stripe::Util.parse_opts({:api_key => 'bar', :idempotency_key => 'foo'})
-      assert_equal({:idempotency_key => 'foo'}, headers)
-      assert_equal('bar', api_key)
+    should "#normalize_opts should reject nil keys" do
+      assert_raise { Stripe::Util.normalize_opts(nil) }
+      assert_raise { Stripe::Util.normalize_opts(:api_key => nil) }
     end
   end
 end

data/test/stripe_test.rb

@@ -0,0 +1,16 @@
+require File.expand_path('../test_helper', __FILE__)
+
+class StripeTest < Test::Unit::TestCase
+  should "warn that #refresh_from is deprecated" do
+    old_stderr = $stderr
+    $stderr = StringIO.new
+    begin
+      Stripe.uri_encode({})
+      message = "NOTE: Stripe.uri_encode is deprecated; use " +
+        "Stripe::Util#encode_parameters instead"
+      assert_match Regexp.new(message), $stderr.string
+    ensure
+      $stderr = old_stderr
+    end
+  end
+end