diff options
author | Valery Sizov <valery@gitlab.com> | 2015-11-30 19:49:09 +0300 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2015-11-30 19:49:09 +0300 |
commit | e0131c5d07f22681e4118473dbfa0dd93df12b28 (patch) | |
tree | 7868f5342d9ef59b598d5a72d8615573e3cd9fb3 /spec/helpers | |
parent | a8e05cec000f3d2b17b966115c9d7b69629498db (diff) | |
parent | f1504e1ad52df7aec241b93d0d015da13ddce5a9 (diff) |
Merge branch 'rails_update_to_4_2' into 'master'
Rails update to 4.2.4
https://gitlab.com/gitlab-org/gitlab-ce/issues/2694
See merge request !1902
Diffstat (limited to 'spec/helpers')
-rw-r--r-- | spec/helpers/application_helper_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 670be75f763..0a64b70d6a6 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -59,7 +59,7 @@ describe ApplicationHelper do avatar_url = "http://localhost/uploads/project/avatar/#{project.id}/banana_sample.gif" expect(helper.project_icon("#{project.namespace.to_param}/#{project.to_param}").to_s). - to eq "<img alt=\"Banana sample\" src=\"#{avatar_url}\" />" + to eq "<img src=\"#{avatar_url}\" alt=\"Banana sample\" />" end it 'should give uploaded icon when present' do |