braintree 4.14.0 → 4.16.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (241) hide show
  1. checksums.yaml +4 -4
  2. data/lib/braintree/account_updater_daily_report.rb +3 -3
  3. data/lib/braintree/ach_mandate.rb +1 -1
  4. data/lib/braintree/add_on_gateway.rb +1 -1
  5. data/lib/braintree/address.rb +4 -4
  6. data/lib/braintree/address_gateway.rb +5 -5
  7. data/lib/braintree/advanced_search.rb +10 -10
  8. data/lib/braintree/apple_pay.rb +3 -3
  9. data/lib/braintree/apple_pay_card.rb +3 -3
  10. data/lib/braintree/apple_pay_options.rb +3 -3
  11. data/lib/braintree/authorization_adjustment.rb +3 -3
  12. data/lib/braintree/base_module.rb +1 -1
  13. data/lib/braintree/bin_data.rb +2 -2
  14. data/lib/braintree/client_token_gateway.rb +1 -1
  15. data/lib/braintree/configuration.rb +22 -22
  16. data/lib/braintree/connected_merchant_paypal_status_changed.rb +1 -1
  17. data/lib/braintree/connected_merchant_status_transitioned.rb +1 -1
  18. data/lib/braintree/credit_card.rb +22 -9
  19. data/lib/braintree/credit_card_gateway.rb +23 -11
  20. data/lib/braintree/credit_card_verification.rb +3 -3
  21. data/lib/braintree/credit_card_verification_search.rb +1 -1
  22. data/lib/braintree/customer.rb +5 -9
  23. data/lib/braintree/customer_gateway.rb +7 -7
  24. data/lib/braintree/customer_search.rb +1 -1
  25. data/lib/braintree/descriptor.rb +1 -1
  26. data/lib/braintree/digest.rb +1 -1
  27. data/lib/braintree/disbursement.rb +5 -5
  28. data/lib/braintree/discount_gateway.rb +1 -1
  29. data/lib/braintree/dispute/evidence.rb +1 -1
  30. data/lib/braintree/dispute/paypal_message.rb +1 -1
  31. data/lib/braintree/dispute/status_history.rb +1 -1
  32. data/lib/braintree/dispute/transaction.rb +1 -1
  33. data/lib/braintree/dispute/transaction_details.rb +1 -1
  34. data/lib/braintree/dispute.rb +3 -3
  35. data/lib/braintree/dispute_gateway.rb +1 -1
  36. data/lib/braintree/dispute_search.rb +1 -1
  37. data/lib/braintree/document_upload.rb +2 -2
  38. data/lib/braintree/document_upload_gateway.rb +3 -3
  39. data/lib/braintree/enriched_customer_data.rb +2 -2
  40. data/lib/braintree/error_result.rb +2 -3
  41. data/lib/braintree/errors.rb +3 -3
  42. data/lib/braintree/exceptions.rb +1 -2
  43. data/lib/braintree/exchange_rate.rb +2 -2
  44. data/lib/braintree/exchange_rate_quote.rb +3 -3
  45. data/lib/braintree/exchange_rate_quote_gateway.rb +1 -1
  46. data/lib/braintree/exchange_rate_quote_input.rb +3 -3
  47. data/lib/braintree/exchange_rate_quote_request.rb +3 -3
  48. data/lib/braintree/exchange_rate_quote_response.rb +3 -3
  49. data/lib/braintree/facilitated_details.rb +1 -1
  50. data/lib/braintree/facilitator_details.rb +1 -1
  51. data/lib/braintree/google_pay_card.rb +3 -3
  52. data/lib/braintree/granted_payment_instrument_update.rb +1 -1
  53. data/lib/braintree/graphql_client.rb +1 -1
  54. data/lib/braintree/http.rb +1 -1
  55. data/lib/braintree/local_payment_completed.rb +2 -2
  56. data/lib/braintree/local_payment_expired.rb +2 -2
  57. data/lib/braintree/local_payment_funded.rb +2 -2
  58. data/lib/braintree/local_payment_reversed.rb +2 -2
  59. data/lib/braintree/merchant.rb +3 -3
  60. data/lib/braintree/merchant_account.rb +2 -2
  61. data/lib/braintree/merchant_account_gateway.rb +9 -9
  62. data/lib/braintree/meta_checkout_card.rb +89 -0
  63. data/lib/braintree/meta_checkout_token.rb +88 -0
  64. data/lib/braintree/modification.rb +3 -3
  65. data/lib/braintree/oauth_credentials.rb +3 -3
  66. data/lib/braintree/paginated_collection.rb +2 -2
  67. data/lib/braintree/paginated_result.rb +1 -1
  68. data/lib/braintree/payment_instrument_type.rb +2 -0
  69. data/lib/braintree/payment_method_customer_data_updated_metadata.rb +2 -2
  70. data/lib/braintree/payment_method_gateway.rb +23 -10
  71. data/lib/braintree/payment_method_nonce.rb +4 -4
  72. data/lib/braintree/payment_method_nonce_details.rb +1 -1
  73. data/lib/braintree/payment_method_nonce_details_payer_info.rb +1 -1
  74. data/lib/braintree/payment_method_nonce_gateway.rb +1 -1
  75. data/lib/braintree/paypal_account.rb +1 -2
  76. data/lib/braintree/paypal_account_gateway.rb +5 -5
  77. data/lib/braintree/plan.rb +1 -1
  78. data/lib/braintree/plan_gateway.rb +2 -2
  79. data/lib/braintree/resource_collection.rb +2 -2
  80. data/lib/braintree/revoked_payment_method_metadata.rb +1 -1
  81. data/lib/braintree/risk_data.rb +1 -1
  82. data/lib/braintree/samsung_pay_card.rb +5 -5
  83. data/lib/braintree/sepa_direct_debit_account.rb +2 -2
  84. data/lib/braintree/sepa_direct_debit_account_nonce_details.rb +1 -1
  85. data/lib/braintree/settlement_batch_summary_gateway.rb +1 -1
  86. data/lib/braintree/sha256_digest.rb +1 -1
  87. data/lib/braintree/subscription/status_details.rb +1 -1
  88. data/lib/braintree/subscription.rb +2 -2
  89. data/lib/braintree/subscription_gateway.rb +6 -6
  90. data/lib/braintree/subscription_search.rb +1 -1
  91. data/lib/braintree/successful_result.rb +2 -2
  92. data/lib/braintree/test/credit_card.rb +7 -10
  93. data/lib/braintree/test/merchant_account.rb +1 -1
  94. data/lib/braintree/test/nonce.rb +4 -0
  95. data/lib/braintree/test/transaction_amounts.rb +2 -3
  96. data/lib/braintree/test/venmo_sdk.rb +2 -0
  97. data/lib/braintree/testing_gateway.rb +1 -1
  98. data/lib/braintree/three_d_secure_info.rb +1 -1
  99. data/lib/braintree/transaction/address_details.rb +1 -1
  100. data/lib/braintree/transaction/credit_card_details.rb +4 -1
  101. data/lib/braintree/transaction/customer_details.rb +1 -1
  102. data/lib/braintree/transaction/disbursement_details.rb +1 -1
  103. data/lib/braintree/transaction/local_payment_details.rb +2 -0
  104. data/lib/braintree/transaction/meta_checkout_card_details.rb +52 -0
  105. data/lib/braintree/transaction/meta_checkout_token_details.rb +54 -0
  106. data/lib/braintree/transaction/samsung_pay_card_details.rb +1 -1
  107. data/lib/braintree/transaction/sepa_direct_debit_account_details.rb +1 -1
  108. data/lib/braintree/transaction/status_details.rb +1 -1
  109. data/lib/braintree/transaction/subscription_details.rb +1 -1
  110. data/lib/braintree/transaction/us_bank_account_details.rb +1 -1
  111. data/lib/braintree/transaction/visa_checkout_card_details.rb +1 -1
  112. data/lib/braintree/transaction.rb +27 -20
  113. data/lib/braintree/transaction_gateway.rb +23 -12
  114. data/lib/braintree/transaction_line_item.rb +2 -2
  115. data/lib/braintree/transaction_line_item_gateway.rb +1 -1
  116. data/lib/braintree/transaction_review.rb +1 -1
  117. data/lib/braintree/transaction_search.rb +7 -6
  118. data/lib/braintree/unknown_payment_method.rb +1 -1
  119. data/lib/braintree/us_bank_account.rb +2 -2
  120. data/lib/braintree/us_bank_account_verification.rb +23 -15
  121. data/lib/braintree/us_bank_account_verification_search.rb +1 -1
  122. data/lib/braintree/util.rb +3 -3
  123. data/lib/braintree/validation_error.rb +1 -1
  124. data/lib/braintree/validation_error_collection.rb +3 -3
  125. data/lib/braintree/venmo_account.rb +3 -3
  126. data/lib/braintree/venmo_profile_data.rb +6 -4
  127. data/lib/braintree/version.rb +1 -1
  128. data/lib/braintree/visa_checkout_card.rb +7 -7
  129. data/lib/braintree/webhook_notification.rb +3 -2
  130. data/lib/braintree/webhook_notification_gateway.rb +3 -3
  131. data/lib/braintree/webhook_testing.rb +1 -1
  132. data/lib/braintree/webhook_testing_gateway.rb +18 -1
  133. data/lib/braintree/xml/generator.rb +1 -1
  134. data/lib/braintree/xml/libxml.rb +1 -1
  135. data/lib/braintree/xml/parser.rb +2 -2
  136. data/lib/braintree/xml/rexml.rb +2 -2
  137. data/lib/braintree/xml.rb +1 -1
  138. data/lib/braintree.rb +4 -1
  139. data/spec/integration/braintree/add_on_spec.rb +9 -9
  140. data/spec/integration/braintree/address_spec.rb +69 -69
  141. data/spec/integration/braintree/advanced_search_spec.rb +45 -45
  142. data/spec/integration/braintree/apple_pay_spec.rb +8 -8
  143. data/spec/integration/braintree/client_api/client_token_spec.rb +15 -15
  144. data/spec/integration/braintree/credit_card_spec.rb +223 -223
  145. data/spec/integration/braintree/credit_card_verification_search_spec.rb +16 -16
  146. data/spec/integration/braintree/credit_card_verification_spec.rb +52 -52
  147. data/spec/integration/braintree/customer_search_spec.rb +20 -20
  148. data/spec/integration/braintree/customer_spec.rb +313 -313
  149. data/spec/integration/braintree/disbursement_spec.rb +2 -2
  150. data/spec/integration/braintree/discount_spec.rb +9 -9
  151. data/spec/integration/braintree/dispute_search_spec.rb +0 -1
  152. data/spec/integration/braintree/dispute_spec.rb +87 -87
  153. data/spec/integration/braintree/document_upload_spec.rb +17 -17
  154. data/spec/integration/braintree/error_codes_spec.rb +2 -2
  155. data/spec/integration/braintree/http_spec.rb +28 -28
  156. data/spec/integration/braintree/merchant_account_spec.rb +127 -127
  157. data/spec/integration/braintree/merchant_spec.rb +103 -103
  158. data/spec/integration/braintree/oauth_spec.rb +61 -61
  159. data/spec/integration/braintree/payment_method_nonce_spec.rb +89 -69
  160. data/spec/integration/braintree/payment_method_spec.rb +389 -389
  161. data/spec/integration/braintree/payment_method_us_bank_account_spec.rb +150 -78
  162. data/spec/integration/braintree/paypal_account_spec.rb +38 -38
  163. data/spec/integration/braintree/plan_spec.rb +15 -15
  164. data/spec/integration/braintree/samsung_pay_card_spec.rb +65 -65
  165. data/spec/integration/braintree/sepa_direct_debit_account_spec.rb +51 -51
  166. data/spec/integration/braintree/settlement_batch_summary_spec.rb +11 -11
  167. data/spec/integration/braintree/subscription_spec.rb +364 -364
  168. data/spec/integration/braintree/test/transaction_amounts_spec.rb +2 -2
  169. data/spec/integration/braintree/test_transaction_spec.rb +19 -19
  170. data/spec/integration/braintree/transaction_line_item_spec.rb +6 -6
  171. data/spec/integration/braintree/transaction_search_spec.rb +225 -165
  172. data/spec/integration/braintree/transaction_spec.rb +1502 -1210
  173. data/spec/integration/braintree/transaction_us_bank_account_spec.rb +32 -32
  174. data/spec/integration/braintree/us_bank_account_spec.rb +30 -30
  175. data/spec/integration/braintree/us_bank_account_verification_search_spec.rb +18 -18
  176. data/spec/integration/braintree/us_bank_account_verification_spec.rb +33 -33
  177. data/spec/integration/braintree/visa_checkout_card_spec.rb +57 -57
  178. data/spec/spec_helper.rb +9 -8
  179. data/spec/unit/braintree/address_spec.rb +8 -8
  180. data/spec/unit/braintree/base_module_spec.rb +4 -4
  181. data/spec/unit/braintree/client_token_spec.rb +2 -2
  182. data/spec/unit/braintree/configuration_spec.rb +57 -57
  183. data/spec/unit/braintree/credentials_parser_spec.rb +6 -6
  184. data/spec/unit/braintree/credit_card_spec.rb +31 -29
  185. data/spec/unit/braintree/credit_card_verification_gateway_spec.rb +28 -28
  186. data/spec/unit/braintree/credit_card_verification_search_spec.rb +9 -9
  187. data/spec/unit/braintree/credit_card_verification_spec.rb +17 -17
  188. data/spec/unit/braintree/customer_spec.rb +41 -40
  189. data/spec/unit/braintree/digest_spec.rb +5 -5
  190. data/spec/unit/braintree/disbursement_spec.rb +11 -11
  191. data/spec/unit/braintree/dispute_search_spec.rb +2 -2
  192. data/spec/unit/braintree/dispute_spec.rb +56 -56
  193. data/spec/unit/braintree/document_upload_spec.rb +8 -8
  194. data/spec/unit/braintree/enriched_customer_data_spec.rb +11 -2
  195. data/spec/unit/braintree/error_result_spec.rb +5 -5
  196. data/spec/unit/braintree/errors_spec.rb +9 -9
  197. data/spec/unit/braintree/http_spec.rb +9 -9
  198. data/spec/unit/braintree/local_payment_completed_spec.rb +11 -11
  199. data/spec/unit/braintree/local_payment_expired_spec.rb +2 -2
  200. data/spec/unit/braintree/local_payment_funded_spec.rb +6 -6
  201. data/spec/unit/braintree/merchant_account_spec.rb +4 -4
  202. data/spec/unit/braintree/meta_checkout_card_details_spec.rb +60 -0
  203. data/spec/unit/braintree/meta_checkout_card_spec.rb +60 -0
  204. data/spec/unit/braintree/meta_checkout_token_details_spec.rb +63 -0
  205. data/spec/unit/braintree/meta_checkout_token_spec.rb +63 -0
  206. data/spec/unit/braintree/modification_spec.rb +1 -1
  207. data/spec/unit/braintree/payment_method_customer_data_updated_metadata_spec.rb +6 -6
  208. data/spec/unit/braintree/payment_method_nonce_details_payer_info_spec.rb +7 -7
  209. data/spec/unit/braintree/payment_method_nonce_details_spec.rb +14 -14
  210. data/spec/unit/braintree/payment_method_spec.rb +19 -19
  211. data/spec/unit/braintree/paypal_account_spec.rb +4 -4
  212. data/spec/unit/braintree/resource_collection_spec.rb +7 -7
  213. data/spec/unit/braintree/sepa_debit_account_nonce_details_spec.rb +1 -1
  214. data/spec/unit/braintree/sha256_digest_spec.rb +1 -1
  215. data/spec/unit/braintree/signature_service_spec.rb +2 -2
  216. data/spec/unit/braintree/subscription_search_spec.rb +17 -17
  217. data/spec/unit/braintree/subscription_spec.rb +8 -8
  218. data/spec/unit/braintree/successful_result_spec.rb +5 -5
  219. data/spec/unit/braintree/three_d_secure_info_spec.rb +20 -20
  220. data/spec/unit/braintree/transaction/credit_card_details_spec.rb +5 -5
  221. data/spec/unit/braintree/transaction/customer_details_spec.rb +1 -1
  222. data/spec/unit/braintree/transaction/deposit_details_spec.rb +2 -2
  223. data/spec/unit/braintree/transaction/local_payment_details_spec.rb +30 -0
  224. data/spec/unit/braintree/transaction_gateway_spec.rb +39 -7
  225. data/spec/unit/braintree/transaction_search_spec.rb +2 -2
  226. data/spec/unit/braintree/transaction_spec.rb +101 -93
  227. data/spec/unit/braintree/unknown_payment_method_spec.rb +4 -4
  228. data/spec/unit/braintree/us_bank_account_spec.rb +2 -2
  229. data/spec/unit/braintree/us_bank_account_verification_search_spec.rb +7 -7
  230. data/spec/unit/braintree/us_bank_account_verification_spec.rb +12 -7
  231. data/spec/unit/braintree/util_spec.rb +27 -27
  232. data/spec/unit/braintree/validation_error_collection_spec.rb +34 -34
  233. data/spec/unit/braintree/validation_error_spec.rb +4 -4
  234. data/spec/unit/braintree/venmo_profile_data_spec.rb +16 -5
  235. data/spec/unit/braintree/webhook_notification_spec.rb +206 -191
  236. data/spec/unit/braintree/xml/libxml_spec.rb +5 -5
  237. data/spec/unit/braintree/xml/parser_spec.rb +8 -8
  238. data/spec/unit/braintree/xml/rexml_spec.rb +5 -5
  239. data/spec/unit/braintree/xml_spec.rb +17 -17
  240. data/spec/unit/braintree_spec.rb +2 -2
  241. metadata +11 -2
