diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-02-24 12:42:31 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-24 13:50:03 -0500 |
| commit | 93e6282657b3c8498a9e705c6b4dc153ce6cade5 (patch) | |
| tree | 2dc63ed5a3dd9e3508668cc9770ab63a5b6fb3b7 /spec/controllers | |
| parent | 0104ab79b3b6c6d532098bb98dc48f724633310f (diff) | |
| download | gitlab-ce-93e6282657b3c8498a9e705c6b4dc153ce6cade5.tar.gz | |
Add `:with_avatar` trait to User factory
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/namespaces_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/profiles/avatars_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/uploads_controller_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/namespaces_controller_spec.rb b/spec/controllers/namespaces_controller_spec.rb index 77436958711..d4a380cc2ee 100644 --- a/spec/controllers/namespaces_controller_spec.rb +++ b/spec/controllers/namespaces_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe NamespacesController do - let!(:user) { create(:user, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) } + let!(:user) { create(:user, :with_avatar) } describe "GET show" do context "when the namespace belongs to a user" do diff --git a/spec/controllers/profiles/avatars_controller_spec.rb b/spec/controllers/profiles/avatars_controller_spec.rb index ad5855df0a4..85dff009bcf 100644 --- a/spec/controllers/profiles/avatars_controller_spec.rb +++ b/spec/controllers/profiles/avatars_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Profiles::AvatarsController do - let(:user) { create(:user, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png")) } + let(:user) { create(:user, :with_avatar) } before do sign_in(user) diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb index af5d043cf02..0d9f4b299bc 100644 --- a/spec/controllers/uploads_controller_spec.rb +++ b/spec/controllers/uploads_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe UploadsController do - let!(:user) { create(:user, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) } + let!(:user) { create(:user, :with_avatar) } describe "GET show" do context "when viewing a user avatar" do |