Merge pull request #8712 from Matt-Yorkley/oc-mails

OC notifications

spec/jobs/order_cycle_notification_job_spec.rb

@@ -10,8 +10,14 @@ describe OrderCycleNotificationJob do
     allow(ProducerMailer).to receive(:order_cycle_report).twice.and_return(mail)
   end
 
-  it 'sends a mail to each supplier' do
+  it "sends a mail to each supplier" do
     OrderCycleNotificationJob.perform_now order_cycle.id
     expect(ProducerMailer).to have_received(:order_cycle_report).twice
   end
+
+  it "records that mails have been sent for the order cycle" do
+    expect do
+      OrderCycleNotificationJob.perform_now(order_cycle.id)
+    end.to change{ order_cycle.reload.mails_sent? }.from(false).to(true)
+  end
 end

spec/models/order_cycle_spec.rb

@@ -373,7 +373,7 @@ describe OrderCycle do
     oc = create(:simple_order_cycle,
                 coordinator_fees: [create(:enterprise_fee, enterprise: coordinator)],
                 preferred_product_selection_from_coordinator_inventory_only: true,
-                automatic_notifications: true)
+                automatic_notifications: true, processed_at: Time.zone.now, mails_sent: true)
     ex1 = create(:exchange, order_cycle: oc)
     ex2 = create(:exchange, order_cycle: oc)
     oc.clone!
@@ -385,6 +385,8 @@ describe OrderCycle do
     expect(occ.coordinator).not_to be_nil
     expect(occ.preferred_product_selection_from_coordinator_inventory_only).to be true
     expect(occ.automatic_notifications).to eq(oc.automatic_notifications)
+    expect(occ.processed_at).to eq(nil)
+    expect(occ.mails_sent).to eq(nil)
     expect(occ.coordinator).to eq(oc.coordinator)
 
     expect(occ.coordinator_fee_ids).not_to be_empty

spec/system/admin/order_cycles/simple_spec.rb

@@ -272,36 +272,51 @@ describe '
         expect(exchange.tag_list).to eq(["wholesale"])
       end
 
-      it "editing an order cycle" do
-        oc = create(:simple_order_cycle,
-                    suppliers: [supplier_managed, supplier_permitted, supplier_unmanaged], coordinator: distributor_managed, distributors: [distributor_managed, distributor_permitted, distributor_unmanaged], name: 'Order Cycle 1' )
-        distributor_managed.update_attribute(:enable_subscriptions, true)
+      context "editing an order cycle" do
+        let(:oc) do
+          create(:simple_order_cycle, suppliers: [supplier_managed, supplier_permitted, supplier_unmanaged],
+                                      coordinator: distributor_managed,
+                                      distributors: [distributor_managed, distributor_permitted, distributor_unmanaged],
+                                      name: 'Order Cycle 1' )
+        end
 
-        visit edit_admin_order_cycle_path(oc)
+        before { distributor_managed.update_attribute(:enable_subscriptions, true) }
 
-        expect(page).to have_field 'order_cycle_name', with: oc.name
-        select2_select schedule.name, from: 'schedule_ids'
-        expect(page).not_to have_select2 'schedule_ids',
-                                         with_options: [schedule_of_other_managed_distributor.name]
+        it "shows if notifications have been sent" do
+          oc.update_columns mails_sent: true
 
-        click_button 'Save and Next'
+          visit edit_admin_order_cycle_path(oc)
 
-        # When I remove all incoming exchanges
-        page.find("tr.supplier-#{supplier_managed.id} a.remove-exchange").click
-        page.find("tr.supplier-#{supplier_permitted.id} a.remove-exchange").click
-        click_button 'Save and Next'
+          expect(page).to have_content I18n.t("admin.order_cycles.edit.re_notify_producers").upcase
+        end
 
-        # And I remove all outgoing exchanges
-        page.find("tr.distributor-#{distributor_managed.id} a.remove-exchange").click
-        page.find("tr.distributor-#{distributor_permitted.id} a.remove-exchange").click
-        click_button 'Save and Back to List'
-        expect(page).to have_input "oc#{oc.id}[name]", value: oc.name
+        it "allows removing exchanges" do
+          visit edit_admin_order_cycle_path(oc)
 
-        oc.reload
-        expect(oc.suppliers).to eq([supplier_unmanaged])
-        expect(oc.coordinator).to eq(distributor_managed)
-        expect(oc.distributors).to eq([distributor_unmanaged])
-        expect(oc.schedules).to eq([schedule])
+          expect(page).to have_field 'order_cycle_name', with: oc.name
+          select2_select schedule.name, from: 'schedule_ids'
+          expect(page).not_to have_select2 'schedule_ids',
+                                           with_options: [schedule_of_other_managed_distributor.name]
+
+          click_button 'Save and Next'
+
+          # When I remove all incoming exchanges
+          page.find("tr.supplier-#{supplier_managed.id} a.remove-exchange").click
+          page.find("tr.supplier-#{supplier_permitted.id} a.remove-exchange").click
+          click_button 'Save and Next'
+
+          # And I remove all outgoing exchanges
+          page.find("tr.distributor-#{distributor_managed.id} a.remove-exchange").click
+          page.find("tr.distributor-#{distributor_permitted.id} a.remove-exchange").click
+          click_button 'Save and Back to List'
+          expect(page).to have_input "oc#{oc.id}[name]", value: oc.name
+
+          oc.reload
+          expect(oc.suppliers).to eq([supplier_unmanaged])
+          expect(oc.coordinator).to eq(distributor_managed)
+          expect(oc.distributors).to eq([distributor_unmanaged])
+          expect(oc.schedules).to eq([schedule])
+        end
       end
 
       it "cloning an order cycle" do