@@ -1,5 +1,5 @@
1
1
  module Braintree
2
- class WebhookTesting # :nodoc:
2
+ class WebhookTesting
3
3
  def self.sample_notification(*args)
4
4
  Configuration.gateway.webhook_testing.sample_notification(*args)
5
5
  end
@@ -1,5 +1,5 @@
1
1
  module Braintree
2
- class WebhookTestingGateway # :nodoc:
2
+ class WebhookTestingGateway
3
3
  def initialize(gateway)
4
4
  @gateway = gateway
5
5
  @config = gateway.config
@@ -72,6 +72,8 @@ module Braintree
72
72
  _disbursement_exception_sample_xml(id)
73
73
  when Braintree::WebhookNotification::Kind::Disbursement
74
74
  _disbursement_sample_xml(id)
75
+ when Braintree::WebhookNotification::Kind::SubscriptionBillingSkipped
76
+ _subscription_billing_skipped(id)
75
77
  when Braintree::WebhookNotification::Kind::SubscriptionChargedSuccessfully
76
78
  _subscription_charged_successfully(id)
77
79
  when Braintree::WebhookNotification::Kind::SubscriptionChargedUnsuccessfully
@@ -112,6 +114,21 @@ module Braintree
112
114
  XML
113
115
  end
114
116
 
