braintree 4.14.0 → 4.18.0

data/spec/integration/braintree/advanced_search_spec.rb

@@ -29,8 +29,8 @@ describe Braintree::AdvancedSearch do
         search.id.is "subscription1_#{id}"
       end
 
-      collection.should include(subscription1)
-      collection.should_not include(subscription2)
+      expect(collection).to include(subscription1)
+      expect(collection).not_to include(subscription2)
     end
 
     it "is_not" do
@@ -54,8 +54,8 @@ describe Braintree::AdvancedSearch do
         search.price.is "11"
       end
 
-      collection.should_not include(subscription1)
-      collection.should include(subscription2)
+      expect(collection).not_to include(subscription1)
+      expect(collection).to include(subscription2)
     end
 
     it "starts_with" do
@@ -76,8 +76,8 @@ describe Braintree::AdvancedSearch do
         search.id.starts_with "subscription1_"
       end
 
-      collection.should include(subscription1)
-      collection.should_not include(subscription2)
+      expect(collection).to include(subscription1)
+      expect(collection).not_to include(subscription2)
     end
 
     it "ends_with" do
@@ -98,8 +98,8 @@ describe Braintree::AdvancedSearch do
         search.id.ends_with "1_#{id}"
       end
 
-      collection.should include(subscription1)
-      collection.should_not include(subscription2)
+      expect(collection).to include(subscription1)
+      expect(collection).not_to include(subscription2)
     end
 
     it "contains" do
@@ -120,8 +120,8 @@ describe Braintree::AdvancedSearch do
         search.id.contains "scription1_"
       end
 
-      collection.should include(subscription1)
-      collection.should_not include(subscription2)
+      expect(collection).to include(subscription1)
+      expect(collection).not_to include(subscription2)
     end
   end
 
@@ -147,8 +147,8 @@ describe Braintree::AdvancedSearch do
           search.price.is "12"
         end
 
-        collection.should include(subscription1)
-        collection.should include(subscription2)
+        expect(collection).to include(subscription1)
+        expect(collection).to include(subscription2)
       end
 
       it "returns only matching results" do
@@ -171,8 +171,8 @@ describe Braintree::AdvancedSearch do
           search.price.is "13"
         end
 
-        collection.should include(subscription1)
-        collection.should_not include(subscription2)
+        expect(collection).to include(subscription1)
+        expect(collection).not_to include(subscription2)
       end
 
       it "returns only matching results given an argument list" do
@@ -195,8 +195,8 @@ describe Braintree::AdvancedSearch do
           search.price.is "14"
         end
 
-        collection.should include(subscription1)
-        collection.should include(subscription2)
+        expect(collection).to include(subscription1)
+        expect(collection).to include(subscription2)
       end
 
       describe "is" do
@@ -220,8 +220,8 @@ describe Braintree::AdvancedSearch do
             search.price.is "15"
           end
 
-          collection.should include(subscription1)
-          collection.should_not include(subscription2)
+          expect(collection).to include(subscription1)
+          expect(collection).not_to include(subscription2)
         end
       end
 
@@ -245,8 +245,8 @@ describe Braintree::AdvancedSearch do
           search.price.is "16"
         end
 
-        collection.should include(subscription1)
-        collection.should include(subscription2)
+        expect(collection).to include(subscription1)
+        expect(collection).to include(subscription2)
       end
 
       it "returns expired subscriptions" do
@@ -254,8 +254,8 @@ describe Braintree::AdvancedSearch do
           search.status.in [Braintree::Subscription::Status::Expired]
         end
 
-        collection.maximum_size.should > 0
-        collection.all? { |subscription| subscription.status.should == Braintree::Subscription::Status::Expired }
+        expect(collection.maximum_size).to be > 0
+        collection.all? { |subscription| expect(subscription.status).to eq(Braintree::Subscription::Status::Expired) }
       end
     end
   end
@@ -287,7 +287,7 @@ describe Braintree::AdvancedSearch do
           search.price.is "17"
         end
 
-        collection.maximum_size.should > 0
+        expect(collection.maximum_size).to be > 0
         collection.all? { |subscription| plan_ids.include?(subscription.plan_id) }
       end
     end
@@ -298,7 +298,7 @@ describe Braintree::AdvancedSearch do
           search.plan_id.is "not_a_real_plan_id"
         end
 
-        collection.maximum_size.should == 0
+        expect(collection.maximum_size).to eq(0)
       end
     end
 
@@ -321,8 +321,8 @@ describe Braintree::AdvancedSearch do
           search.price.is "18"
         end
 
