Merge branch 'master' of https://github.com/solidusio/solidus_paypal_…

…braintree into respect_state_config

app/models/spree/store_decorator.rb

@@ -6,6 +6,6 @@
   private
 
   def build_default_configuration
-    build_braintree_configuration
+    build_braintree_configuration unless braintree_configuration
   end
 end

lib/views/frontend/spree/checkout/payment/_paypal_braintree.html.erb

@@ -13,7 +13,7 @@
 <% end %>
 
 <% if current_store.braintree_configuration.apple_pay? %>
-  <%= render "spree/shared/apple_pay_button" %>
+  <%= render "spree/shared/apple_pay_button", id: id %>
 <% end %>
 
 <%= render "spree/shared/braintree_errors" %>

spec/models/spree/store_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Spree::Store do
+  describe 'before_create :build_default_configuration' do
+    context 'when a braintree_configuration record already exists' do
+      it 'does not overwrite it' do
+        store = build(:store)
+        custom_braintree_configuration = store.build_braintree_configuration
+        store.save!
+        expect(store.braintree_configuration).to be custom_braintree_configuration
+      end
+    end
+  end
+end