117
+ def _subscription_billing_skipped(id)
118
+
119
+ <<-XML
120
+ <subscription>
121
+ <id>#{id}</id>
122
+ <transactions type="array">
123
+ </transactions>
124
+ <add_ons type="array">
125
+ </add_ons>
126
+ <discounts type="array">
127
+ </discounts>
128
+ </subscription>
129
+ XML
130
+ end
131
+
115
132
  def _subscription_charged_successfully(id)
116
133
 
117
134
  <<-XML
@@ -2,7 +2,7 @@
2
2
  # under the MIT license, copyright (c) 2005-2009 David Heinemeier Hansson
3
3
  module Braintree
4
4
  module Xml
5
- module Generator # :nodoc:
5
+ module Generator
6
6
  XML_TYPE_NAMES = {
7
7
  "Fixnum" => "integer",
8
8
  "Bignum" => "integer",
@@ -2,7 +2,7 @@
2
2
  # under the MIT license, copyright (c) 2005-2009 David Heinemeier Hansson
3
3
  module Braintree
4
4
  module Xml
5
- module Libxml # :nodoc:
5
+ module Libxml
6
6
  LIB_XML_LIMIT = 30000000
7
7
 
8
8
  def self.parse(xml_string)
@@ -1,10 +1,10 @@
1
1
  # Portions of this code were copied and modified from Ruby on Rails, released
2
2
  # under the MIT license, copyright (c) 2005-2009 David Heinemeier Hansson
3
3
  module Braintree
4
- module Xml # :nodoc:
4
+ module Xml
5
5
  CONTENT_ROOT = "__content__"
6
6
 
7
- module Parser # :nodoc:
7
+ module Parser
8
8
  XML_PARSING = {
9
9
  "datetime" => Proc.new { |time| ::Time.parse(time).utc },
10
10
  "integer" => Proc.new { |integer| integer.to_i },
@@ -1,8 +1,8 @@
1
1
  # Portions of this code were copied and modified from Ruby on Rails, released
2
2
  # under the MIT license, copyright (c) 2005-2009 David Heinemeier Hansson
3
3
  module Braintree
4
- module Xml # :nodoc:
5
- module Rexml # :nodoc:
4
+ module Xml
5
+ module Rexml
6
6
 
7
7
  CONTENT_KEY = "__content__".freeze
8
8
 
data/lib/braintree/xml.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Braintree
2
- module Xml # :nodoc:
2
+ module Xml
3
3
  def self.hash_from_xml(xml)
4
4
  Parser.hash_from_xml(xml)
5
5
  end
data/lib/braintree.rb CHANGED
@@ -3,7 +3,6 @@ require "bigdecimal"
3
3
  require "cgi"
4
4
  require "date"
5
5
  require "digest/sha1"
6
- require "enumerator"
7
6
  require "forwardable"
8
7
  require "logger"
9
8
  require "net/http"
@@ -91,6 +90,8 @@ require "braintree/merchant_account/individual_details"
91
90
  require "braintree/merchant_account/business_details"
92
91
  require "braintree/merchant_account/funding_details"
93
92
  require "braintree/merchant_account/address_details"
93
+ require "braintree/meta_checkout_card"
94
+ require "braintree/meta_checkout_token"
94
95
  require "braintree/oauth_gateway"
95
96
  require "braintree/oauth_credentials"
96
97
  require "braintree/payment_instrument_type"
@@ -153,6 +154,8 @@ require "braintree/transaction/installment/adjustment"
153
154
  require "braintree/transaction/payment_receipt"
154
155
  require "braintree/transaction/payment_receipt/card_present_data.rb"
155
156
  require "braintree/transaction/payment_receipt/merchant_address.rb"
157
+ require "braintree/transaction/meta_checkout_card_details"
158
+ require "braintree/transaction/meta_checkout_token_details"
156
159
  require "braintree/transaction/paypal_details"
157
160
  require "braintree/transaction/paypal_here_details"
158
161
  require "braintree/transaction/samsung_pay_card_details"
@@ -20,15 +20,15 @@ describe Braintree::AddOn do
20
20
  add_ons = Braintree::AddOn.all
21
21
  add_on = add_ons.select { |add_on| add_on.id == id }.first
22
22
 
23
- add_on.should_not be_nil
24
- add_on.amount.should == BigDecimal(expected[:amount])
25
- add_on.created_at.should_not be_nil
26
- add_on.description.should == expected[:description]
27
- add_on.kind.should == expected[:kind]
28
- add_on.name.should == expected[:name]
29
- add_on.never_expires.should == expected[:never_expires]
30
- add_on.number_of_billing_cycles.should == expected[:number_of_billing_cycles]
31
- add_on.updated_at.should_not be_nil
23
+ expect(add_on).not_to be_nil
24
+ expect(add_on.amount).to eq(BigDecimal(expected[:amount]))
25
+ expect(add_on.created_at).not_to be_nil
26
+ expect(add_on.description).to eq(expected[:description])
27
+ expect(add_on.kind).to eq(expected[:kind])
28
+ expect(add_on.name).to eq(expected[:name])
29
+ expect(add_on.never_expires).to eq(expected[:never_expires])
30
+ expect(add_on.number_of_billing_cycles).to eq(expected[:number_of_billing_cycles])
31
+ expect(add_on.updated_at).not_to be_nil
32
32
  end
33
33
 
34
34
  it "raises with a helpful error if public_key and private_key are not set" do
@@ -18,21 +18,21 @@ describe Braintree::Address do
18
18
  :postal_code => "60622",
19
19
  :country_name => "United States of America",
20
20
  )
21
- result.success?.should == true
22
- result.address.customer_id.should == customer.id
23
- result.address.first_name.should == "Ben"
24
- result.address.last_name.should == "Moore"
25
- result.address.company.should == "Moore Co."
26
- result.address.street_address.should == "1811 E Main St"
27
- result.address.extended_address.should == "Suite 200"
28
- result.address.locality.should == "Chicago"
29
- result.address.region.should == "Illinois"
30
- result.address.phone_number.should == "5551231234"
31
- result.address.postal_code.should == "60622"
32
- result.address.country_name.should == "United States of America"
33
- result.address.country_code_alpha2.should == "US"
34
- result.address.country_code_alpha3.should == "USA"
35
- result.address.country_code_numeric.should == "840"
21
+ expect(result.success?).to eq(true)
22
+ expect(result.address.customer_id).to eq(customer.id)
23
+ expect(result.address.first_name).to eq("Ben")
24
+ expect(result.address.last_name).to eq("Moore")
25
+ expect(result.address.company).to eq("Moore Co.")
26
+ expect(result.address.street_address).to eq("1811 E Main St")
27
+ expect(result.address.extended_address).to eq("Suite 200")
28
+ expect(result.address.locality).to eq("Chicago")
29
+ expect(result.address.region).to eq("Illinois")
30
+ expect(result.address.phone_number).to eq("5551231234")
31
+ expect(result.address.postal_code).to eq("60622")
32
+ expect(result.address.country_name).to eq("United States of America")
33
+ expect(result.address.country_code_alpha2).to eq("US")
34
+ expect(result.address.country_code_alpha3).to eq("USA")
35
+ expect(result.address.country_code_numeric).to eq("840")
36
36
  end
37
37
 
38
38
  it "accepts country_codes" do
@@ -43,11 +43,11 @@ describe Braintree::Address do
43
43
  :country_code_alpha3 => "ASM",
44
44
  :country_code_numeric => "16",
45
45
  )
