diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-11 12:59:25 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-11 12:59:25 +0300 |
| commit | 7d3bbeeb31731907456e8c4d5640e52e58a921fb (patch) | |
| tree | e6495c453cf449b8aa87845ec818798405323b9f /spec/controllers/projects/avatars_controller_spec.rb | |
| parent | a4f37e1834dbd755981b0ce19617e99b4ea43bb7 (diff) | |
| parent | b38c75b3dc2dc655377a1b4070cb6f5242594dbe (diff) | |
Merge branch 'rs-update-rspec' into 'master'
Update rspec to 3.7
See merge request gitlab-org/gitlab-ce!19449
Diffstat (limited to 'spec/controllers/projects/avatars_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/avatars_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/avatars_controller_spec.rb b/spec/controllers/projects/avatars_controller_spec.rb index 6a41c4d23ea..acfa2730d94 100644 --- a/spec/controllers/projects/avatars_controller_spec.rb +++ b/spec/controllers/projects/avatars_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Projects::AvatarsController do - let(:project) { create(:project, :repository, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) } + let(:project) { create(:project, :repository, avatar: fixture_file_upload("spec/fixtures/dk.png", "image/png")) } let(:user) { create(:user) } before do |