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/models | |
| 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/models')
| -rw-r--r-- | spec/models/user_spec.rb | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 909b6796591..6290ab3ebec 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -174,32 +174,6 @@ describe User, models: true do end end end - - describe 'avatar' do - it 'only validates when avatar is present and changed' do - user = build(:user, :with_avatar) - - user.avatar_crop_x = nil - user.avatar_crop_y = nil - user.avatar_crop_size = nil - - expect(user).not_to be_valid - expect(user.errors.keys). - to match_array %i(avatar_crop_x avatar_crop_y avatar_crop_size) - end - - it 'does not validate when avatar has not changed' do - user = create(:user, :with_avatar) - - expect { user.avatar_crop_x = nil }.not_to change(user, :valid?) - end - - it 'does not validate when avatar is not present' do - user = create(:user) - - expect { user.avatar_crop_y = nil }.not_to change(user, :valid?) - end - end end describe "Respond to" do |