-        collection.should include(trialless_subscription)
-        collection.should_not include(trial_subscription)
+        expect(collection).to include(trialless_subscription)
+        expect(collection).not_to include(trial_subscription)
       end
     end
 
@@ -345,8 +345,8 @@ describe Braintree::AdvancedSearch do
           search.price.is "19"
         end
 
-        collection.should_not include(trialless_subscription)
-        collection.should include(trial_subscription)
+        expect(collection).not_to include(trialless_subscription)
+        expect(collection).to include(trial_subscription)
       end
     end
 
@@ -369,8 +369,8 @@ describe Braintree::AdvancedSearch do
           search.price.is "20"
         end
 
-        collection.should include(trial_subscription)
-        collection.should_not include(trialless_subscription)
+        expect(collection).to include(trial_subscription)
+        expect(collection).not_to include(trialless_subscription)
       end
     end
 
@@ -393,8 +393,8 @@ describe Braintree::AdvancedSearch do
           search.price.is "21"
         end
 
-        collection.should include(trial_subscription)
-        collection.should_not include(trialless_subscription)
+        expect(collection).to include(trial_subscription)
+        expect(collection).not_to include(trialless_subscription)
       end
     end
 
@@ -417,8 +417,8 @@ describe Braintree::AdvancedSearch do
           search.price.is "22"
         end
 
-        collection.should include(trial_subscription)
-        collection.should_not include(trialless_subscription)
+        expect(collection).to include(trial_subscription)
+        expect(collection).not_to include(trialless_subscription)
       end
     end
   end
@@ -441,8 +441,8 @@ describe Braintree::AdvancedSearch do
         search.price.is "5.00"
       end
 
-      collection.should include(subscription_500)
-      collection.should_not include(subscription_501)
+      expect(collection).to include(subscription_500)
+      expect(collection).not_to include(subscription_501)
     end
 
     it "<=" do
@@ -468,9 +468,9 @@ describe Braintree::AdvancedSearch do
         search.price <= "5.00"
       end
 
-      collection.should include(subscription_499)
-      collection.should include(subscription_500)
-      collection.should_not include(subscription_501)
+      expect(collection).to include(subscription_499)
+      expect(collection).to include(subscription_500)
+      expect(collection).not_to include(subscription_501)
     end
 
     it ">=" do
@@ -496,9 +496,9 @@ describe Braintree::AdvancedSearch do
         search.price >= "1000.00"
       end
 
-      collection.should_not include(subscription_499)
-      collection.should include(subscription_500)
-      collection.should include(subscription_501)
+      expect(collection).not_to include(subscription_499)
+      expect(collection).to include(subscription_500)
+      expect(collection).to include(subscription_501)
     end
 
     it "between" do
@@ -524,9 +524,9 @@ describe Braintree::AdvancedSearch do
         search.price.between "4.99", "5.01"
       end
 
-      collection.should include(subscription_499)
-      collection.should include(subscription_500)
-      collection.should_not include(subscription_502)
+      expect(collection).to include(subscription_499)
+      expect(collection).to include(subscription_500)
+      expect(collection).not_to include(subscription_502)
     end
   end
 end

data/spec/integration/braintree/apple_pay_spec.rb

@@ -23,13 +23,13 @@ describe Braintree::ApplePayGateway do
   describe "register_domain" do
     it "registers an apple pay domain" do
       result = @gateway.apple_pay.register_domain("www.example.com")
-      result.should be_success
+      expect(result).to be_success
     end
 
     it "gets a validation error when attempting to register no domains" do
       result = @gateway.apple_pay.register_domain("")
-      result.should_not be_success
-      result.errors.for(:apple_pay)[0].message.should eq("Domain name is required.")
+      expect(result).not_to be_success
+      expect(result.errors.for(:apple_pay)[0].message).to eq("Domain name is required.")
     end
   end
 
@@ -37,27 +37,27 @@ describe Braintree::ApplePayGateway do
     it "unregisters an apple pay domain" do
       domain = "example.org"
       result = @gateway.apple_pay.unregister_domain(domain)
-      result.should be_success
+      expect(result).to be_success
     end
 
     it "unregisters an apple pay domain with scheme in url" do
       domain = "http://example.org"
       result = @gateway.apple_pay.unregister_domain(domain)
-      result.should be_success
+      expect(result).to be_success
     end
 
     it "escapes the unregistered domain query parameter" do
       domain = "ex&mple.org"
       result = @gateway.apple_pay.unregister_domain(domain)
-      result.should be_success
+      expect(result).to be_success
     end
   end
 
   describe "registered_domains" do
     it "returns stubbed registered domains" do
       result = @gateway.apple_pay.registered_domains
