Merge remote-tracking branch 'upstream/pull/2524'

[rails.git] / test / models / diary_entry_test.rb

diff --git a/test/models/diary_entry_test.rb b/test/models/diary_entry_test.rb
index 958ca403fc1ed6e1ff8da9f4dcd33d83b08befef..76e8bbbe02d04432e0b8ad202dd0823a361029fb 100644 (file)
--- a/test/models/diary_entry_test.rb
+++ b/test/models/diary_entry_test.rb
@@ -1,7 +1,10 @@
 require "test_helper"
 
 class DiaryEntryTest < ActiveSupport::TestCase
-  fixtures :users, :languages
+  def setup
+    # Create the default language for diary entries
+    create(:language, :code => "en")
+  end
 
   def test_diary_entry_validations
     diary_entry_valid({})