From 6a139c73ac1ba70dcb9b7681fbedbb6a8945d74d Mon Sep 17 00:00:00 2001
From: Molly Struve <mollylbs@gmail.com>
Date: Sun, 7 Jun 2020 11:36:05 -0500
Subject: [PATCH] Flaky Spec Fixes: User Block and Sitemap Specs (#8314)

---
 spec/requests/sitemaps_spec.rb    | 4 ++--
 spec/requests/user_blocks_spec.rb | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/spec/requests/sitemaps_spec.rb b/spec/requests/sitemaps_spec.rb
index b2d835c86..218b409d2 100644
--- a/spec/requests/sitemaps_spec.rb
+++ b/spec/requests/sitemaps_spec.rb
@@ -27,8 +27,8 @@ RSpec.describe "Sitemaps", type: :request do
 
     it "sends a surrogate key (for Fastly's user)" do
       create_list(:article, 4)
-      Article.limit(3).update_all(published_at: 3.months.ago, score: 10)
-      get "/sitemap-#{3.months.ago.strftime('%b-%Y')}.xml"
+      Article.limit(3).update_all(published_at: "2020-03-07T00:27:30Z", score: 10)
+      get "/sitemap-Mar-2020.xml"
       article = Article.first
       expect(response.body).to include("<loc>#{ApplicationConfig['APP_PROTOCOL']}#{ApplicationConfig['APP_DOMAIN']}#{article.path}</loc>")
       expect(response.body).to include("<lastmod>#{article.last_comment_at.strftime('%F')}</lastmod>")
diff --git a/spec/requests/user_blocks_spec.rb b/spec/requests/user_blocks_spec.rb
index 330379449..2609d69af 100644
--- a/spec/requests/user_blocks_spec.rb
+++ b/spec/requests/user_blocks_spec.rb
@@ -83,8 +83,10 @@ RSpec.describe "UserBlock", type: :request do
     end
 
     it "raises ActiveRecord::RecordNotFound error if UserBlock not found" do
+      missing_id = blocked.id
+      blocked.destroy
       expect do
-        delete "/user_blocks/#{blocked.id}", params: { user_block: { blocked_id: blocked.id + 10 } }
+        delete "/user_blocks/#{missing_id}", params: { user_block: { blocked_id: missing_id } }
       end.to raise_error(ActiveRecord::RecordNotFound)
     end