summaryrefslogtreecommitdiff
path: root/users/test
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2013-01-31 13:11:02 -0800
committerjessib <jessib@riseup.net>2013-01-31 13:11:02 -0800
commita59d0aa3ba4eb7ed18597e93fc63c9e0f61b7501 (patch)
tree178e2b29c8491e1f98615cef5e51ff6160a9e4d7 /users/test
parenteae48e6d7ac052991560510b06e7c7ab78a201fe (diff)
parent2d330838cf5a763d8de2bea752b4e37cf2caa249 (diff)
Merge pull request #23 from leapcode/feature/rest_api
Allow PUT API to update user.
Diffstat (limited to 'users/test')
-rw-r--r--users/test/integration/api/account_flow_test.rb22
1 files changed, 21 insertions, 1 deletions
diff --git a/users/test/integration/api/account_flow_test.rb b/users/test/integration/api/account_flow_test.rb
index 268fb5e..4937814 100644
--- a/users/test/integration/api/account_flow_test.rb
+++ b/users/test/integration/api/account_flow_test.rb
@@ -23,7 +23,7 @@ class AccountFlowTest < ActiveSupport::TestCase
:password_salt => @srp.salt.to_s(16)
}
post 'http://api.lvh.me:3000/1/users.json', :user => @user_params
- @user = User.find_by_param(@login)
+ @user = User.find_by_login(@login)
end
def teardown
@@ -91,4 +91,24 @@ class AccountFlowTest < ActiveSupport::TestCase
assert_nil server_auth
end
+ test "update user" do
+ server_auth = @srp.authenticate(self)
+ test_public_key = 'asdlfkjslfdkjasd'
+ original_login = @user.login
+ put "http://api.lvh.me:3000/1/users/" + @user.id + '.json', :user => {:public_key => test_public_key, :login => 'failed_login_name'}, :format => :json
+ @user.reload
+ assert_equal test_public_key, @user.public_key
+ assert_equal original_login, @user.login
+ # eventually probably want to remove most of this into a non-integration functional test
+ # should not overwrite public key:
+ put "http://api.lvh.me:3000/1/users/" + @user.id + '.json', :user => {:blee => :blah}, :format => :json
+ @user.reload
+ assert_equal test_public_key, @user.public_key
+ # should overwrite public key:
+ put "http://api.lvh.me:3000/1/users/" + @user.id + '.json', :user => {:public_key => nil}, :format => :json
+ # TODO: not sure why i need this, but when public key is removed, the DB is updated but @user.reload doesn't seem to actually reload.
+ @user = User.find(@user.id) # @user.reload
+ assert_nil @user.public_key
+ end
+
end