stripe-ruby-mock 2.0.1 → 2.0.2

data/spec/shared_stripe_examples/charge_examples.rb

@@ -9,7 +9,7 @@ shared_examples 'Charge API' do
         currency: 'usd',
         card: 'bogus_card_token'
       )
-    }.to raise_error(Stripe::InvalidRequestError, /Invalid token id/)
+    }.to raise_error(Stripe::InvalidRequestError, /token/i)
   end
 
   it "creates a stripe charge item with a card token" do
@@ -120,21 +120,27 @@ shared_examples 'Charge API' do
     end
 
     it "stores charges for a customer in memory" do
-      expect(@customer.charges.map(&:id)).to eq([@charge.id])
+      expect(@customer.charges.data.map(&:id)).to eq([@charge.id])
     end
 
     it "stores all charges in memory" do
-      expect(Stripe::Charge.all.map(&:id)).to eq([@charge.id, @charge2.id])
+      expect(Stripe::Charge.all.data.map(&:id)).to eq([@charge.id, @charge2.id])
     end
 
     it "defaults count to 10 charges" do
       11.times { Stripe::Charge.create }
-      expect(Stripe::Charge.all.count).to eq(10)
+      expect(Stripe::Charge.all.data.count).to eq(10)
     end
 
-    context "when passing count" do
+    it "is marked as having more when more objects exist" do
+      11.times { Stripe::Charge.create }
+
+      expect(Stripe::Charge.all.has_more).to eq(true)
+    end
+
+    context "when passing limit" do
       it "gets that many charges" do
-        expect(Stripe::Charge.all(count: 1).count).to eq(1)
+        expect(Stripe::Charge.all(limit: 1).count).to eq(1)
       end
     end
   end

data/spec/shared_stripe_examples/coupon_examples.rb

@@ -88,7 +88,7 @@ shared_examples 'Coupon API' do
     Stripe::Coupon.create({ id: 'Coupon Two', amount_off: 3000 })
 
     all = Stripe::Coupon.all
-    expect(all.length).to eq(2)
+    expect(all.count).to eq(2)
     expect(all.map &:id).to include('Coupon One', 'Coupon Two')
     expect(all.map &:amount_off).to include(1500, 3000)
   end

data/spec/shared_stripe_examples/customer_examples.rb

@@ -197,7 +197,7 @@ shared_examples 'Customer API' do
     Stripe::Customer.create({ email: 'two@two.com' })
 
     all = Stripe::Customer.all
-    expect(all.length).to eq(2)
+    expect(all.count).to eq(2)
     expect(all.map &:email).to include('one@one.com', 'two@two.com')
   end
 

data/spec/shared_stripe_examples/invoice_examples.rb

@@ -60,9 +60,15 @@ shared_examples 'Invoice API' do
       expect(Stripe::Invoice.all.count).to eq(10)
     end
 
-    context "when passing count" do
+    it "is marked as having more when more objects exist" do
+      11.times { Stripe::Invoice.create }
+
+      expect(Stripe::Invoice.all.has_more).to eq(true)
+    end
+
+    context "when passing limit" do
       it "gets that many invoices" do
-        expect(Stripe::Invoice.all(count: 1).count).to eq(1)
+        expect(Stripe::Invoice.all(limit: 1).count).to eq(1)
       end
     end
   end

data/spec/shared_stripe_examples/invoice_item_examples.rb

@@ -40,7 +40,7 @@ shared_examples 'Invoice Item API' do
 
     it "retrieves all invoice items" do
       all = Stripe::InvoiceItem.all
-      expect(all.length).to eq(2)
+      expect(all.count).to eq(2)
       expect(all.map &:amount).to include(1075, 1540)
     end
   end

data/spec/shared_stripe_examples/plan_examples.rb

@@ -96,7 +96,7 @@ shared_examples 'Plan API' do
     stripe_helper.create_plan(id: 'Plan Two', amount: 98765)
 
     all = Stripe::Plan.all
-    expect(all.length).to eq(2)
+    expect(all.count).to eq(2)
     expect(all.map &:id).to include('Plan One', 'Plan Two')
     expect(all.map &:amount).to include(54321, 98765)
   end

data/spec/util_spec.rb

@@ -2,52 +2,86 @@ require 'spec_helper'
 
 describe StripeMock::Util do
 
-  it "recursively merges a simple hash" do
-    dest = { x: { y: 50 }, a: 5, b: 3 }
-    source = { x: { y: 999 }, a: 77 }
-    result = StripeMock::Util.rmerge(dest, source)
+  describe 'rmerge' do
+    it "recursively merges a simple hash" do
+      dest = { x: { y: 50 }, a: 5, b: 3 }
+      source = { x: { y: 999 }, a: 77 }
+      result = StripeMock::Util.rmerge(dest, source)
 
-    expect(result).to eq({ x: { y: 999 }, a: 77, b: 3 })
-  end
+      expect(result).to eq({ x: { y: 999 }, a: 77, b: 3 })
+    end
 
-  it "recursively merges a nested hash" do
-    dest = { x: { y: 50, z: { m: 44, n: 4 } } }
-    source = { x: { y: 999, z: { n: 55 } } }
-    result = StripeMock::Util.rmerge(dest, source)
+    it "recursively merges a nested hash" do
+      dest = { x: { y: 50, z: { m: 44, n: 4 } } }
+      source = { x: { y: 999, z: { n: 55 } } }
+      result = StripeMock::Util.rmerge(dest, source)
 
