Merge branch 'json-gem-upgrade-fix-1' into 'master'

Cover sent_notification position JSON parsing

See merge request gitlab-org/gitlab!31718

app/models/sent_notification.rb

@@ -82,6 +82,8 @@ class SentNotification < ApplicationRecord
     if new_position.is_a?(Hash)
       new_position = new_position.with_indifferent_access
       new_position = Gitlab::Diff::Position.new(new_position)
+    else
+      new_position = nil
     end
 
     super(new_position)

spec/models/sent_notification_spec.rb

@@ -326,4 +326,26 @@ describe SentNotification do
       end
     end
   end
+
+  describe "#position=" do
+    subject { build(:sent_notification, noteable: create(:issue)) }
+
+    it "doesn't accept non-hash JSON passed as a string" do
+      subject.position = "true"
+
+      expect(subject.attributes_before_type_cast["position"]).to be(nil)
+    end
+
+    it "does accept a position hash as a string" do
+      subject.position = '{ "base_sha": "test" }'
+
+      expect(subject.position.base_sha).to eq("test")
+    end
+
+    it "does accept a hash" do
+      subject.position = { "base_sha" => "test" }
+
+      expect(subject.position.base_sha).to eq("test")
+    end
+  end
 end