5 files changed, 16 insertions, 19 deletions
diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb
index 227919435..202c076ac 100644
--- a/test/functional/calendars_controller_test.rb
+++ b/test/functional/calendars_controller_test.rb
@@ -57,7 +57,7 @@ class CalendarsControllerTest < Redmine::ControllerTest
         ) do
           assert_select 'a.issue[href=?]', '/issues/2', :text => 'Feature request #2'
           assert_select 'span.tip' do
-            assert_select 'img[class="gravatar"]'
+            assert_select 'img[class="gravatar avatar"]'
           end
           assert_select 'input[name=?][type=?][value=?]', 'ids[]', 'checkbox', '2'
         end
diff --git a/test/functional/gantts_controller_test.rb b/test/functional/gantts_controller_test.rb
index daba816b8..73a74ba65 100644
--- a/test/functional/gantts_controller_test.rb
+++ b/test/functional/gantts_controller_test.rb
@@ -58,7 +58,7 @@ class GanttsControllerTest < Redmine::ControllerTest
     # Assert context menu on issues subject and gantt bar
     assert_select 'div[class=?]', 'issue-subject hascontextmenu'
     assert_select 'div.tooltip.hascontextmenu' do
-      assert_select 'img[class="gravatar"]'
+      assert_select 'img[class="gravatar avatar"]'
     end
     assert_select "form[data-cm-url=?]", '/issues/context_menu'
 
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index d19c09f33..4b9b44537 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -2816,7 +2816,7 @@ class IssuesControllerTest < Redmine::ControllerTest
     assert_select 'h3', {text: /Watchers \(\d*\)/, count: 0}
   end
 
-  def test_show_should_display_watchers_with_gravatars
+  def test_show_should_display_watchers_with_avatars
     @request.session[:user_id] = 2
     issue = Issue.find(1)
     issue.add_watcher User.find(2)
@@ -2824,9 +2824,10 @@ class IssuesControllerTest < Redmine::ControllerTest
     with_settings :gravatar_enabled => '1' do
       get(:show, :params => {:id => 1})
     end
+
     assert_select 'div#watchers ul' do
       assert_select 'li.user-2' do
-        assert_select 'img.gravatar[title=?]', 'John Smith'
+        assert_select '.avatar[title=?]', 'John Smith'
         assert_select 'a[href="/users/2"]'
         assert_select 'a[class*=delete]'
       end
@@ -8786,31 +8787,27 @@ class IssuesControllerTest < Redmine::ControllerTest
     assert_select 'a[href=?][onclick=?]', "/issues/1", "", :text => 'Cancel'
   end
 
-  def test_show_should_display_author_gravatar_only_when_not_assigned
+  def test_show_should_display_author_avatar_only_when_not_assigned
     issue = Issue.find(1)
     assert_nil issue.assigned_to_id
     @request.session[:user_id] = 1
 
-    with_settings :gravatar_enabled => '1' do
-      get :show, :params => {:id => issue.id}
-      assert_select 'div.gravatar-with-child' do
-        assert_select 'img.gravatar', 1
-      end
+    get :show, :params => {:id => issue.id}
+    assert_select 'div.avatar-with-child' do
+      assert_select '.avatar', 1
     end
   end
 
-  def test_show_should_display_author_and_assignee_gravatars_when_assigned
+  def test_show_should_display_author_and_assignee_avatars_when_assigned
     issue = Issue.find(1)
     issue.assigned_to_id = 2
     issue.save!
     @request.session[:user_id] = 1
 
-    with_settings :gravatar_enabled => '1' do
-      get :show, :params => {:id => issue.id}
-      assert_select 'div.gravatar-with-child' do
-        assert_select 'img.gravatar', 2
-        assert_select 'img.gravatar-child', 1
-      end
+    get :show, :params => {:id => issue.id}
+    assert_select 'div.avatar-with-child' do
+      assert_select '.avatar', 2
+      assert_select '.avatar-child', 1
     end
   end
 
diff --git a/test/functional/messages_controller_test.rb b/test/functional/messages_controller_test.rb
index 997b2263a..cec58ff5f 100644
--- a/test/functional/messages_controller_test.rb
+++ b/test/functional/messages_controller_test.rb
@@ -28,7 +28,7 @@ class MessagesControllerTest < Redmine::ControllerTest
     get(:show, :params => {:board_id => 1, :id => 1})
     assert_response :success
 
-    assert_select 'h2', :text => 'First post'
+    assert_select 'h2', :text => "RAFirst post"
   end
 
   def test_show_should_contain_reply_field_tags_for_quoting
diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb
index 536814c9d..686fada25 100644
--- a/test/functional/news_controller_test.rb
+++ b/test/functional/news_controller_test.rb
@@ -75,7 +75,7 @@ class NewsControllerTest < Redmine::ControllerTest
     get(:show, :params => {:id => 1})
     assert_response :success
     assert_select 'p.breadcrumb a[href=?]', '/projects/ecookbook/news', :text => 'News'
-    assert_select 'h2', :text => 'eCookbook first release !'
+    assert_select 'h2', :text => 'JS eCookbook first release !'
   end
 
   def test_show_should_show_attachments