diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 12:09:45 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 12:09:45 +0200 |
| commit | 8c6cbd430639f03461df625ff1cbeca1294f4b25 (patch) | |
| tree | efab5b4324c6166141e42eaaa04de3087e356b8d /features/steps/profile/profile.rb | |
| parent | 7780a886e7c90b2fbe281d3b8452151c20659543 (diff) | |
| parent | 4b31f4b68319a9099a36d6e59f153a1ae0a50f1d (diff) | |
| download | gitlab-ce-admin-edit-identities.tar.gz | |
Merge branch 'master' into admin-edit-identitiesadmin-edit-identities
Diffstat (limited to 'features/steps/profile/profile.rb')
| -rw-r--r-- | features/steps/profile/profile.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/features/steps/profile/profile.rb b/features/steps/profile/profile.rb index 3f19bed8a0b..11e1163c352 100644 --- a/features/steps/profile/profile.rb +++ b/features/steps/profile/profile.rb @@ -27,14 +27,14 @@ class Spinach::Features::Profile < Spinach::FeatureSteps end step 'I change my avatar' do - attach_file(:user_avatar, File.join(Rails.root, 'public', 'gitlab_logo.png')) + attach_file(:user_avatar, File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif')) click_button "Save changes" @user.reload end step 'I should see new avatar' do expect(@user.avatar).to be_instance_of AvatarUploader - expect(@user.avatar.url).to eq "/uploads/user/avatar/#{ @user.id }/gitlab_logo.png" + expect(@user.avatar.url).to eq "/uploads/user/avatar/#{ @user.id }/banana_sample.gif" end step 'I should see the "Remove avatar" button' do @@ -42,7 +42,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps end step 'I have an avatar' do - attach_file(:user_avatar, File.join(Rails.root, 'public', 'gitlab_logo.png')) + attach_file(:user_avatar, File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif')) click_button "Save changes" @user.reload end |