-      result.should be_success
-      result.apple_pay_options.domains.should == ["www.example.com"]
+      expect(result).to be_success
+      expect(result.apple_pay_options.domains).to eq(["www.example.com"])
     end
   end
 end

data/spec/integration/braintree/client_api/client_token_spec.rb

@@ -17,7 +17,7 @@ describe Braintree::ClientToken do
 
       response = http.get_payment_methods
 
-      response.code.should == "200"
+      expect(response.code).to eq("200")
     end
 
     it "raises ArgumentError on invalid parameters (422)" do
@@ -31,14 +31,14 @@ describe Braintree::ClientToken do
         config = Braintree::Configuration.instantiate
         client_token_string = Braintree::ClientToken.generate(:version => 1)
         client_token = JSON.parse(client_token_string)
-        client_token["version"].should == 1
+        expect(client_token["version"]).to eq(1)
       end
 
       it "defaults to 2" do
         config = Braintree::Configuration.instantiate
         client_token_string = Braintree::ClientToken.generate
         client_token = decode_client_token(client_token_string)
-        client_token["version"].should == 2
+        expect(client_token["version"]).to eq(2)
       end
     end
 
@@ -68,7 +68,7 @@ describe Braintree::ClientToken do
         },
       )
 
-      response.code.should == "422"
+      expect(response.code).to eq("422")
     end
 
     it "can pass make_default" do
@@ -98,7 +98,7 @@ describe Braintree::ClientToken do
         },
       )
 
-      response.code.should == "201"
+      expect(response.code).to eq("201")
 
       response = http.add_payment_method(
         :credit_card => {
@@ -108,10 +108,10 @@ describe Braintree::ClientToken do
         },
       )
 
-      response.code.should == "201"
+      expect(response.code).to eq("201")
 
       customer = Braintree::Customer.find(customer_id)
-      customer.credit_cards.select { |c| c.bin == "400551" }[0].should be_default
+      expect(customer.credit_cards.select { |c| c.bin == "400551" }[0]).to be_default
     end
 
     it "can pass fail_on_duplicate_payment_method" do
@@ -138,7 +138,7 @@ describe Braintree::ClientToken do
         },
       )
 
-      response.code.should == "201"
+      expect(response.code).to eq("201")
 
       second_raw_client_token = Braintree::ClientToken.generate(
         :customer_id => customer_id,
@@ -158,7 +158,7 @@ describe Braintree::ClientToken do
         },
       )
 
-      response.code.should == "422"
+      expect(response.code).to eq("422")
     end
 
     it "can pass merchant_account_id" do
@@ -169,7 +169,7 @@ describe Braintree::ClientToken do
       )
       client_token = decode_client_token(raw_client_token)
 
-      client_token["merchantAccountId"].should == merchant_account_id
+      expect(client_token["merchantAccountId"]).to eq(merchant_account_id)
     end
 
     context "paypal" do
@@ -178,11 +178,11 @@ describe Braintree::ClientToken do
           raw_client_token = Braintree::ClientToken.generate
           client_token = decode_client_token(raw_client_token)
 
-          client_token["paypal"]["displayName"].should == "merchant who has paypal and sepa enabled"
-          client_token["paypal"]["clientId"].should match(/.+/)
-          client_token["paypal"]["privacyUrl"].should match("http://www.example.com/privacy_policy")
-          client_token["paypal"]["userAgreementUrl"].should match("http://www.example.com/user_agreement")
-          client_token["paypal"]["baseUrl"].should_not be_nil
+          expect(client_token["paypal"]["displayName"]).to eq("merchant who has paypal and sepa enabled")
+          expect(client_token["paypal"]["clientId"]).to match(/.+/)
+          expect(client_token["paypal"]["privacyUrl"]).to match("http://www.example.com/privacy_policy")
+          expect(client_token["paypal"]["userAgreementUrl"]).to match("http://www.example.com/user_agreement")
+          expect(client_token["paypal"]["baseUrl"]).not_to be_nil
         end
       end
     end

data/spec/integration/braintree/client_api/spec_helper.rb

@@ -282,8 +282,8 @@ class ClientApiHttp
     params = {:credit_card => params}
     params.merge!(
       :authorization_fingerprint => @options[:authorization_fingerprint],
-      :shared_customer_identifier => "fake_identifier",
-      :shared_customer_identifier_type => "testing",
+      :shared_customer_identifier => @options[:shared_customer_identifier],
+      :shared_customer_identifier_type => @options[:shared_customer_identifier_type],
     )
 
     post("/merchants/#{config.merchant_id}/client_api/v1/payment_methods/credit_cards", params)