Merge remote-tracking branch 'openstreetmap/pull/1339'

test/controllers/diary_entry_controller_test.rb

@@ -1,10 +1,15 @@
 require "test_helper"
 
 class DiaryEntryControllerTest < ActionController::TestCase
-  fixtures :users, :user_roles, :languages
+  fixtures :users, :user_roles
 
   include ActionView::Helpers::NumberHelper
 
+  def setup
+    # Create the default language for diary entries
+    create(:language, :code => "en")
+  end
+
   ##
   # test all routes which lead to this controller
   def test_routes
@@ -162,6 +167,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_equal new_language_code, UserPreference.where(:user_id => users(:normal_user).id, :k => "diary.default_language").first.v
 
     new_language_code = "de"
+    create(:language, :code => new_language_code)
 
     # Now try creating a diary entry in a different language
     assert_difference "DiaryEntry.count", 1 do
@@ -472,6 +478,8 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_list_language
+    create(:language, :code => "de")
+    create(:language, :code => "sl")
     diary_entry_en = create(:diary_entry, :language_code => "en")
     diary_entry_en2 = create(:diary_entry, :language_code => "en")
     diary_entry_de = create(:diary_entry, :language_code => "de")
@@ -490,6 +498,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_rss
+    create(:language, :code => "de")
     create(:diary_entry, :language_code => "en")
     create(:diary_entry, :language_code => "en")
     create(:diary_entry, :language_code => "de")
@@ -506,6 +515,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_rss_language
+    create(:language, :code => "de")
     create(:diary_entry, :language_code => "en")
     create(:diary_entry, :language_code => "en")
     create(:diary_entry, :language_code => "de")
@@ -521,6 +531,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   #  end
 
   def test_rss_language_with_no_entries
+    create(:language, :code => "sl")
     create(:diary_entry, :language_code => "en")
 
     get :rss, :language => "sl", :format => :rss

test/factories/languages.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :language do
+    code "en"
+    english_name "English"
+    native_name "English"
+  end
+end

test/fixtures/languages.yml

@@ -1,16 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-en:
-  code: en
-  english_name: English
-  native_name: English
-
-de:
-  code: de
-  english_name: German
-  native_name: Deutsch
-
-sl:
-  code: sl
-  english_name: Slovenian
-  native_name: slovenščina

test/models/diary_comment_test.rb

@@ -1,7 +1,12 @@
 require "test_helper"
 
 class DiaryCommentTest < ActiveSupport::TestCase
-  fixtures :users, :languages
+  fixtures :users
+
+  def setup
+    # Create the default language for diary entries
+    create(:language, :code => "en")
+  end
 
   test "body must be present" do
     comment = build(:diary_comment, :body => "")

test/models/diary_entry_test.rb

@@ -1,7 +1,12 @@
 require "test_helper"
 
 class DiaryEntryTest < ActiveSupport::TestCase
-  fixtures :users, :languages
+  fixtures :users
+
+  def setup
+    # Create the default language for diary entries
+    create(:language, :code => "en")
+  end
 
   def test_diary_entry_validations
     diary_entry_valid({})

test/models/language_test.rb

@@ -2,20 +2,13 @@
 require "test_helper"
 
 class LanguageTest < ActiveSupport::TestCase
-  fixtures :languages
-
-  def test_language_count
-    assert_equal 3, Language.count
-  end
-
   def test_name
-    assert_equal "English (English)", languages(:en).name
-    assert_equal "German (Deutsch)", languages(:de).name
-    assert_equal "Slovenian (slovenščina)", languages(:sl).name
+    create(:language, :code => "sl", :english_name => "Slovenian", :native_name => "slovenščina")
+    assert_equal "Slovenian (slovenščina)", Language.find("sl").name
   end
 
   def test_load
-    assert_equal 3, Language.count
+    assert_equal 0, Language.count
     assert_raise ActiveRecord::RecordNotFound do
       Language.find("zh")
     end

test/models/user_test.rb

@@ -5,7 +5,7 @@ class UserTest < ActiveSupport::TestCase
   include Rails::Dom::Testing::Assertions::SelectorAssertions
 
   api_fixtures
-  fixtures :languages, :user_roles
+  fixtures :user_roles
 
   def test_invalid_with_empty_attributes
     user = User.new
@@ -191,6 +191,10 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_languages
+    create(:language, :code => "en")
+    create(:language, :code => "de")
+    create(:language, :code => "sl")
+
     user = users(:normal_user)
     assert_equal ["en"], user.languages
     user.languages = %w(de fr en)