diff test/unit/wiki_content_test.rb @ 1526:404aa68d4227

Merge from live branch

--- a/test/unit/wiki_content_test.rb	Mon Mar 17 08:57:04 2014 +0000
+++ b/test/unit/wiki_content_test.rb	Thu Sep 11 12:46:20 2014 +0100
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# Copyright (C) 2006-2014  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -48,11 +48,12 @@
     page = WikiPage.new(:wiki => @wiki, :title => "A new page")
     page.content = WikiContent.new(:text => "Content text", :author => User.find(1), :comments => "My comment")
 
-    with_settings :notified_events => %w(wiki_content_added) do
+    with_settings :default_language => 'en', :notified_events => %w(wiki_content_added) do
       assert page.save
     end
 
     assert_equal 1, ActionMailer::Base.deliveries.size
+    assert_include 'wiki page has been added', mail_body(ActionMailer::Base.deliveries.last)
   end
 
   def test_update_should_be_versioned
@@ -66,7 +67,7 @@
     assert_equal version_count+1, content.version
     assert_equal version_count+1, content.versions.length
 
-    version = WikiContent::Version.first(:order => 'id DESC')
+    version = WikiContent::Version.order('id DESC').first
     assert_equal @page.id, version.page_id
     assert_equal '', version.compression
     assert_equal "My new content", version.data
@@ -82,7 +83,7 @@
       end
     end
 
-    version = WikiContent::Version.first(:order => 'id DESC')
+    version = WikiContent::Version.order('id DESC').first
     assert_equal @page.id, version.page_id
     assert_equal 'gzip', version.compression
     assert_not_equal "My new content", version.data
@@ -99,6 +100,7 @@
     end
 
     assert_equal 1, ActionMailer::Base.deliveries.size
+    assert_include 'wiki page has been updated', mail_body(ActionMailer::Base.deliveries.last)
   end
 
   def test_fetch_history
@@ -115,12 +117,12 @@
     page.reload
     assert_equal 500.kilobyte, page.content.text.size
   end
-  
+
   def test_current_version
     content = WikiContent.find(11)
     assert_equal true, content.current_version?
-    assert_equal true, content.versions.first(:order => 'version DESC').current_version?
-    assert_equal false, content.versions.first(:order => 'version ASC').current_version?
+    assert_equal true, content.versions.order('version DESC').first.current_version?
+    assert_equal false, content.versions.order('version ASC').first.current_version?
   end
 
   def test_previous_for_first_version_should_return_nil