summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-03-15 15:53:42 +0000
committerRémy Coutable <remy@rymai.me>2016-03-15 15:53:42 +0000
commit5c1f6f8cfcc30597ca3f9bea8ab4431049ed1bd6 (patch)
treedb674a9f4c5e992e6d69cf22af9003af08a1da3f /features
parentbbfe15491e496bad0b532b9607d3b380c98206c9 (diff)
parent1714883107b7b8b8f2ef8c2836acc2866362738e (diff)
downloadgitlab-ce-5c1f6f8cfcc30597ca3f9bea8ab4431049ed1bd6.tar.gz
Merge branch 'revert-avatar-cropping' into 'master'
Revert the avatar cropping feature Reverts !2951 since the added 'mini_magick' dependency should be replaced by client-side croppping See merge request !3223
Diffstat (limited to 'features')
-rw-r--r--features/steps/profile/profile.rb20
1 files changed, 6 insertions, 14 deletions
diff --git a/features/steps/profile/profile.rb b/features/steps/profile/profile.rb
index fd9aaeb3b09..909de31a479 100644
--- a/features/steps/profile/profile.rb
+++ b/features/steps/profile/profile.rb
@@ -27,7 +27,9 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
end
step 'I change my avatar' do
- attach_avatar
+ attach_file(:user_avatar, File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif'))
+ click_button "Update profile settings"
+ @user.reload
end
step 'I should see new avatar' do
@@ -40,7 +42,9 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
end
step 'I have an avatar' do
- attach_avatar
+ attach_file(:user_avatar, File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif'))
+ click_button "Update profile settings"
+ @user.reload
end
step 'I remove my avatar' do
@@ -225,16 +229,4 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
step "I see that application is removed" do
expect(page.find(".oauth-applications")).not_to have_content "test_changed"
end
-
- def attach_avatar
- attach_file :user_avatar, Rails.root.join(*%w(spec fixtures banana_sample.gif))
-
- page.find('#user_avatar_crop_x', visible: false).set('0')
- page.find('#user_avatar_crop_y', visible: false).set('0')
- page.find('#user_avatar_crop_size', visible: false).set('256')
-
- click_button "Update profile settings"
-
- @user.reload
- end
end