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

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

diff --git a/test/system/diary_entry_test.rb b/test/system/diary_entry_test.rb
index d60812e4ccf277fb7bacdf88045118f6d318252b..ba091c538465d8dcf6ac7471665d49516b7f925a 100644 (file)
--- a/test/system/diary_entry_test.rb
+++ b/test/system/diary_entry_test.rb
@@ -3,6 +3,9 @@ require "application_system_test_case"
 class DiaryEntrySystemTest < ApplicationSystemTestCase
   def setup
     create(:language, :code => "en")
 class DiaryEntrySystemTest < ApplicationSystemTestCase
   def setup
     create(:language, :code => "en")

+    create(:language, :code => "pt", :english_name => "Portuguese", :native_name => "Português")
+    create(:language, :code => "pt-BR", :english_name => "Brazilian Portuguese", :native_name => "Português do Brasil")
+    create(:language, :code => "ru", :english_name => "Russian", :native_name => "Русский")

     @diary_entry = create(:diary_entry)
   end
 
     @diary_entry = create(:diary_entry)
   end
 


@@ -12,7 +15,7 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase
 
     click_on "Send a message to the author"
 
 
     click_on "Send a message to the author"
 

-    assert page.has_content? "Send a new message"
+    assert_content "Send a new message"

     assert_equal "Re: #{@diary_entry.title}", page.find_field("Subject").value
   end
 
     assert_equal "Re: #{@diary_entry.title}", page.find_field("Subject").value
   end
 


@@ -22,7 +25,7 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase
     sign_in_as(create(:user))
     visit diary_entries_path
 
     sign_in_as(create(:user))
     visit diary_entries_path
 

-    assert_not page.has_content? @deleted_entry.title
+    assert_no_content @deleted_entry.title

   end
 
   test "deleted diary entries should be shown to administrators for review" do
   end
 
   test "deleted diary entries should be shown to administrators for review" do


@@ -31,17 +34,17 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase
     sign_in_as(create(:administrator_user))
     visit diary_entries_path
 
     sign_in_as(create(:administrator_user))
     visit diary_entries_path
 

-    assert page.has_content? @deleted_entry.title
+    assert_content @deleted_entry.title

   end
 
   test "deleted diary entries should not be shown to admins when the user is also deleted" do
   end
 
   test "deleted diary entries should not be shown to admins when the user is also deleted" do

-    @deleted_user = create(:user, :status => :deleted)
+    @deleted_user = create(:user, :deleted)

     @deleted_entry = create(:diary_entry, :visible => false, :user => @deleted_user)
 
     sign_in_as(create(:administrator_user))
     visit diary_entries_path
 
     @deleted_entry = create(:diary_entry, :visible => false, :user => @deleted_user)
 
     sign_in_as(create(:administrator_user))
     visit diary_entries_path
 

-    assert_not page.has_content? @deleted_entry.title
+    assert_no_content @deleted_entry.title

   end
 
   test "deleted diary comments should be hidden for regular users" do
   end
 
   test "deleted diary comments should be hidden for regular users" do


@@ -50,7 +53,7 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase
     sign_in_as(create(:user))
     visit diary_entry_path(@diary_entry.user, @diary_entry)
 
     sign_in_as(create(:user))
     visit diary_entry_path(@diary_entry.user, @diary_entry)
 

-    assert_not page.has_content? @deleted_comment.body
+    assert_no_content @deleted_comment.body

   end
 
   test "deleted diary comments should be shown to administrators" do
   end
 
   test "deleted diary comments should be shown to administrators" do


@@ -59,6 +62,16 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase
     sign_in_as(create(:administrator_user))
     visit diary_entry_path(@diary_entry.user, @diary_entry)
 
     sign_in_as(create(:administrator_user))
     visit diary_entry_path(@diary_entry.user, @diary_entry)
 

-    assert page.has_content? @deleted_comment.body
+    assert_content @deleted_comment.body
+  end
+
+  test "should have links to preferred languages" do
+    sign_in_as(create(:user, :languages => %w[en-US pt-BR]))
+    visit diary_entries_path
+
+    assert_link "Diary Entries in English", :href => "/diary/en"
+    assert_link "Diary Entries in Brazilian Portuguese", :href => "/diary/pt-BR"
+    assert_link "Diary Entries in Portuguese", :href => "/diary/pt"
+    assert_no_link "Diary Entries in Russian"

   end
 end
   end
 end