46
- result.success?.should == true
47
- result.address.country_name.should == "American Samoa"
48
- result.address.country_code_alpha2.should == "AS"
49
- result.address.country_code_alpha3.should == "ASM"
50
- result.address.country_code_numeric.should == "016"
46
+ expect(result.success?).to eq(true)
47
+ expect(result.address.country_name).to eq("American Samoa")
48
+ expect(result.address.country_code_alpha2).to eq("AS")
49
+ expect(result.address.country_code_alpha3).to eq("ASM")
50
+ expect(result.address.country_code_numeric).to eq("016")
51
51
  end
52
52
 
53
53
  it "accepts utf-8 country names" do
@@ -56,8 +56,8 @@ describe Braintree::Address do
56
56
  :customer_id => customer.id,
57
57
  :country_name => "Åland",
58
58
  )
59
- result.success?.should == true
60
- result.address.country_name.should == "Åland"
59
+ expect(result.success?).to eq(true)
60
+ expect(result.address.country_name).to eq("Åland")
61
61
  end
62
62
 
63
63
  it "returns an error response given inconsistent country codes" do
@@ -67,8 +67,8 @@ describe Braintree::Address do
67
67
  :country_code_alpha2 => "AS",
68
68
  :country_code_alpha3 => "USA",
69
69
  )
