From 0917fc2f1964430a7e471ac56f10b2123a060c3c Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 10 Jan 2016 19:05:54 +0100
Subject: [PATCH] allow photo.status_message_guid to be nil

---
 .../validators/photo_validator.rb                |  2 +-
 .../validators/photo_validator_spec.rb           | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/diaspora_federation/validators/photo_validator.rb b/lib/diaspora_federation/validators/photo_validator.rb
index fab7d3b..30a86df 100644
--- a/lib/diaspora_federation/validators/photo_validator.rb
+++ b/lib/diaspora_federation/validators/photo_validator.rb
@@ -14,7 +14,7 @@ module DiasporaFederation
 
       rule :remote_photo_name, :not_empty
 
-      rule :status_message_guid, :guid
+      rule :status_message_guid, guid: {nilable: true}
 
       rule :height, :numeric
 
diff --git a/spec/lib/diaspora_federation/validators/photo_validator_spec.rb b/spec/lib/diaspora_federation/validators/photo_validator_spec.rb
index a978c0c..f96845c 100644
--- a/spec/lib/diaspora_federation/validators/photo_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/photo_validator_spec.rb
@@ -9,11 +9,17 @@ module DiasporaFederation
       let(:mandatory) { true }
     end
 
-    %i(guid status_message_guid).each do |prop|
-      describe "##{prop}" do
-        it_behaves_like "a guid validator" do
-          let(:property) { prop }
-        end
+    describe "#guid" do
+      it_behaves_like "a guid validator" do
+        let(:property) { :guid }
+      end
+    end
+
+    describe "#status_message_guid" do
+      it_behaves_like "a property with a value validation/restriction" do
+        let(:property) { :status_message_guid }
+        let(:wrong_values) { ["aaaaaa", "zzz+-#*$$", ""] }
+        let(:correct_values) { ["1234567890ABCDefgh_ijkl-mnopQR@example.com:3000", nil] }
       end
     end