Merged rails-5.1 branch (#23630).

git-svn-id: http://svn.redmine.org/redmine/trunk@16859 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2017-07-23 11:26:04 +00:00
parent 41bb302594
commit d74f0bfd5c
381 changed files with 598 additions and 640 deletions

View File

@@ -6426,7 +6426,7 @@ class IssuesControllerTest < Redmine::ControllerTest
@request.session[:user_id] = 1
with_settings :gravatar_enabled => '1' do
get :show, :id => issue.id
get :show, :params => {:id => issue.id}
assert_select 'div.gravatar-with-child' do
assert_select 'img.gravatar', 1
end
@@ -6440,7 +6440,7 @@ class IssuesControllerTest < Redmine::ControllerTest
@request.session[:user_id] = 1
with_settings :gravatar_enabled => '1' do
get :show, :id => issue.id
get :show, :params => {:id => issue.id}
assert_select 'div.gravatar-with-child' do
assert_select 'img.gravatar', 2
assert_select 'img.gravatar-child', 1