Promo code batch join chars

backend/app/views/spree/admin/promotion_code_batches/new.html.erb

@@ -10,6 +10,11 @@
     <%= f.text_field :base_code, class: "fullwidth" %>
   <% end %>
 
+  <%= f.field_container :join_characters do %>
+    <%= f.label :join_characters %>
+    <%= f.text_field :join_characters, class: "fullwidth" %>
+  <% end %>
+
   <%= f.field_container :number_of_codes do %>
     <%= f.label :number_of_codes %>
     <%= f.text_field :number_of_codes, class: "fullwidth" %>

backend/app/views/spree/admin/promotions/_activations_new.html.erb

@@ -49,6 +49,10 @@
           <%= batch.label :number_of_codes, class: "required" %>
           <%= batch.number_field :number_of_codes, class: "fullwidth", min: 1, required: true %>
         </div>
+        <div class="field">
+          <%= batch.label :join_characters %>
+          <%= batch.text_field :join_characters, class: "fullwidth" %>
+        </div>
         <div class="field">
           <%= f.label :per_code_usage_limit %>
           <%= f.text_field :per_code_usage_limit, class: "fullwidth" %>

core/app/models/spree/promotion_code/batch_builder.rb

@@ -7,11 +7,10 @@ class ::Spree::PromotionCode::BatchBuilder
   DEFAULT_OPTIONS = {
     random_code_length: 6,
     batch_size: 1000,
-    sample_characters: ('a'..'z').to_a + (2..9).to_a.map(&:to_s),
-    join_characters: "_"
+    sample_characters: ('a'..'z').to_a + (2..9).to_a.map(&:to_s)
   }
 
-  [:random_code_length, :batch_size, :sample_characters, :join_characters].each do |attr|
+  [:random_code_length, :batch_size, :sample_characters].each do |attr|
     define_singleton_method(attr) do
       Spree::Deprecation.warn "#{name}.#{attr} is deprecated. Use #{name}::DEFAULT_OPTIONS[:#{attr}] instead"
       DEFAULT_OPTIONS[attr]
@@ -70,7 +69,7 @@ def generate_random_code
       @options[:sample_characters].sample
     end.join
 
-    "#{base_code}#{@options[:join_characters]}#{suffix}"
+    "#{base_code}#{@promotion_code_batch.join_characters}#{suffix}"
   end
 
   def get_unique_codes(code_set)

core/db/migrate/20180328172631_add_join_characters_to_promotion_code_batch.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddJoinCharactersToPromotionCodeBatch < ActiveRecord::Migration[5.1]
+  def change
+    add_column(:spree_promotion_code_batches,
+               :join_characters,
+               :string,
+               null: false,
+               default: '_')
+  end
+end

core/spec/jobs/promotion_code_batch_job_spec.rb

@@ -11,13 +11,42 @@
       email: email
     )
   end
-
   context "with a successful build" do
     before do
       allow(Spree::PromotionCodeBatchMailer)
         .to receive(:promotion_code_batch_finished)
         .and_call_original
     end
+
+    def codes
+      Spree::PromotionCode.pluck(:value)
+    end
+
+    context 'with the default join character' do
+      it 'uses the default join characters', :aggregate_failures do
+        subject.perform(promotion_code_batch)
+        codes.each do |code|
+          expect(code).to match(/^test_/)
+        end
+      end
+    end
+    context 'with a custom join character' do
+      let(:promotion_code_batch) do
+        Spree::PromotionCodeBatch.create!(
+          promotion_id: create(:promotion).id,
+          base_code: "test",
+          number_of_codes: 10,
+          email: email,
+          join_characters: '-'
+        )
+      end
+      it 'uses the custom join characters', :aggregate_failures do
+        subject.perform(promotion_code_batch)
+        codes.each do |code|
+          expect(code).to match(/^test-/)
+        end
+      end
+    end
     context "with an email address" do
       it "sends an email" do
         subject.perform(promotion_code_batch)

core/spec/models/spree/promotion_code/batch_builder_spec.rb

@@ -86,7 +86,15 @@
     end
 
     context "with a custom join separator" do
-      let(:options) { { join_characters: "x" } }
+      let(:promotion_code_batch) do
+        Spree::PromotionCodeBatch.create!(
+          promotion_id: promotion.id,
+          base_code: base_code,
+          number_of_codes: number_of_codes,
+          email: "test@email.com",
+          join_characters: "x"
+        )
+      end
 
       it "builds codes with the same base prefix" do
         subject.build_promotion_codes