70
- result.success?.should == false
71
- result.errors.for(:address).on(:base).map { |e| e.code }.should include(Braintree::ErrorCodes::Address::InconsistentCountry)
70
+ expect(result.success?).to eq(false)
71
+ expect(result.errors.for(:address).on(:base).map { |e| e.code }).to include(Braintree::ErrorCodes::Address::InconsistentCountry)
72
72
  end
73
73
 
74
74
  it "returns an error response given an invalid country_code_alpha2" do
@@ -77,8 +77,8 @@ describe Braintree::Address do
77
77
  :customer_id => customer.id,
78
78
  :country_code_alpha2 => "zz",
79
79
  )
80
- result.success?.should == false
81
- result.errors.for(:address).on(:country_code_alpha2).map { |e| e.code }.should include(Braintree::ErrorCodes::Address::CountryCodeAlpha2IsNotAccepted)
80
+ expect(result.success?).to eq(false)
81
+ expect(result.errors.for(:address).on(:country_code_alpha2).map { |e| e.code }).to include(Braintree::ErrorCodes::Address::CountryCodeAlpha2IsNotAccepted)
82
82
  end
83
83
 
84
84
  it "returns an error response given an invalid country_code_alpha3" do
@@ -87,8 +87,8 @@ describe Braintree::Address do
87
87
  :customer_id => customer.id,
88
88
  :country_code_alpha3 => "zzz",
89
89
  )
90
- result.success?.should == false
91
- result.errors.for(:address).on(:country_code_alpha3).map { |e| e.code }.should include(Braintree::ErrorCodes::Address::CountryCodeAlpha3IsNotAccepted)
90
+ expect(result.success?).to eq(false)
91
+ expect(result.errors.for(:address).on(:country_code_alpha3).map { |e| e.code }).to include(Braintree::ErrorCodes::Address::CountryCodeAlpha3IsNotAccepted)
92
92
  end
93
93
 
94
94
  it "returns an error response given an invalid country_code_numeric" do