-    expect(result).to eq({ x: { y: 999, z: { m: 44, n: 55 } } })
-  end
+      expect(result).to eq({ x: { y: 999, z: { m: 44, n: 55 } } })
+    end
 
-  it "merges array elements" do
-    dest = { x: [ {a: 1}, {b: 2}, {c: 3} ] }
-    source = { x: [ {a: 0}, {a: 0} ] }
-    result = StripeMock::Util.rmerge(dest, source)
+    it "merges array elements" do
+      dest = { x: [ {a: 1}, {b: 2}, {c: 3} ] }
+      source = { x: [ {a: 0}, {a: 0} ] }
+      result = StripeMock::Util.rmerge(dest, source)
 
-    expect(result).to eq({ x: [ {a: 0}, {a: 0, b: 2}, {c: 3} ] })
-  end
+      expect(result).to eq({ x: [ {a: 0}, {a: 0, b: 2}, {c: 3} ] })
+    end
 
-  it "does not truncate the array when merging" do
-    dest = { x: [ {a: 1}, {b: 2} ] }
-    source = { x: [ nil, nil, {c: 3} ] }
-    result = StripeMock::Util.rmerge(dest, source)
+    it "does not truncate the array when merging" do
+      dest = { x: [ {a: 1}, {b: 2} ] }
+      source = { x: [ nil, nil, {c: 3} ] }
+      result = StripeMock::Util.rmerge(dest, source)
 
-    expect(result).to eq({ x: [ {a: 1}, {b: 2}, {c: 3} ] })
-  end
+      expect(result).to eq({ x: [ {a: 1}, {b: 2}, {c: 3} ] })
+    end
 
-  it "treats an array nil element as a skip op" do
-    dest = { x: [ {a: 1}, {b: 2}, {c: 3} ] }
-    source = { x: [ nil, nil, {c: 0} ] }
-    result = StripeMock::Util.rmerge(dest, source)
+    it "treats an array nil element as a skip op" do
+      dest = { x: [ {a: 1}, {b: 2}, {c: 3} ] }
+      source = { x: [ nil, nil, {c: 0} ] }
+      result = StripeMock::Util.rmerge(dest, source)
 
-    expect(result).to eq({ x: [ {a: 1}, {b: 2}, {c: 0} ] })
-  end
+      expect(result).to eq({ x: [ {a: 1}, {b: 2}, {c: 0} ] })
+    end
 
-  it "treats nil as a replacement otherwise" do
-    dest = { x: 99 }
-    source = { x: nil }
-    result = StripeMock::Util.rmerge(dest, source)
+    it "treats nil as a replacement otherwise" do
+      dest = { x: 99 }
+      source = { x: nil }
+      result = StripeMock::Util.rmerge(dest, source)
 
-    expect(result).to eq({ x: nil })
+      expect(result).to eq({ x: nil })
+    end
   end
 
+  describe 'card_merge' do
+    it 'merges last4 into number' do
+      new_param = {  last4: '9999' }
+      old_param = { number: '4242424242424242' }
+      result = StripeMock::Util.card_merge(old_param, new_param)
+      expect(result[:last4]).to eq('9999')
+      expect(result[:number]).to eq('4242424242429999')
+    end
+
+    it 'overwrites old last4 if new number given' do
+      new_param = { number: '9999999999999999' }
+      old_param = { number: '4242424242424242', last4: '4242' }
+      result = StripeMock::Util.card_merge(old_param, new_param)
+      expect(result[:last4]).to eq('9999')
+      expect(result[:number]).to eq('9999999999999999')
+    end
+
+    it 'uses last4 in preference to number if both given' do
+      new_param = { number: '9999999999999999', last4: '1111' }
+      old_param = { number: '4242424242424242', last4: '4242' }
+      result = StripeMock::Util.card_merge(old_param, new_param)
+      expect(result[:last4]).to eq('1111')
+      expect(result[:number]).to eq('9999999999991111')
+    end
+
+    it 'simple merge if old and new cards are missing number' do
+      new_param = { last4: '1111' }
+      old_param = { last4: '4242' }
+      result = StripeMock::Util.card_merge(old_param, new_param)
+      expect(result[:last4]).to eq('1111')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stripe-ruby-mock
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Gilbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stripe
@@ -124,6 +124,7 @@ files:
 - lib/stripe_mock/api/webhooks.rb
 - lib/stripe_mock/client.rb
 - lib/stripe_mock/data.rb
+- lib/stripe_mock/data/list.rb
 - lib/stripe_mock/error_queue.rb
 - lib/stripe_mock/errors/closed_client_connection_error.rb
 - lib/stripe_mock/errors/server_timeout_error.rb
@@ -201,6 +202,7 @@ files:
 - spec/integration_examples/charge_token_examples.rb
 - spec/integration_examples/customer_card_examples.rb
 - spec/integration_examples/prepare_error_examples.rb
+- spec/list_spec.rb
 - spec/readme_spec.rb
 - spec/server_spec.rb
 - spec/shared_stripe_examples/bank_token_examples.rb
@@ -257,6 +259,7 @@ test_files:
 - spec/integration_examples/charge_token_examples.rb
 - spec/integration_examples/customer_card_examples.rb
 - spec/integration_examples/prepare_error_examples.rb
+- spec/list_spec.rb
 - spec/readme_spec.rb
 - spec/server_spec.rb
 - spec/shared_stripe_examples/bank_token_examples.rb