mollie-api-ruby 3.1.5 → 4.0.0.pre.alpha.1

data/test/mollie/invoice_test.rb

@@ -4,50 +4,66 @@ module Mollie
   class InvoiceTest < Test::Unit::TestCase
     def test_setting_attributes
       attributes = {
-        resource:   "invoice",
         id:         "inv_xBEbP9rvAq",
         reference:  "2016.10000",
         vat_number: "NL001234567B01",
         status:     "open",
-        issue_date: "2016-08-31",
-        due_date:   "2016-09-14",
-        amount:     {
-          net:   "45.00",
-          vat:   "9.45",
-          gross: "54.45"
+        issued_at:  "2016-08-31",
+        due_at:     "2016-09-14",
+        net_amount: {
+          value:    "45.00",
+          currency: "EUR"
         },
-        lines:      [{
-                       period:         "2016-09",
-                       description:    "iDEAL transactiekosten",
-                       count:          100,
-                       vat_percentage: 21,
-                       amount:         "45.00"
-                     }],
-        links:      {
-          'pdf' => "https://www.mollie.com/beheer/facturen/2016.10000/52981a39788e5e0acaf71bbf570e941f/"
+        vat_amount: {
+          value:    "9.45",
+          currency: "EUR"
+        },
+        gross_amount: {
+          value:    "54.45",
+          currency: "EUR"
+        },
+        lines: [
+          {
+            period: "2016-09",
+            description: "iDEAL transactiekosten",
+            count: 100,
+            vat_percentage: 21,
+            amount: {
+              value:    "45.00",
+              currency: "EUR"
+            }
+          }
+        ],
+        _links: {
+          "pdf" => {
+            "href" => "https://www.mollie.com/beheer/facturen/2016.10000/52981a39788e5e0acaf71bbf570e941f/",
+            "type" => "application/pdf"
+          }
         }
       }
 
       invoice = Invoice.new(attributes)
 
-      assert_equal "invoice", invoice.resource
       assert_equal "inv_xBEbP9rvAq", invoice.id
       assert_equal "2016.10000", invoice.reference
       assert_equal "NL001234567B01", invoice.vat_number
       assert_equal "open", invoice.status
-      assert_equal Time.parse("2016-08-31"), invoice.issue_date
-      assert_equal Time.parse("2016-09-14"), invoice.due_date
-      assert_equal 45.0, invoice.amount.net
-      assert_equal BigDecimal.new(9.45, 3), invoice.amount.vat
-      assert_equal 54.45, invoice.amount.gross
+      assert_equal Time.parse("2016-08-31"), invoice.issued_at
+      assert_equal Time.parse("2016-09-14"), invoice.due_at
+      assert_equal 45.0, invoice.net_amount.value
+      assert_equal 'EUR', invoice.net_amount.currency
+      assert_equal BigDecimal.new(9.45, 3), invoice.vat_amount.value
+      assert_equal 'EUR', invoice.vat_amount.currency
+      assert_equal 54.45, invoice.gross_amount.value
+      assert_equal 'EUR', invoice.gross_amount.currency
 
       line = invoice.lines.first
       assert_equal "2016-09", line.period
       assert_equal "iDEAL transactiekosten", line.description
       assert_equal 100, line.count
       assert_equal 21, line.vat_percentage
-      assert_equal 45.0, line.amount
-
+      assert_equal 45.0, line.amount.value
+      assert_equal 'EUR', line.amount.currency
 
       assert_equal "https://www.mollie.com/beheer/facturen/2016.10000/52981a39788e5e0acaf71bbf570e941f/", invoice.pdf
     end

data/test/mollie/list_test.rb

@@ -4,37 +4,81 @@ module Mollie
   class ListTest < Test::Unit::TestCase
     def test_setting_attributes
       attributes = {
-        'total_count' => 280,
-        'offset'      => 0,
-        'count'       => 10,
-        'data'        => [
+        '_embedded'   => { "payments" => [
           { 'id' => "tr_1" },
           { 'id' => "tr_2" },
-        ],
-        'links'       => {
-          'first'    => "https://api.mollie.nl/v1/payments?count=10&offset=0",
-          'previous' => nil,
-          'next'     => "https://api.mollie.nl/v1/payments?count=10&offset=10",
-          'last'     => "https://api.mollie.nl/v1/payments?count=10&offset=270"
+        ] },
+        'count'       => 2,
+        '_links'      => {
+          "self"          => {
+            "href" => "https://api.mollie.com/v2/payments?limit=5",
+            "type" => "application/hal+json"
+          },
+          "previous"      => {
+            "href" => "https://api.mollie.com/v2/payments?from=tr_1&limit=1",
+            "type" => "application/hal+json"
+          },
+          "next"          => {
+            "href" => "https://api.mollie.com/v2/payments?from=tr_2&limit=1",
+            "type" => "application/hal+json"
+          },
+          "documentation" => {
+            "href" => "https://docs.mollie.com/reference/payments/list",
+            "type" => "text/html"
+          }
         }
       }
 
       list = Mollie::List.new(attributes, Payment)
 
-      assert_equal 280, list.total_count
-      assert_equal 0, list.offset
-      assert_equal 10, list.count
-
+      assert_equal 2, list.count
       assert_kind_of Payment, list.to_a[0]
       assert_equal "tr_1", list.to_a[0].id
 
       assert_kind_of Payment, list.to_a[1]
       assert_equal "tr_2", list.to_a[1].id
+    end
+
+    def test_next_page
+      stub_request(:get, "https://api.mollie.com/v2/payments?from=tr_WDqYK6vllg&limit=10").
+        to_return(
+          status: 200,
+          body: %{{"_embedded":{"payments":[{"id":"tr_1"},{"id":"tr_2"}]},"count":2}},
+          headers: {}
+        )
+
+      attributes = {
+        '_links' => {
+          'next' => {
+            'href' => 'https://api.mollie.com/v2/payments?from=tr_WDqYK6vllg&limit=10',
+            'type' => 'application/hal+json'
+          }
+        }
+      }
+
+      list = Mollie::List.new(attributes, Payment)
+      assert_equal 2, list.next.count
+    end
+
+    def test_previous_page
+      stub_request(:get, "https://api.mollie.com/v2/payments?from=tr_SDkzMggpvx&limit=10").
+        to_return(
+          status: 200,
+          body: %{{"_embedded":{"payments":[{"id":"tr_1"},{"id":"tr_2"}]},"count":2}},
+          headers: {}
+        )
+
+      attributes = {
+        '_links' => {
+          'previous' => {
+            'href' => 'https://api.mollie.com/v2/payments?from=tr_SDkzMggpvx&limit=10',
+            'type' => 'application/hal+json'
+          }
+        }
+      }
 
-      assert_equal "https://api.mollie.nl/v1/payments?count=10&offset=0", list.first_url
-      assert_equal nil, list.previous_url
-      assert_equal "https://api.mollie.nl/v1/payments?count=10&offset=10", list.next_url
-      assert_equal "https://api.mollie.nl/v1/payments?count=10&offset=270", list.last_url
+      list = Mollie::List.new(attributes, Payment)
+      assert_equal 2, list.previous.count
     end
   end
 end

data/test/mollie/method_test.rb

@@ -6,13 +6,9 @@ module Mollie
       attributes = {
         id:          "creditcard",
         description: "Credit card",
-        amount:      {
-          'minimum' => "0.31",
-          'maximum' => "10000.00"
-        },
         image:       {
-          'normal' => "https://www.mollie.com/images/payscreen/methods/creditcard.png",
-          'bigger' => "https://www.mollie.com/images/payscreen/methods/creditcard@2x.png"
+          'size1x' => "https://www.mollie.com/images/payscreen/methods/creditcard.png",
+          'size2x' => "https://www.mollie.com/images/payscreen/methods/creditcard@2x.png"
         }
       }
 
@@ -20,8 +16,6 @@ module Mollie
 
       assert_equal "creditcard", method.id
       assert_equal "Credit card", method.description
-      assert_equal BigDecimal.new("0.31"), method.minimum_amount
-      assert_equal BigDecimal.new("10000.0"), method.maximum_amount
       assert_equal "https://www.mollie.com/images/payscreen/methods/creditcard.png", method.normal_image
       assert_equal "https://www.mollie.com/images/payscreen/methods/creditcard@2x.png", method.bigger_image
     end

data/test/mollie/organization_test.rb

@@ -4,38 +4,43 @@ module Mollie
   class OrganizationTest < Test::Unit::TestCase
     def test_setting_attributes
       attributes = {
-        id:                    'org_1234567',
-        name:                  'Mollie B.V.',
-        email:                 'info@mollie.com',
-        address:               'Keizersgracht 313',
-        postal_code:           '1016EE',
-        city:                  'Amsterdam',
-        country:               'Netherlands',
-        country_code:          'NL',
-        registration_type:     'bv',
-        registration_number:   '30204462',
-        registration_datetime: '2004-04-01T09:41:00.0Z',
-        verified_datetime:     '2007-06-29T09:41:00.0Z'
+        id:                  'org_12345678',
+        name:                'Mollie B.V.',
+        email:               'info@mollie.com',
+        address: {
+          street_and_number: "Keizersgracht 313",
+          postal_code:       "1016 EE",
+          city:              "Amsterdam",
+          country:           "NL"
+        },
+        registration_number: '30204462',
+        vat_number:          'NL815839091B01',
       }
 
       organization = Organization.new(attributes)
 
-      assert_equal 'org_1234567', organization.id
+      assert_equal 'org_12345678', organization.id
       assert_equal 'Mollie B.V.', organization.name
       assert_equal 'info@mollie.com', organization.email
-      assert_equal 'Keizersgracht 313', organization.address
-      assert_equal '1016EE', organization.postal_code
-      assert_equal 'Amsterdam', organization.city
-      assert_equal 'Netherlands', organization.country
-      assert_equal 'NL', organization.country_code
-      assert_equal 'bv', organization.registration_type
+      assert_equal 'Keizersgracht 313', organization.address.street_and_number
+      assert_equal '1016 EE', organization.address.postal_code
+      assert_equal 'Amsterdam', organization.address.city
+      assert_equal 'NL', organization.address.country
       assert_equal '30204462', organization.registration_number
-      assert_equal Time.parse('2004-04-01T09:41:00.0Z'), organization.registration_datetime
-      assert_equal Time.parse('2007-06-29T09:41:00.0Z'), organization.verified_datetime
+      assert_equal 'NL815839091B01', organization.vat_number
     end
 
-    def test_verified_datetime_optional
-      assert_equal nil, Organization.new(verified_datetime: nil).verified_datetime
+    def test_current_organization
+      stub_request(:get, "https://api.mollie.com/v2/organizations/me")
+        .to_return(:status => 200, :body => %{
+          {
+              "resource": "organization",
+              "id": "org_12345678"
+          }
+        }, :headers => {})
+
+      organization = Organization.current
+      assert_equal "org_12345678", organization.id
     end
   end
 end

data/test/mollie/payment/chargeback_test.rb

@@ -9,13 +9,12 @@ module Mollie
       end
 
       def test_list_chargebacks
-        stub_request(:get, "https://api.mollie.nl/v1/payments/pay-id/chargebacks?count=50&offset=0")
-          .to_return(:status => 200, :body => %{{"data" : [{"id":"re-id", "payment": {"id":"pay-id"}}]}}, :headers => {})
+        stub_request(:get, "https://api.mollie.com/v2/payments/pay-id/chargebacks")
+          .to_return(:status => 200, :body => %{{"_embedded" : {"chargebacks" : [{"id":"re-id"}]}}}, :headers => {})
 
         chargebacks = Mollie::Payment::Chargeback.all(payment_id: "pay-id")
 
         assert_equal "re-id", chargebacks.first.id
-        assert_equal "pay-id", chargebacks.first.payment.id
       end
     end
   end

data/test/mollie/payment/refund_test.rb

@@ -9,13 +9,12 @@ module Mollie
       end
 
       def test_list_refunds
-        stub_request(:get, "https://api.mollie.nl/v1/payments/pay-id/refunds?count=50&offset=0")
-          .to_return(:status => 200, :body => %{{"data" : [{"id":"re-id", "payment": {"id":"pay-id"}}]}}, :headers => {})
+        stub_request(:get, "https://api.mollie.com/v2/payments/pay-id/refunds")
+          .to_return(:status => 200, :body => %{{"_embedded" : { "refunds" : [{"id":"re-id"}]}}}, :headers => {})
 
         refunds = Mollie::Payment::Refund.all(payment_id: "pay-id")
 
         assert_equal "re-id", refunds.first.id
-        assert_equal "pay-id", refunds.first.payment.id
       end
     end
   end

data/test/mollie/payment_test.rb

@@ -4,56 +4,75 @@ module Mollie
   class PaymentTest < Test::Unit::TestCase
     def test_setting_attributes
       attributes = {
-        id:               'tr_WDqYK6vllg',
-        mode:             'test',
-        created_datetime: '2016-10-08T10:10:52.0Z',
-        status:           'paid',
-        paid_datetime:    '2016-10-08T10:15:35.0Z',
-        amount:           35.07,
-        description:      'Order 33',
-        method:           'ideal',
-        country_code:     'NL',
-        metadata:         {
-          order_id: '33'
+        resource:   "payment",
+        id:         "tr_7UhSN1zuXS",
+        mode:       "test",
+        created_at: "2018-03-20T09:13:37+00:00",
+        amount: {
+          "value"    => "10.00",
+          "currency" => "EUR"
         },
-        details:          {
+        description:  "My first payment",
+        method:       "ideal",
+        country_code: "NL",
+        metadata: {
+          order_id: "12345"
+        },
+        details:       {
           consumer_name:    "Hr E G H K\u00fcppers en\/of MW M.J. K\u00fcppers-Veeneman",
-          consumer_account: 'NL53INGB0618365937',
-          consumer_bic:     'INGBNL2A'
+          consumer_account: "NL53INGB0618365937",
+          consumer_bic:     "INGBNL2A"
         },
-        locale:           'nl',
-        profile_id:       'pfl_QkEhN94Ba',
-        links:            {
-          'webhook_url'  => 'https://webshop.example.org/payments/webhook',
-          'redirect_url' => 'https://webshop.example.org/order/33/',
-          'payment_url'  => 'https://webshop.example.org/payment/tr_WDqYK6vllg',
-          'settlement'   => 'https://webshop.example.org/payment/tr_WDqYK6vllg/settlement',
-          'refunds'      => 'https://webshop.example.org/payment/tr_WDqYK6vllg/refunds',
+        status:        "paid",
+        paid_at:       "2018-03-20T09:14:37+00:00",
+        is_cancelable: false,
+        expires_at:    "2018-03-20T09:28:37+00:00",
+        locale:        "nl_NL",
+        profile_id:    "pfl_QkEhN94Ba",
+        sequence_type: "oneoff",
+        redirect_url:  "https://webshop.example.org/order/12345",
+        webhook_url:   "https://webshop.example.org/payments/webhook",
+        _links:        {
+          "self" => {
+            "href" => "https://api.mollie.com/v2/payments/tr_7UhSN1zuXS",
+            "type" => "application/json"
+          },
+          "checkout" => {
+            "href" => "https://www.mollie.com/payscreen/select-method/7UhSN1zuXS",
+            "type" => "text/html"
+          },
+          "settlement" => {
+            "href" => "https://webshop.example.org/payment/tr_WDqYK6vllg/settlement",
+          },
+          "refunds" => {
+            "href" => "https://webshop.example.org/payment/tr_WDqYK6vllg/refunds",
+            "type" => "text/html"
+          }
         }
       }
 
       payment = Payment.new(attributes)
 
-      assert_equal 'tr_WDqYK6vllg', payment.id
+      assert_equal 'tr_7UhSN1zuXS', payment.id
       assert_equal 'test', payment.mode
-      assert_equal Time.parse('2016-10-08T10:10:52.0Z'), payment.created_datetime
+      assert_equal Time.parse('2018-03-20T09:13:37+00:00'), payment.created_at
       assert_equal 'paid', payment.status
-      assert_equal Time.parse('2016-10-08T10:15:35.0Z'), payment.paid_datetime
-      assert_equal 35.07, payment.amount
-      assert_equal 'Order 33', payment.description
+      assert_equal true, payment.paid?
+      assert_equal Time.parse('2018-03-20T09:14:37+00:00'), payment.paid_at
+      assert_equal 10.00, payment.amount.value
+      assert_equal 'EUR', payment.amount.currency
+      assert_equal 'My first payment', payment.description
       assert_equal 'ideal', payment.method
-      assert_equal '33', payment.metadata.order_id
+      assert_equal '12345', payment.metadata.order_id
       assert_equal "Hr E G H K\u00fcppers en\/of MW M.J. K\u00fcppers-Veeneman", payment.details.consumer_name
       assert_equal 'NL53INGB0618365937', payment.details.consumer_account
       assert_equal 'INGBNL2A', payment.details.consumer_bic
-      assert_equal 'nl', payment.locale
+      assert_equal 'nl_NL', payment.locale
       assert_equal 'NL', payment.country_code
       assert_equal 'pfl_QkEhN94Ba', payment.profile_id
       assert_equal 'https://webshop.example.org/payments/webhook', payment.webhook_url
-      assert_equal 'https://webshop.example.org/order/33/', payment.redirect_url
-      assert_equal 'https://webshop.example.org/payment/tr_WDqYK6vllg', payment.payment_url
-      assert_equal 'https://webshop.example.org/payment/tr_WDqYK6vllg/settlement', payment.settlement
-      assert_equal 'https://webshop.example.org/payment/tr_WDqYK6vllg/refunds', payment.refunds_url
+      assert_equal 'https://webshop.example.org/order/12345', payment.redirect_url
+      assert_equal 'https://www.mollie.com/payscreen/select-method/7UhSN1zuXS', payment.checkout_url
     end
 
     def test_status_open
@@ -61,9 +80,14 @@ module Mollie
       assert !Payment.new(status: 'not-open').open?
     end
 
-    def test_status_cancelled
-      assert Payment.new(status: Payment::STATUS_CANCELLED).cancelled?
-      assert !Payment.new(status: 'not-cancelled').cancelled?
+    def test_status_canceled
+      assert Payment.new(status: Payment::STATUS_CANCELED).canceled?
+      assert !Payment.new(status: 'not-canceled').canceled?
+    end
+
+    def test_status_pending
+      assert Payment.new(status: Payment::STATUS_PENDING).pending?
+      assert !Payment.new(status: 'not-pending').pending?
     end
 
     def test_status_expired
@@ -71,91 +95,253 @@ module Mollie
       assert !Payment.new(status: 'not-expired').expired?
     end
 
-    def test_status_paidout
-      assert Payment.new(status: Payment::STATUS_PAIDOUT).paidout?
-      assert !Payment.new(status: 'not-paidout').paidout?
+    def test_status_failed
+      assert Payment.new(status: Payment::STATUS_FAILED).failed?
+      assert !Payment.new(status: 'not-failed').failed?
     end
 
-    def test_status_refunded
-      assert Payment.new(status: Payment::STATUS_REFUNDED).refunded?
-      assert !Payment.new(status: 'not-refunded').refunded?
+    def test_status_paid
+      assert Payment.new(status: Payment::STATUS_PAID).paid?
+      assert !Payment.new(status: nil).paid?
     end
 
-    def test_status_paid
-      assert Payment.new(paid_datetime: Time.now).paid?
-      assert !Payment.new(paid_datetime: nil).paid?
+    def test_create_payment
+      stub_request(:post, "https://api.mollie.com/v2/payments")
+        .with(body: %{{"amount":{"value":1.95,"currency":"EUR"}}})
+        .to_return(:status => 201, :body => %{{"id":"my-id", "amount":{ "value" : 1.95, "currency" : "EUR"}}}, :headers => {})
+
+      payment = Payment.create(amount: { value: 1.95, currency: "EUR" })
+
+      assert_kind_of Mollie::Payment, payment
+      assert_equal "my-id", payment.id
+      assert_equal BigDecimal.new("1.95"), payment.amount.value
+      assert_equal 'EUR', payment.amount.currency
     end
 
-    def test_status_failed
-      assert Payment.new(status: Payment::STATUS_FAILED).failed?
-      assert !Payment.new(status: 'not-failed').failed?
+    def test_create_payment_for_customer
+      stub_request(:post, "https://api.mollie.com/v2/payments")
+        .with(body: %{{"customerId":"cst_8wmqcHMN4U","amount":{"value":1.95,"currency":"EUR"}}})
+        .to_return(:status => 201, :body => %{{"id":"my-id", "amount":{ "value" : 1.95, "currency" : "EUR"}, "customerId":"cst_8wmqcHMN4U"}}, :headers => {})
+
+      payment = Payment.create(
+        customer_id: 'cst_8wmqcHMN4U',
+        amount: { value: 1.95, currency: "EUR" }
+      )
+
+      assert_kind_of Mollie::Payment, payment
+      assert_equal "cst_8wmqcHMN4U", payment.customer_id
     end
 
-    def test_status_pending
-      assert Payment.new(status: Payment::STATUS_PENDING).pending?
-      assert !Payment.new(status: 'not-pending').pending?
+    def test_refund!
+      stub_request(:get, "https://api.mollie.com/v2/payments/tr_WDqYK6vllg")
+        .to_return(:status => 200, :body => %{
+          {
+              "resource": "payment",
+              "id": "tr_WDqYK6vllg",
+              "amount": {
+                "value": "42.10",
+                "currency": "EUR"
+              }
+          }
+        }, :headers => {})
+
+      stub_request(:post, "https://api.mollie.com/v2/payments/tr_WDqYK6vllg/refunds")
+        .to_return(:status => 200, :body => %{
+          {
+              "resource": "refund",
+              "id": "re_4qqhO89gsT"
+          }
+        }, :headers => {})
+
+      payment = Payment.get("tr_WDqYK6vllg")
+      refund  = payment.refund!
+      assert_equal "re_4qqhO89gsT", refund.id
     end
 
-    def test_status_charged_back
-      assert Payment.new(status: Payment::STATUS_CHARGED_BACK).charged_back?
-      assert !Payment.new(status: 'not-charged-back').charged_back?
+    def test_refund_with_custom_amount_and_description
+      stub_request(:get, "https://api.mollie.com/v2/payments/tr_WDqYK6vllg")
+        .to_return(:status => 200, :body => %{
+          {
+              "resource": "payment",
+              "id": "tr_WDqYK6vllg",
+              "amount": {
+                "value": "42.10",
+                "currency": "EUR"
+              }
+          }
+        }, :headers => {})
+
+      stub_request(:post, "https://api.mollie.com/v2/payments/tr_WDqYK6vllg/refunds")
+        .with(body: %{{"amount":{"value":"9.95","currency":"EUR"},"description":"Test refund"}})
+        .to_return(:status => 200, :body => %{
+          {
+              "resource": "refund",
+              "id": "re_4qqhO89gsT"
+          }
+        }, :headers => {})
+
+      payment = Payment.get("tr_WDqYK6vllg")
+      refund  = payment.refund!(
+        amount: { value: "9.95", currency: "EUR" },
+        description: 'Test refund'
+      )
+
+      assert_equal "re_4qqhO89gsT", refund.id
+    end
+
+    def test_application_fee
+      stub_request(:get, "https://api.mollie.com/v2/payments/tr_WDqYK6vllg")
+        .to_return(:status => 200, :body => %{
+          {
+            "application_fee": {
+              "amount": {
+                "value": "42.10",
+                "currency": "EUR"
+              },
+              "description": "Example application fee"
+            }
+          }
+        }, :headers => {})
+
+      payment = Payment.get("tr_WDqYK6vllg")
+      assert_equal 42.10, payment.application_fee.amount.value
+      assert_equal "EUR", payment.application_fee.amount.currency
     end
 
     def test_list_refunds
-      stub_request(:get, "https://api.mollie.nl/v1/payments/pay-id/refunds?count=50&offset=0")
-        .to_return(:status => 200, :body => %{{"data" : [{"id":"ref-id", "payment_id":"pay-id"}]}}, :headers => {})
+      stub_request(:get, "https://api.mollie.com/v2/payments/pay-id/refunds")
+        .to_return(:status => 200, :body => %{{"_embedded" : {"refunds" : [{"id":"ref-id", "payment_id":"pay-id"}]}}}, :headers => {})
 
-      refunds = Payment.new(id: "pay-id").refunds.all
+      refunds = Payment.new(id: "pay-id").refunds
 
       assert_equal "ref-id", refunds.first.id
     end
 
-    def test_create_refund
-      stub_request(:post, "https://api.mollie.nl/v1/payments/pay-id/refunds")
-        .with(body: %{{"amount":1.95}})
-        .to_return(:status => 201, :body => %{{"id":"my-id", "amount":1.95}}, :headers => {})
+    def test_list_chargebacks
+      stub_request(:get, "https://api.mollie.com/v2/payments/pay-id/chargebacks")
+        .to_return(:status => 200, :body => %{{"_embedded" : {"chargebacks" :[{"id":"chb-id", "payment_id":"pay-id"}]}}}, :headers => {})
+
+      chargebacks = Payment.new(id: "pay-id").chargebacks
+      assert_equal "chb-id", chargebacks.first.id
+    end
 
-      refund = Payment.new(id: "pay-id").refunds.create(amount: 1.95)
+    def test_get_settlement
+      stub_request(:get, "https://api.mollie.com/v2/payments/tr_WDqYK6vllg")
+        .to_return(:status => 200, :body => %{
+          {
+              "resource": "payment",
+              "id": "tr_WDqYK6vllg",
+              "settlement_id": "stl_jDk30akdN"
+          }
+        }, :headers => {})
 
-      assert_equal "my-id", refund.id
-      assert_equal BigDecimal.new("1.95"), refund.amount
+      stub_request(:get, "https://api.mollie.com/v2/settlements/stl_jDk30akdN")
+        .to_return(:status => 200, :body => %{
+          {
+              "resource": "settlement",
+              "id": "stl_jDk30akdN"
+          }
+        }, :headers => {})
+
+      payment    = Payment.get("tr_WDqYK6vllg")
+      settlement = payment.settlement
+      assert_equal "stl_jDk30akdN", settlement.id
+    end
+
+    def test_nil_settlement
+      payment = Payment.new(id: "tr_WDqYK6vllg")
+      assert payment.settlement.nil?
     end
 
-    def test_delete_refund
-      stub_request(:delete, "https://api.mollie.nl/v1/payments/pay-id/refunds/ref-id")
-        .to_return(:status => 204, :headers => {})
+    def test_get_mandate
+      stub_request(:get, "https://api.mollie.com/v2/payments/tr_WDqYK6vllg")
+        .to_return(:status => 200, :body => %{
+          {
+              "resource": "payment",
+              "id": "tr_WDqYK6vllg",
+              "mandate_id": "mdt_h3gAaD5zP"
+          }
+        }, :headers => {})
+
+      stub_request(:get, "https://api.mollie.com/v2/mandates/mdt_h3gAaD5zP")
+        .to_return(:status => 200, :body => %{
+          {
+              "resource": "mandate",
+              "id": "mdt_h3gAaD5zP"
+          }
+        }, :headers => {})
+
+      payment = Payment.get("tr_WDqYK6vllg")
+      mandate = payment.mandate
+      assert_equal "mdt_h3gAaD5zP", mandate.id
+    end
 
-      refund = Payment.new(id: "pay-id").refunds.delete("ref-id")
-      assert_equal nil, refund
+    def test_nil_mandate
+      payment = Payment.new(id: "tr_WDqYK6vllg")
+      assert payment.mandate.nil?
     end
 
-    def test_get_refund
-      stub_request(:get, "https://api.mollie.nl/v1/payments/pay-id/refunds/ref-id")
-        .to_return(:status => 200, :body => %{{"id":"ref-id", "payment":{"id":"pay-id"}}}, :headers => {})
+    def test_get_subscription
+      stub_request(:get, "https://api.mollie.com/v2/payments/tr_WDqYK6vllg")
+        .to_return(:status => 200, :body => %{
+          {
+              "resource": "payment",
+              "id": "tr_WDqYK6vllg",
+              "subscription_id": "sub_rVKGtNd6s3",
+              "customer_id": "cst_8wmqcHMN4U"
+          }
+        }, :headers => {})
 
-      refund = Payment.new(id: "pay-id").refunds.get("ref-id")
+      stub_request(:get, "https://api.mollie.com/v2/customers/cst_8wmqcHMN4U/subscriptions/sub_rVKGtNd6s3")
+        .to_return(:status => 200, :body => %{
+          {
+              "resource": "subscription",
+              "id": "sub_rVKGtNd6s3"
+          }
+        }, :headers => {})
 
-      assert_equal "ref-id", refund.id
-      assert_equal "pay-id", refund.payment.id
+      payment = Payment.get("tr_WDqYK6vllg")
+      subscription = payment.subscription
+      assert_equal "sub_rVKGtNd6s3", subscription.id
     end
 
-    def test_list_chargebacks
-      stub_request(:get, "https://api.mollie.nl/v1/payments/pay-id/chargebacks?count=50&offset=0")
-        .to_return(:status => 200, :body => %{{"data" : [{"id":"chb-id", "payment_id":"pay-id"}]}}, :headers => {})
+    def test_nil_subscription
+      payment = Payment.new(id: "tr_WDqYK6vllg")
+      assert payment.subscription.nil?
 
-      chargebacks = Payment.new(id: "pay-id").chargebacks.all
+      payment = Payment.new(id: "tr_WDqYK6vllg", customer_id: "cst_8wmqcHMN4U")
+      assert payment.subscription.nil?
 
-      assert_equal "chb-id", chargebacks.first.id
+      payment = Payment.new(id: "tr_WDqYK6vllg", subscription_id: "sub_rVKGtNd6s3")
+      assert payment.subscription.nil?
     end
 
-    def test_get_chargeback
-      stub_request(:get, "https://api.mollie.nl/v1/payments/pay-id/chargebacks/chb-id")
-        .to_return(:status => 200, :body => %{{"id":"chb-id", "payment":{"id":"pay-id"}}}, :headers => {})
+    def test_get_customer
+      stub_request(:get, "https://api.mollie.com/v2/payments/tr_WDqYK6vllg")
+        .to_return(:status => 200, :body => %{
+          {
+              "resource": "payment",
+              "id": "tr_WDqYK6vllg",
+              "customer_id": "cst_8wmqcHMN4U"
+          }
+        }, :headers => {})
 
-      chargeback = Payment.new(id: "pay-id").chargebacks.get("chb-id")
+      stub_request(:get, "https://api.mollie.com/v2/customers/cst_8wmqcHMN4U")
+        .to_return(:status => 200, :body => %{
+          {
+              "resource": "customer",
+              "id": "cst_8wmqcHMN4U"
+          }
+        }, :headers => {})
+
+      payment  = Payment.get("tr_WDqYK6vllg")
+      customer = payment.customer
+      assert_equal "cst_8wmqcHMN4U", customer.id
+    end
 
-      assert_equal "chb-id", chargeback.id
-      assert_equal "pay-id", chargeback.payment.id
+    def test_nil_customer
+      payment = Payment.new(id: "tr_WDqYK6vllg")
+      assert payment.customer.nil?
     end
   end
 end