0
@@ -127,7 +127,7 @@ class Article < Content
0
   end
0
 
0
   def set_default_filter_from(filtered_object)
0
-    set_filter_from(filtered_object) if filter.blank?
0
+    set_filter_from(filtered_object) if filter.nil?
0
   end
0
 
0
   def set_default_filter!

0
@@ -52,34 +52,6 @@ class ArticleTest < Test::Unit::TestCase
0
     assert_equal 'textile_filter', a.filter
0
   end
0
 
0
-  def test_should_modify_filter
0
-    assert_equal 'textile_filter', contents(:welcome).filter
0
-    
0
-    contents(:welcome).filter = 'markdown_filter'
0
-    contents(:welcome).save
0
-
0
-    assert_equal 'markdown_filter', contents(:welcome).reload.filter
0
-  end
0
-
0
-  def test_should_modify_filter_and_leave_comments_alone
0
-    assert_equal 'textile_filter', contents(:welcome_comment).filter
0
-    old_time = contents(:welcome_comment)
0
-    
0
-    contents(:welcome).filter = 'markdown_filter'
0
-    contents(:welcome).save
0
-
0
-    assert_equal 'textile_filter', contents(:welcome_comment).reload.filter
0
-  end
0
-
0
-  def test_should_modify_filter_and_not_modify_comment_timestamps
0
-    old_time = contents(:welcome_comment).updated_at
0
-    
0
-    contents(:welcome).filter = 'markdown_filter'
0
-    contents(:welcome).save
0
-
0
-    assert_equal old_time, contents(:welcome_comment).reload.updated_at
0
-  end
0
-
0
   def test_should_cache_bluecloth
0
     a = Article.create :title => 'simple Title', :user => users(:arthur), :body => "# bar\n\nfoo", :filter => 'markdown_filter', :site_id => 1
0
     assert_equal "<h1>bar</h1>\n\n<p>foo</p>", a.body_html
0
@@ -174,3 +146,32 @@ class ArticleTest < Test::Unit::TestCase
0
       end
0
     end
0
 end
0
+
0
+class ArticleFilterEditTest < Test::Unit::TestCase
0
+  fixtures :contents, :users, :sections, :sites
0
+
0
+  def setup
0
+    @old_time = contents(:welcome_comment).updated_at
0
+    assert_equal 'textile_filter', contents(:welcome).filter
0
+    contents(:welcome).filter = 'markdown_filter'
0
+    contents(:welcome).save!
0
+  end
0
+
0
+  def test_should_clear_filter
0
+    contents(:welcome).filter = ''
0
+    contents(:welcome).save!
0
+    assert_equal '', contents(:welcome).filter
0
+  end
0
+
0
+  def test_should_modify_filter
0
+    assert_equal 'markdown_filter', contents(:welcome).reload.filter
0
+  end
0
+
0
+  def test_should_modify_filter_and_leave_comments_alone
0
+    assert_equal 'textile_filter', contents(:welcome_comment).reload.filter
0
+  end
0
+
0
+  def test_should_modify_filter_and_not_modify_comment_timestamps
0
+    assert_equal @old_time, contents(:welcome_comment).reload.updated_at
0
+  end
0
+end