lib/braintree/configuration.rb in braintree-2.78.0 vs lib/braintree/configuration.rb in braintree-2.79.0

@@ -199,11 +199,11 @@
     end
 
     def server # :nodoc:
       case @environment
       when :development, :integration
-        "localhost"
+        ENV['GATEWAY_HOST'] || "localhost"
       when :production
         "#{endpoint}.braintreegateway.com"
       when :qa
         "gateway.qa.braintreepayments.com"
       when :sandbox
@@ -258,10 +258,10 @@
       end
     end
 
     def assert_has_access_token_or_keys
       if (public_key.nil? || private_key.nil?) && access_token.nil?
-        raise ConfigurationError.new("Braintree::Gateway public_key and private_key are required.")
+        raise ConfigurationError.new("Braintree::Gateway access_token or public_key and private_key are required.")
       end
     end
 
     def signature_service
       @signature_service ||= SignatureService.new(@private_key)