diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-03-15 13:20:54 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-15 14:55:40 +0100 |
| commit | 1714883107b7b8b8f2ef8c2836acc2866362738e (patch) | |
| tree | 4c79d81c52b932c20d0ddfb467175f39e281faf3 /spec/controllers | |
| parent | ea7d062fa60e3e622288237fc66a815348bbcf36 (diff) | |
| download | gitlab-ce-1714883107b7b8b8f2ef8c2836acc2866362738e.tar.gz | |
Revert "Merge branch 'avatar-cropping' into 'master'
"revert-avatar-cropping
This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing
changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282.
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 d4a380cc2ee..77436958711 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, :with_avatar) } + let!(:user) { create(:user, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) } 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 85dff009bcf..ad5855df0a4 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, :with_avatar) } + let(:user) { create(:user, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png")) } before do sign_in(user) diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb index 0d9f4b299bc..af5d043cf02 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, :with_avatar) } + let!(:user) { create(:user, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) } describe "GET show" do context "when viewing a user avatar" do |