@@ -97,8 +97,8 @@ describe Braintree::Address do
97
97
  :customer_id => customer.id,
98
98
  :country_code_numeric => "zz",
99
99
  )
100
- result.success?.should == false
101
- result.errors.for(:address).on(:country_code_numeric).map { |e| e.code }.should include(Braintree::ErrorCodes::Address::CountryCodeNumericIsNotAccepted)
100
+ expect(result.success?).to eq(false)
101
+ expect(result.errors.for(:address).on(:country_code_numeric).map { |e| e.code }).to include(Braintree::ErrorCodes::Address::CountryCodeNumericIsNotAccepted)
102
102
  end
103
103
 
104
104
  it "returns an error response if invalid" do
@@ -107,8 +107,8 @@ describe Braintree::Address do
107
107
  :customer_id => customer.id,
108
108
  :country_name => "United States of Invalid",
109
109
  )
110
- result.success?.should == false
111
- result.errors.for(:address).on(:country_name)[0].message.should == "Country name is not an accepted country."
110
+ expect(result.success?).to eq(false)
111
+ expect(result.errors.for(:address).on(:country_name)[0].message).to eq("Country name is not an accepted country.")
112
112
  end
113
113
 
114
114
  it "allows -, _, A-Z, a-z, and 0-9 in customer_id without raising an ArgumentError" do
@@ -137,14 +137,14 @@ describe Braintree::Address do
137
137
  :postal_code => "60623",
138
138
  :country_name => "United States of America",
139
139
  )
140
- address.customer_id.should == customer.id
141
- address.street_address.should == "1812 E Main St"
142
- address.extended_address.should == "Suite 201"
143
- address.locality.should == "Bartlett"
144
- address.region.should == "IL"
145
- address.phone_number.should == "5551231234"
146
- address.postal_code.should == "60623"
147
- address.country_name.should == "United States of America"
140
+ expect(address.customer_id).to eq(customer.id)
141
+ expect(address.street_address).to eq("1812 E Main St")
142
+ expect(address.extended_address).to eq("Suite 201")
143
+ expect(address.locality).to eq("Bartlett")
144
+ expect(address.region).to eq("IL")
145
+ expect(address.phone_number).to eq("5551231234")
146
+ expect(address.postal_code).to eq("60623")
147
+ expect(address.country_name).to eq("United States of America")
148
148
  end
149
149
 
150
150
  it "raises a ValidationsFailed if invalid" do
@@ -162,7 +162,7 @@ describe Braintree::Address do
162
162
  it "deletes the address given a customer id and an address id" do
163
163
  customer = Braintree::Customer.create!(:last_name => "Wilson")
164
164
  address = Braintree::Address.create!(:customer_id => customer.id, :street_address => "123 E Main St")
165
- Braintree::Address.delete(customer.id, address.id).success?.should == true
165
+ expect(Braintree::Address.delete(customer.id, address.id).success?).to eq(true)
166
166
  expect do
167
167
  Braintree::Address.find(customer.id, address.id)
168
168
  end.to raise_error(Braintree::NotFoundError)
@@ -171,7 +171,7 @@ describe Braintree::Address do
171
171
  it "deletes the address given a customer and an address id" do
172
172
  customer = Braintree::Customer.create!(:last_name => "Wilson")
173
173
  address = Braintree::Address.create!(:customer_id => customer.id, :street_address => "123 E Main St")
174
- Braintree::Address.delete(customer, address.id).success?.should == true
174
+ expect(Braintree::Address.delete(customer, address.id).success?).to eq(true)
175
175
  expect do
176
176
  Braintree::Address.find(customer.id, address.id)
177
177
  end.to raise_error(Braintree::NotFoundError)
@@ -182,13 +182,13 @@ describe Braintree::Address do
182
182
  it "finds the address given a customer and an address id" do
183
183
  customer = Braintree::Customer.create!(:last_name => "Wilson")
184
184
  address = Braintree::Address.create!(:customer_id => customer.id, :street_address => "123 E Main St")
185
- Braintree::Address.find(customer, address.id).should == address
185
+ expect(Braintree::Address.find(customer, address.id)).to eq(address)
186
186
  end
187
187
 
188
188
  it "finds the address given a customer id and an address id" do
189
189
  customer = Braintree::Customer.create!(:last_name => "Wilson")
190
190
  address = Braintree::Address.create!(:customer_id => customer.id, :street_address => "123 E Main St")
191
- Braintree::Address.find(customer.id, address.id).should == address
191
+ expect(Braintree::Address.find(customer.id, address.id)).to eq(address)
192
192
  end
193
193
 
194
194
  it "raises a NotFoundError if it cannot be found because of customer id" do
@@ -242,16 +242,16 @@ describe Braintree::Address do
242
242
  :postal_code => "60621",
243
243
  :country_name => "United States of America",
244
244
  )
245
- result.success?.should == true
246
- result.address.street_address.should == "123 E New St"
247
- result.address.extended_address.should == "New Suite 3"
248
- result.address.locality.should == "Chicago"
249
- result.address.region.should == "Illinois"
250
- result.address.postal_code.should == "60621"
251
- result.address.country_name.should == "United States of America"
252
- result.address.country_code_alpha2.should == "US"
253
- result.address.country_code_alpha3.should == "USA"
254
- result.address.country_code_numeric.should == "840"
245
+ expect(result.success?).to eq(true)
246
+ expect(result.address.street_address).to eq("123 E New St")
247
+ expect(result.address.extended_address).to eq("New Suite 3")
248
+ expect(result.address.locality).to eq("Chicago")
249
+ expect(result.address.region).to eq("Illinois")
250
+ expect(result.address.postal_code).to eq("60621")
251
+ expect(result.address.country_name).to eq("United States of America")
252
+ expect(result.address.country_code_alpha2).to eq("US")
253
+ expect(result.address.country_code_alpha3).to eq("USA")
254
+ expect(result.address.country_code_numeric).to eq("840")
255
255
  end
256
256
 
257
257
  it "accepts country_codes" do
