Only send org admin alerts if the feature flag is enabled

Author: stephencdaly

app/services/org_admin_alerts_service.rb

@@ -6,12 +6,15 @@ def initialize(form:, current_user:)
   end
 
   def form_made_live
+    return unless feature_enabled?
+
     @org_admins.each do |org_admin_user|
       form_made_live_email(to_email: org_admin_user.email).deliver_now
     end
   end
 
   def new_draft_form_created
+    return unless feature_enabled?
     return unless @form.group.active?
 
     @org_admins.each do |org_admin_user|
@@ -20,6 +23,8 @@ def new_draft_form_created
   end
 
   def draft_of_existing_form_created
+    return unless feature_enabled?
+
     @org_admins.each do |org_admin_user|
       draft_of_existing_form_created_email(to_email: org_admin_user.email).deliver_now
     end
@@ -74,4 +79,8 @@ def draft_of_existing_form_created_email(to_email:)
   def copied_from_form
     Form.find_by(id: @form.copied_from_id)
   end
+
+  def feature_enabled?
+    FeatureService.enabled?(:org_admin_alerts_enabled)
+  end
 end

spec/requests/forms/copy_controller_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Forms::CopyController, type: :request do
+RSpec.describe Forms::CopyController, :feature_org_admin_alerts_enabled, type: :request do
   let(:id) { form.id }
   let(:form) { create(:form) }
 
@@ -83,7 +83,7 @@
         expect(response).to render_template(:confirm)
       end
 
-      it "does not send an email to the organisation admins", :feature_org_admin_alerts_enabled do
+      it "does not send an email to the organisation admins" do
         post create_copy_form_path(id), params: { forms_copy_input: { name: "", tag: "draft" } }
         expect(ActionMailer::Base.deliveries.count).to eq(0)
       end

spec/requests/forms/make_live_controller_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Forms::MakeLiveController, type: :request do
+RSpec.describe Forms::MakeLiveController, :feature_org_admin_alerts_enabled, type: :request do
   let(:user) { build :user, organisation: }
   let(:form) { create(:form, :ready_for_live) }
   let(:id) { form.id }

spec/requests/forms/unarchive_controller_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Forms::UnarchiveController, type: :request do
+RSpec.describe Forms::UnarchiveController, :feature_org_admin_alerts_enabled, type: :request do
   let(:user) { standard_user }
 
   let(:form) { create(:form, :archived) }

spec/requests/forms_controller_spec.rb

@@ -12,7 +12,7 @@
     login_as user
   end
 
-  describe "#alert_org_admins_if_draft_created" do
+  describe "#alert_org_admins_if_draft_created", :feature_org_admin_alerts_enabled do
     before do
       # Adding a new question loads in the form again from the database during creation. Post to this route to test that
       # this triggers an alert email for the status change even though the Form model loaded in by the controller isn't

spec/requests/group_forms_controller_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe "/groups/:group_id/forms", type: :request do
+RSpec.describe "/groups/:group_id/forms", :feature_org_admin_alerts_enabled, type: :request do
   let(:group) { create :group, organisation:, status: :active }
   let(:organisation) { test_org }
   let(:nonexistent_group) { "foobar" }
@@ -161,7 +161,7 @@
         expect(response.body).to include I18n.t("error_summary.heading")
       end
 
-      it "does not send an email to the organisation admins", :feature_org_admin_alerts_enabled do
+      it "does not send an email to the organisation admins" do
         post group_forms_url(group), params: { forms_name_input: invalid_attributes }
         expect(ActionMailer::Base.deliveries.count).to eq(0)
       end

spec/services/org_admin_alerts_service_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe OrgAdminAlertsService do
+RSpec.describe OrgAdminAlertsService, :feature_org_admin_alerts_enabled do
   subject(:service) { described_class.new(form:, current_user:) }
 
   let(:organisation) { create(:organisation, :with_signed_mou) }
@@ -156,6 +156,15 @@
         expect(ActionMailer::Base.deliveries.size).to eq(0)
       end
     end
+
+    context "when the feature is disabled", feature_org_admin_alerts_enabled: false do
+      let(:previous_state) { :draft }
+
+      it "does not send any emails" do
+        service.form_made_live
+        expect(ActionMailer::Base.deliveries.size).to eq(0)
+      end
+    end
   end
 
   describe "#new_draft_form_created" do
@@ -228,6 +237,13 @@
         expect(ActionMailer::Base.deliveries.size).to eq(0)
       end
     end
+
+    context "when the feature is disabled", feature_org_admin_alerts_enabled: false do
+      it "does not send any emails" do
+        service.new_draft_form_created
+        expect(ActionMailer::Base.deliveries.size).to eq(0)
+      end
+    end
   end
 
   describe "#draft_of_existing_form_created" do
@@ -297,5 +313,14 @@
         expect(ActionMailer::Base.deliveries.size).to eq(0)
       end
     end
+
+    context "when the feature is disabled", feature_org_admin_alerts_enabled: false do
+      let(:form) { create(:form, :live_with_draft) }
+
+      it "does not send any emails" do
+        service.draft_of_existing_form_created
+        expect(ActionMailer::Base.deliveries.size).to eq(0)
+      end
+    end
   end
 end