From 3cc17ad4cdc4a08853b9dda6b90c1e4d0aab3afd Mon Sep 17 00:00:00 2001
From: Scott Albertson <scott@thoughtbot.com>
Date: Fri, 1 Nov 2013 11:42:16 -0700
Subject: [PATCH] Add test coverage for #update

---
 spec/controllers/users_controller_spec.rb | 57 ++++++++++++++---------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index c378af6d956..f8539afd7c1 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -836,25 +836,52 @@ describe UsersController do
     context 'with authenticated user' do
       context 'with permission to update' do
         it 'allows the update' do
-          user = create_authenticated_user('Billy Bob')
-          stub_guardian(user) do |guardian|
-            guardian.stubs(:ensure_can_edit!).with(user)
-          end
+          user = Fabricate(:user, name: 'Billy Bob')
+          log_in_user(user)
 
           put :update, username: user.username, name: 'Jim Tom'
 
           expect(response).to be_success
           expect(user.reload.name).to eq 'Jim Tom'
         end
+
+        it 'returns user JSON' do
+          user = log_in
+
+          put :update, username: user.username
+
+          json = JSON.parse(response.body)
+          expect(json['user']['id']).to eq user.id
+        end
+
+        context 'when website includes http' do
+          it 'does not add http before updating' do
+            user = log_in
+
+            put :update, username: user.username, website: 'http://example.com'
+
+            expect(user.reload.website).to eq 'http://example.com'
+          end
+        end
+
+        context 'when website does not include http' do
+          it 'adds http before updating' do
+            user = log_in
+
+            put :update, username: user.username, website: 'example.com'
+
+            expect(user.reload.website).to eq 'http://example.com'
+          end
+        end
       end
 
       context 'without permission to update' do
         it 'does not allow the update' do
-          user = create_authenticated_user('Billy Bob')
-          stub_guardian(user) do |guardian|
-            guardian.stubs(:ensure_can_edit!).
-              with(user).raises(Discourse::InvalidAccess.new)
-          end
+          user = Fabricate(:user, name: 'Billy Bob')
+          log_in_user(user)
+          guardian = Guardian.new(user)
+          guardian.stubs(:ensure_can_edit!).with(user).raises(Discourse::InvalidAccess.new)
+          Guardian.stubs(new: guardian).with(user)
 
           put :update, username: user.username, name: 'Jim Tom'
 
@@ -1104,16 +1131,4 @@ describe UsersController do
     end
 
   end
-
-  private
-
-  def create_authenticated_user(name)
-    log_in_user(Fabricate(:user, name: name))
-  end
-
-  def stub_guardian(user)
-    guardian = Guardian.new(user)
-    yield(guardian)
-    Guardian.stubs(new: guardian).with(user)
-  end
 end