@@ -266,11 +266,11 @@ describe Braintree::Address do
266
266
  :country_name => "Azerbaijan",
267
267
  )
268
268
 
269
- result.success?.should == true
270
- result.address.country_name.should == "Azerbaijan"
271
- result.address.country_code_alpha2.should == "AZ"
272
- result.address.country_code_alpha3.should == "AZE"
273
- result.address.country_code_numeric.should == "031"
269
+ expect(result.success?).to eq(true)
270
+ expect(result.address.country_name).to eq("Azerbaijan")
271
+ expect(result.address.country_code_alpha2).to eq("AZ")
272
+ expect(result.address.country_code_alpha3).to eq("AZE")
273
+ expect(result.address.country_code_numeric).to eq("031")
274
274
  end
275
275
 
276
276
  it "returns an error response if invalid" do
@@ -285,8 +285,8 @@ describe Braintree::Address do
285
285
  :street_address => "123 E New St",
286
286
  :country_name => "United States of Invalid",
287
287
  )
288
- result.success?.should == false
289
- result.errors.for(:address).on(:country_name)[0].message.should == "Country name is not an accepted country."
288
+ expect(result.success?).to eq(false)
289
+ expect(result.errors.for(:address).on(:country_name)[0].message).to eq("Country name is not an accepted country.")
290
290
  end
291
291
  end
292
292
 
@@ -320,13 +320,13 @@ describe Braintree::Address do
320
320
  :postal_code => "60621",
321
321
  :country_name => "United States of America",
322
322
  )
323
- updated_address.should == address
324
- updated_address.street_address.should == "123 E New St"
325
- updated_address.extended_address.should == "New Suite 3"
326
- updated_address.locality.should == "Chicago"
327
- updated_address.region.should == "Illinois"
328
- updated_address.postal_code.should == "60621"
329
- updated_address.country_name.should == "United States of America"
323
+ expect(updated_address).to eq(address)
324
+ expect(updated_address.street_address).to eq("123 E New St")
325
+ expect(updated_address.extended_address).to eq("New Suite 3")
326
+ expect(updated_address.locality).to eq("Chicago")
327
+ expect(updated_address.region).to eq("Illinois")
328
+ expect(updated_address.postal_code).to eq("60621")
329
+ expect(updated_address.country_name).to eq("United States of America")
330
330
  end
331
331
 
332
332
  it "raises a ValidationsFailed invalid" do
@@ -352,7 +352,7 @@ describe Braintree::Address do
352
352
  customer = Braintree::Customer.create!(:last_name => "Wilson")
353
353
  address = Braintree::Address.create!(:customer_id => customer.id, :street_address => "123 E Main St")
354
354
  result = Braintree::Address.delete(customer.id, address.id)
355
- result.success?.should == true
355
+ expect(result.success?).to eq(true)
356
356
  expect do
357
357
  Braintree::Address.find(customer.id, address.id)
358
358
  end.to raise_error(Braintree::NotFoundError)
@@ -29,8 +29,8 @@ describe Braintree::AdvancedSearch do
29
29
  search.id.is "subscription1_#{id}"
30
30
  end
31
31
 
32
- collection.should include(subscription1)
33
- collection.should_not include(subscription2)
32
+ expect(collection).to include(subscription1)
33
+ expect(collection).not_to include(subscription2)
34
34
  end
35
35
 
36
36
  it "is_not" do
@@ -54,8 +54,8 @@ describe Braintree::AdvancedSearch do
54
54
  search.price.is "11"
55
55
  end
56
56
 
57
- collection.should_not include(subscription1)
58
- collection.should include(subscription2)
57
+ expect(collection).not_to include(subscription1)
58
+ expect(collection).to include(subscription2)
59
59
  end
60
60
 
61
61
  it "starts_with" do
@@ -76,8 +76,8 @@ describe Braintree::AdvancedSearch do
76
76
  search.id.starts_with "subscription1_"
77
77
  end
78
78
 
79
- collection.should include(subscription1)
80
- collection.should_not include(subscription2)
79
+ expect(collection).to include(subscription1)
80
+ expect(collection).not_to include(subscription2)
81
81
  end
82
82
 
83
83
  it "ends_with" do
@@ -98,8 +98,8 @@ describe Braintree::AdvancedSearch do
98
98
  search.id.ends_with "1_#{id}"
99
99
  end
100
100
 
101
- collection.should include(subscription1)
102
- collection.should_not include(subscription2)
101
+ expect(collection).to include(subscription1)
102
+ expect(collection).not_to include(subscription2)
103
103
  end
104
104
 
105
105
  it "contains" do
@@ -120,8 +120,8 @@ describe Braintree::AdvancedSearch do
120
120
  search.id.contains "scription1_"
121
121
  end
122
122
 
123
- collection.should include(subscription1)
124
- collection.should_not include(subscription2)
123
+ expect(collection).to include(subscription1)
124
+ expect(collection).not_to include(subscription2)
125
125
  end
126
126
  end
127
127
 
@@ -147,8 +147,8 @@ describe Braintree::AdvancedSearch do
147
147
  search.price.is "12"
148
148
  end
149
149
 
150
- collection.should include(subscription1)
151
- collection.should include(subscription2)
150
+ expect(collection).to include(subscription1)
151
+ expect(collection).to include(subscription2)
152
152
  end
153
153
 
154
154
  it "returns only matching results" do
@@ -171,8 +171,8 @@ describe Braintree::AdvancedSearch do
171
171
  search.price.is "13"
172
172
  end
173
173
 
174
- collection.should include(subscription1)
175
- collection.should_not include(subscription2)
174
+ expect(collection).to include(subscription1)
175
+ expect(collection).not_to include(subscription2)
176
176
  end
177
177
 
178
178
  it "returns only matching results given an argument list" do
@@ -195,8 +195,8 @@ describe Braintree::AdvancedSearch do
195
195
  search.price.is "14"
196
196
  end
197
197
 
198
- collection.should include(subscription1)
199
- collection.should include(subscription2)
198
+ expect(collection).to include(subscription1)
199
+ expect(collection).to include(subscription2)
200
200
  end
