diff options
author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-15 19:13:26 +0100 |
---|---|---|
committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-15 19:16:16 +0100 |
commit | 59064aeeef8562a87d4d03efa9b11012a007e261 (patch) | |
tree | 1ecb34e1355a4eb714615b2a9c2727155e8f3ec9 /spec/models/user_spec.rb | |
parent | aaf4434b0e24da916d4392aa9cd001cdb8e0c7dc (diff) | |
parent | bc590ce63bd2f1af5545b648e6d028a557e7c792 (diff) | |
download | gitlab-ce-4009-external-users.tar.gz |
Merge branch 'master' into 4009-external-users4009-external-users
Diffstat (limited to 'spec/models/user_spec.rb')
-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 ca0c84c8632..0ab7fd88ce6 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 |