Merge branch 'release/0.17' into wdtk

Conflicts:
    config/general.yml-example

1 files changed, 21 insertions, 2 deletions

diff --git a/spec/controllers/admin_user_controller_spec.rb b/spec/controllers/admin_user_controller_spec.rb
index a6e5a0d7e..99894a414 100644
--- a/spec/controllers/admin_user_controller_spec.rb
+++ b/spec/controllers/admin_user_controller_spec.rb
@@ -15,13 +15,32 @@ describe AdminUserController, "when administering users" do
     it "shows a user" do
         get :show, :id => users(:bob_smith_user)
     end
-    
+
     it "logs in as another user" do
         get :login_as,  :id => users(:bob_smith_user).id
         post_redirect = PostRedirect.get_last_post_redirect
         response.should redirect_to(:controller => 'user', :action => 'confirm', :email_token => post_redirect.email_token)
     end
-    
+
     # See also "allows an admin to log in as another user" in spec/integration/admin_spec.rb
 end
 
+describe AdminUserController, "when updating a user" do
+
+    it "saves a change to 'can_make_batch_requests'" do
+        user = FactoryGirl.create(:user)
+        user.can_make_batch_requests?.should be_false
+        post :update, {:id => user.id, :admin_user => {:can_make_batch_requests => '1',
+                                                       :name => user.name,
+                                                       :email => user.email,
+                                                       :admin_level => user.admin_level,
+                                                       :ban_text => user.ban_text,
+                                                       :about_me => user.about_me,
+                                                       :no_limit => user.no_limit}}
+        flash[:notice].should == 'User successfully updated.'
+        response.should be_redirect
+        user = User.find(user.id)
+        user.can_make_batch_requests?.should be_true
+    end
+
+end