201
201
 
202
202
  describe "is" do
@@ -220,8 +220,8 @@ describe Braintree::AdvancedSearch do
220
220
  search.price.is "15"
221
221
  end
222
222
 
223
- collection.should include(subscription1)
224
- collection.should_not include(subscription2)
223
+ expect(collection).to include(subscription1)
224
+ expect(collection).not_to include(subscription2)
225
225
  end
226
226
  end
227
227
 
@@ -245,8 +245,8 @@ describe Braintree::AdvancedSearch do
245
245
  search.price.is "16"
246
246
  end
247
247
 
248
- collection.should include(subscription1)
249
- collection.should include(subscription2)
248
+ expect(collection).to include(subscription1)
249
+ expect(collection).to include(subscription2)
250
250
  end
251
251
 
252
252
  it "returns expired subscriptions" do
@@ -254,8 +254,8 @@ describe Braintree::AdvancedSearch do
254
254
  search.status.in [Braintree::Subscription::Status::Expired]
255
255
  end
256
256
 
257
- collection.maximum_size.should > 0
258
- collection.all? { |subscription| subscription.status.should == Braintree::Subscription::Status::Expired }
257
+ expect(collection.maximum_size).to be > 0
258
+ collection.all? { |subscription| expect(subscription.status).to eq(Braintree::Subscription::Status::Expired) }
259
259
  end
260
260
  end
261
261
  end
@@ -287,7 +287,7 @@ describe Braintree::AdvancedSearch do
287
287
  search.price.is "17"
288
288
  end
289
289
 
290
- collection.maximum_size.should > 0
290
+ expect(collection.maximum_size).to be > 0
291
291
  collection.all? { |subscription| plan_ids.include?(subscription.plan_id) }
292
292
  end
293
293
  end
@@ -298,7 +298,7 @@ describe Braintree::AdvancedSearch do
298
298
  search.plan_id.is "not_a_real_plan_id"
299
299
  end
300
300
 
301
- collection.maximum_size.should == 0
301
+ expect(collection.maximum_size).to eq(0)
302
302
  end
303
303
  end
304
304
 
@@ -321,8 +321,8 @@ describe Braintree::AdvancedSearch do
321
321
  search.price.is "18"
322
322
  end
323
323
 
324
- collection.should include(trialless_subscription)
325
- collection.should_not include(trial_subscription)
324
+ expect(collection).to include(trialless_subscription)
325
+ expect(collection).not_to include(trial_subscription)
326
326
  end
327
327
  end
328
328
 
@@ -345,8 +345,8 @@ describe Braintree::AdvancedSearch do
345
345
  search.price.is "19"
346
346
  end
347
347
 
348
- collection.should_not include(trialless_subscription)
349
- collection.should include(trial_subscription)
348
+ expect(collection).not_to include(trialless_subscription)
349
+ expect(collection).to include(trial_subscription)
350
350
  end
351
351
  end
352
352
 
@@ -369,8 +369,8 @@ describe Braintree::AdvancedSearch do
369
369
  search.price.is "20"
370
370
  end
371
371
 
372
- collection.should include(trial_subscription)
373
- collection.should_not include(trialless_subscription)
372
+ expect(collection).to include(trial_subscription)
373
+ expect(collection).not_to include(trialless_subscription)
374
374
  end
375
375
  end
376
376
 
@@ -393,8 +393,8 @@ describe Braintree::AdvancedSearch do
393
393
  search.price.is "21"
394
394
  end
395
395
 
396
- collection.should include(trial_subscription)
397
- collection.should_not include(trialless_subscription)
396
+ expect(collection).to include(trial_subscription)
397
+ expect(collection).not_to include(trialless_subscription)
398
398
  end
399
399
  end
400
400
 
@@ -417,8 +417,8 @@ describe Braintree::AdvancedSearch do
417
417
  search.price.is "22"
418
418
  end
419
419
 
420
- collection.should include(trial_subscription)
421
- collection.should_not include(trialless_subscription)
420
+ expect(collection).to include(trial_subscription)
421
+ expect(collection).not_to include(trialless_subscription)
422
422
  end
423
423
  end
424
424
  end
@@ -441,8 +441,8 @@ describe Braintree::AdvancedSearch do
441
441
  search.price.is "5.00"
442
442
  end
443
443
 
444
- collection.should include(subscription_500)
445
- collection.should_not include(subscription_501)
444
+ expect(collection).to include(subscription_500)
445
+ expect(collection).not_to include(subscription_501)
446
446
  end
447
447
 
448
448
  it "<=" do
@@ -468,9 +468,9 @@ describe Braintree::AdvancedSearch do
468
468
  search.price <= "5.00"
469
469
  end
470
470
 
471
- collection.should include(subscription_499)
472
- collection.should include(subscription_500)
473
- collection.should_not include(subscription_501)
471
+ expect(collection).to include(subscription_499)
472
+ expect(collection).to include(subscription_500)
473
+ expect(collection).not_to include(subscription_501)
474
474
  end
475
475
 
476
476
  it ">=" do
@@ -496,9 +496,9 @@ describe Braintree::AdvancedSearch do
496
496
  search.price >= "1000.00"
497
497
  end
498
498
 
499
- collection.should_not include(subscription_499)
500
- collection.should include(subscription_500)
501
- collection.should include(subscription_501)
499
+ expect(collection).not_to include(subscription_499)
500
+ expect(collection).to include(subscription_500)
501
+ expect(collection).to include(subscription_501)
502
502
  end
503
503
 
504
504
  it "between" do
@@ -524,9 +524,9 @@ describe Braintree::AdvancedSearch do
524
524
  search.price.between "4.99", "5.01"
525
525
  end
526
526
 
527
- collection.should include(subscription_499)
528
- collection.should include(subscription_500)
529
- collection.should_not include(subscription_502)
527
+ expect(collection).to include(subscription_499)
528
+ expect(collection).to include(subscription_500)
529
+ expect(collection).not_to include(subscription_502)
530
530
  end
531
531
  end
532
532
  end