From a401b1f5707474090e4dcd8a1d94b99f959736c0 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Fri, 26 May 2017 15:02:13 -0500
Subject: [PATCH] posts: fix nil source tests; fix source:none metatag.

---
 app/models/post.rb     | 2 +-
 test/unit/post_test.rb | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/models/post.rb b/app/models/post.rb
index 0edeb5ff5..10c3a863b 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -818,7 +818,7 @@ class Post < ActiveRecord::Base
           end
 
         when /^source:none$/i
-          self.source = nil
+          self.source = ""
 
         when /^source:"(.*)"$/i
           self.source = $1
diff --git a/test/unit/post_test.rb b/test/unit/post_test.rb
index 8563d0b71..f2785ba1b 100644
--- a/test/unit/post_test.rb
+++ b/test/unit/post_test.rb
@@ -848,7 +848,7 @@ class PostTest < ActiveSupport::TestCase
           should "clear the source with source:none" do
             @post.update(:source => "foobar")
             @post.update(:tag_string => "source:none")
-            assert_nil(@post.source)
+            assert_equal("", @post.source)
           end
 
           should "set the pixiv id with source:https://img18.pixiv.net/img/evazion/14901720.png" do
@@ -1204,7 +1204,7 @@ class PostTest < ActiveSupport::TestCase
         end
 
         should "merge any parent, source, and rating changes that were made after loading the initial set" do
-          post = FactoryGirl.create(:post, :parent => nil, :source => nil, :rating => "q")
+          post = FactoryGirl.create(:post, :parent => nil, :source => "", :rating => "q")
           parent_post = FactoryGirl.create(:post)
 
           # user a changes rating to safe, adds parent
@@ -2349,7 +2349,7 @@ class PostTest < ActiveSupport::TestCase
     context "a post that has been updated" do
       setup do
         PostArchive.sqs_service.stubs(:merge?).returns(false)
-        @post = FactoryGirl.create(:post, :rating => "q", :tag_string => "aaa", :source => nil)
+        @post = FactoryGirl.create(:post, :rating => "q", :tag_string => "aaa", :source => "")
         @post.update_attributes(:tag_string => "aaa bbb ccc ddd")
         @post.update_attributes(:tag_string => "bbb xxx yyy", :source => "xyz")
         @post.update_attributes(:tag_string => "bbb mmm yyy", :source => "abc")
@@ -2362,7 +2362,7 @@ class PostTest < ActiveSupport::TestCase
 
         should "correctly revert all fields" do
           assert_equal("aaa bbb ccc ddd", @post.tag_string)
-          assert_nil(@post.source)
+          assert_equal("", @post.source)
           assert_equal("q", @post.rating)
         end
       end