forked from ontoportal/ontologies_api
-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #137 from ncbo/develop
Merge Develop to Master, release v5.28.0
- Loading branch information
Showing
8 changed files
with
104 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,9 +67,58 @@ def test_create_new_user | |
|
|
||
| get "/users/#{@@username}" | ||
| assert last_response.ok? | ||
| assert MultiJson.load(last_response.body)["username"].eql?(@@username) | ||
| assert MultiJson.load(last_response.body)["username"].eql?(@@username) | ||
| assert_equal "[email protected]", MultiJson.load(last_response.body)["email"] | ||
| end | ||
|
|
||
| def test_reset_password | ||
| username = 'resetpswd' | ||
| user = {email: "#{username}@example.org", password: "resetme"} | ||
| put "/users/#{username}", MultiJson.dump(user), "CONTENT_TYPE" => "application/json" | ||
| assert last_response.status == 201 | ||
| user = User.find(username).include(User.attributes).first | ||
| assert_nil user.resetToken | ||
| post "/users/create_reset_password_token", {username: username, email: "[email protected]"} | ||
| user = User.find(username).include(User.attributes).first | ||
| assert_nil user.resetToken | ||
| assert_equal 404, last_response.status | ||
| post "/users/reset_password", {username: 'badusername', email: "#{username}@example.org", token: 'badtoken'} | ||
| post "/users/create_reset_password_token", {username: username, email: "#{username}@example.org"} | ||
| assert_equal 204, last_response.status | ||
| user = User.find(username).include(User.attributes).first | ||
| refute_nil user.resetToken | ||
| post "/users/reset_password", {username: username, email: "#{username}@example.org", token: 'badtoken'} | ||
| assert_equal 401, last_response.status | ||
| post "/users/reset_password", {username: 'badusername', email: "#{username}@example.org", token: 'badtoken'} | ||
| assert_equal 404, last_response.status | ||
| post "/users/reset_password", {username: username, token: user.resetToken} | ||
| assert_equal 404, last_response.status | ||
| post "/users/reset_password", {email: "#{username}@example.org", token: user.resetToken} | ||
| assert_equal 404, last_response.status | ||
| post "/users/reset_password", {username: username, email: "[email protected]", token: user.resetToken} | ||
| assert_equal 404, last_response.status | ||
| post "/users/reset_password", {username: username, email: "#{username}@example.org", token: user.resetToken} | ||
| assert_equal 200, last_response.status | ||
| assert_equal "#{username}@example.org", MultiJson.load(last_response.body)["email"] | ||
| user = User.find(username).include(User.attributes).first | ||
| assert_nil user.resetToken | ||
| end | ||
|
|
||
| def test_reset_password_expired_token | ||
| username = 'resetexpired' | ||
| user = {email: "#{username}@example.org", password: "resetme"} | ||
| put "/users/#{username}", MultiJson.dump(user), "CONTENT_TYPE" => "application/json" | ||
| assert last_response.status == 201 | ||
| post "/users/create_reset_password_token", {username: username, email: "#{username}@example.org"} | ||
| assert_equal 204, last_response.status | ||
| user = User.find(username).include(User.attributes).first | ||
| user.resetTokenExpireTime = Time.now.to_i - 2.hours.to_i | ||
| user.save | ||
| post "/users/reset_password", {username: username, email: "#{username}@example.org", token: user.resetToken} | ||
| assert_equal 401, last_response.status | ||
| end | ||
|
|
||
|
|
||
| def test_create_new_invalid_user | ||
| put "/users/totally_new_user" | ||
| assert last_response.status == 422 | ||
|
|
@@ -120,7 +169,6 @@ def test_authentication | |
| assert user["username"].eql?(@@usernames.first) | ||
| end | ||
|
|
||
|
|
||
| private | ||
|
|
||
| def _delete_user(username) | ||
|
|
||