summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-25 10:15:43 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-25 10:15:43 +0200
commit44013827988cb18d7c3b504f001256388da71abf (patch)
tree3524db11af01fa20337e7f2493e187b168c4ce50 /features
parent504777ec20f006fd92cc948c03d35df3e1df4d3b (diff)
downloadgitlab-ce-44013827988cb18d7c3b504f001256388da71abf.tar.gz
Fix 500 error when try to update own profile in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features')
-rw-r--r--features/admin/users.feature6
-rw-r--r--features/steps/admin/admin_users.rb13
2 files changed, 19 insertions, 0 deletions
diff --git a/features/admin/users.feature b/features/admin/users.feature
index 7f503cf9235..ce9f32f50d9 100644
--- a/features/admin/users.feature
+++ b/features/admin/users.feature
@@ -14,3 +14,9 @@ Feature: Admin Users
And Click save
Then See username error message
And Not changed form action url
+
+ Scenario: Edit my user attributes
+ Given I visit admin users page
+ And click edit on my user
+ When I submit modified user
+ Then I see user attributes changed
diff --git a/features/steps/admin/admin_users.rb b/features/steps/admin/admin_users.rb
index 33c1344eaeb..659008dd875 100644
--- a/features/steps/admin/admin_users.rb
+++ b/features/steps/admin/admin_users.rb
@@ -31,4 +31,17 @@ class AdminUsers < Spinach::FeatureSteps
And 'Not changed form action url' do
page.should have_selector %(form[action="/admin/users/#{@user.username}"])
end
+
+ step 'I submit modified user' do
+ check :user_can_create_group
+ click_button 'Save'
+ end
+
+ step 'I see user attributes changed' do
+ page.should have_content 'Can create groups: Yes'
+ end
+
+ step 'click edit on my user' do
+ find("#edit_user_#{current_user.id}").click
+ end
end