[#537] version of new WikiContents should be 0

bf14f352 · Gregor Schmidt · Holger Just · a35d61bf · bf14f352 · bf14f352
Commit bf14f352 authored Jul 25, 2011 by Gregor Schmidt Committed by Holger Just Jul 25, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

wiki_content.rb app/models/wiki_content.rb +1 -6

wiki_content_test.rb test/unit/wiki_content_test.rb +7 -0

No files found.
--- a/app/models/wiki_content.rb
+++ b/app/models/wiki_content.rb
@@ -59,12 +59,7 @@ class WikiContent < ActiveRecord::Base
  end

  def version
-    unless last_journal
-      # FIXME: This is code that caters for a case that should never happen in the normal code paths!!
-      create_journal
-      last_journal.update_attribute(:created_at, updated_on)
-    end
-    last_journal.version
+    new_record? ? 0 : last_journal.version
  end

  private

--- a/test/unit/wiki_content_test.rb
+++ b/test/unit/wiki_content_test.rb
@@ -80,4 +80,11 @@ class WikiContentTest < ActiveSupport::TestCase
    page.reload
    assert_equal 500.kilobyte, page.content.text.size
  end
+
+  test "new WikiContent is version 0" do
+    page = WikiPage.new(:wiki => @wiki, :title => "Page")
+    page.content = WikiContent.new(:text => "Content text", :author => User.find(1), :comments => "My comment")
+
+    assert_equal 0, page.content.version
+  end
 end