Merge pull request #2375 from alphagov/fix-prompt-for-email-alerts-rake

[WHIT-1876] Fix prompt for email alerts rake

Author: lauraghiorghisor-tw

lib/tasks/email_alerts.rake

@@ -10,9 +10,8 @@ namespace :email_alerts do
     abort "Please provide an edition ID, e.g. rake #{task.name}[fedc13e231ccd7d63e1abf65]" unless args[:edition_id]
 
     edition = TravelAdviceEdition.find(args[:edition_id])
-    puts "Sending an email alert for #{edition.title}"
-    unless shell.yes?("Proceed with sending this email alert? (yes/no)")
-      shell.say_error "Aborted"
+    unless shell.yes?("Proceed with sending an email alert for #{edition.title}? (yes/no)")
+      shell.say "Aborted"
       next
     end
     EmailAlertApiNotifier.send_alert(edition)

lib/tasks/publishing_api.rake

@@ -10,7 +10,7 @@ namespace :publishing_api do
     presenter = IndexPresenter.new
 
     unless shell.yes?("You are about to publish travel advice index content item. Would you like to proceed? (yes/no)")
-      shell.say_error("Aborted")
+      shell.say "Aborted"
       next
     end
     GdsApi.publishing_api.put_content(presenter.content_id, presenter.render_for_publishing_api)
@@ -24,7 +24,7 @@ namespace :publishing_api do
     alternative_path = "/foreign-travel-advice/#{args[:new_country_slug]}"
 
     unless shell.yes?("You are about to unpublish a published travel advice page and email signup page for #{country} and redirect to #{alternative_path}")
-      shell.say_error("Aborted")
+      shell.say "Aborted"
       next
     end
     GdsApi.publishing_api.unpublish(country.email_signup_content_id, type: "redirect", alternative_path: "#{alternative_path}/email-signup")
@@ -42,7 +42,7 @@ namespace :publishing_api do
   desc "republish all published editions to publishing-api"
   task republish_editions: :environment do
     unless shell.yes?("You are about to republish all travel advice content items. Would you like to proceed? (yes/no)")
-      shell.say_error("Aborted")
+      shell.say "Aborted"
       next
     end
     TravelAdviceEdition.published.each do |edition|
@@ -86,7 +86,7 @@ namespace :publishing_api do
   desc "republish a published edition to publishing-api for a country"
   task :republish_edition, [:country_slug] => :environment do |_task, args|
     unless shell.yes?("You are about to republish published travel advice for #{args[:country_slug]}. Would you like to proceed? (yes/no)")
-      shell.say_error("Aborted")
+      shell.say "Aborted"
       next
     end
     edition         = TravelAdviceEdition.published.find_by(country_slug: args[:country_slug])
@@ -113,7 +113,7 @@ namespace :publishing_api do
       presenter = EmailAlertSignup::IndexPresenter.new
 
       unless shell.yes?("You are about to republish email sign up pages for travel advice index. Would you like to proceed? (yes/no)")
-        shell.say_error("Aborted")
+        shell.say "Aborted"
         next
       end
       GdsApi.publishing_api.put_content(presenter.content_id, presenter.content_payload)
@@ -123,7 +123,7 @@ namespace :publishing_api do
     desc "republish email signup content item for all countries"
     task editions: :environment do
       unless shell.yes?("You are about to republish email signup pages for all countries. Would you like to proceed? (yes/no)")
-        shell.say_error("Aborted")
+        shell.say "Aborted"
         next
       end
       TravelAdviceEdition.published.each do |edition|
@@ -144,7 +144,7 @@ namespace :publishing_api do
       presenter = EmailAlertSignup::EditionPresenter.new(edition)
 
       unless shell.yes?("You are about to republish email signup for #{args[:country_slug]}. Would you like to proceed? (yes/no)")
-        shell.say_error("Aborted")
+        shell.say "Aborted"
         next
       end
       GdsApi.publishing_api.put_content(presenter.content_id, presenter.content_payload)

spec/tasks/publishing_api_rake_spec.rb

@@ -49,13 +49,6 @@
         ),
       )
     end
-
-    it "aborts when the user declines the confirmation prompt" do
-      allow_any_instance_of(Thor::Shell::Basic).to receive(:yes?).and_return(false)
-
-      expect_any_instance_of(Thor::Shell::Basic).to receive(:say_error).with("Aborted")
-      task.invoke
-    end
   end
 
   describe "republish_edition" do
@@ -91,11 +84,6 @@
       expect(a_request(:post, GdsApi::TestHelpers::PublishingApi::PUBLISHING_API_V2_ENDPOINT + "/content/#{country.content_id}/publish"))
         .not_to have_been_made
     end
-    it "aborts when the user declines the confirmation prompt." do
-      allow_any_instance_of(Thor::Shell::Basic).to receive(:yes?).and_return(false)
-      expect_any_instance_of(Thor::Shell::Basic).to receive(:say_error).with("Aborted")
-      task.invoke(country.slug)
-    end
   end
 
   describe "republish_editions" do
@@ -157,10 +145,5 @@
 
       assert_publishing_api_publish("b5c8e64b-3461-4447-9144-1588e4a84fe6", "update_type" => "republish")
     end
-    it "aborts when the user declines the confirmation prompt." do
-      allow_any_instance_of(Thor::Shell::Basic).to receive(:yes?).and_return(false)
-      expect_any_instance_of(Thor::Shell::Basic).to receive(:say_error).with("Aborted")
-      task.invoke
-    end
   end
 end