-
Notifications
You must be signed in to change notification settings - Fork 20
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 #141 from willemarcel/develop
add new fields to User model and endpoint to post comments to changesets
- Loading branch information
Showing
17 changed files
with
353 additions
and
146 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| from django.core.urlresolvers import reverse | ||
| from django.test import override_settings | ||
|
|
||
| from social_django.models import UserSocialAuth | ||
| from rest_framework.test import APITestCase | ||
| import oauth2 as oauth | ||
| import mock | ||
|
|
||
| from ...users.models import User | ||
| from ..models import Changeset | ||
| from .modelfactories import ( | ||
| ChangesetFactory, GoodChangesetFactory, HarmfulChangesetFactory | ||
| ) | ||
|
|
||
|
|
||
| class TestCommentChangesetAPIView(APITestCase): | ||
| def setUp(self): | ||
| self.user = User.objects.create_user( | ||
| username='test_2', | ||
| password='password', | ||
| email='[email protected]' | ||
| ) | ||
| UserSocialAuth.objects.create( | ||
| user=self.user, | ||
| provider='openstreetmap', | ||
| uid='123123', | ||
| extra_data={ | ||
| 'id': '123123', | ||
| 'access_token': { | ||
| 'oauth_token': 'aaaa', | ||
| 'oauth_token_secret': 'bbbb' | ||
| } | ||
| } | ||
| ) | ||
| self.changeset = ChangesetFactory(id=31982802) | ||
| self.harmful_changeset = HarmfulChangesetFactory(id=31982803) | ||
| self.good_changeset = GoodChangesetFactory(id=31982804) | ||
|
|
||
| def test_comment_changeset_unauthenticated(self): | ||
| self.client.login(username=self.user.username, password='password') | ||
| comment = {'comment': 'Hello! I found an error in your edit'} | ||
| response = self.client.post( | ||
| reverse('changeset:comment', args=[self.harmful_changeset.id]), | ||
| data=comment | ||
| ) | ||
|
|
||
| self.assertEqual(response.status_code, 403) | ||
|
|
||
| @override_settings(ENABLE_POST_CHANGESET_COMMENTS=True) | ||
| @mock.patch.object(oauth.Client, 'request') | ||
| def test_comment_harmful_changeset(self, mock_oauth_client): | ||
| mock_oauth_client.return_value = [{'status': '200'}] | ||
| self.client.login(username=self.user.username, password='password') | ||
| comment = {'comment': 'Hello! I found an error in your edit'} | ||
| message = """Hello! I found an error in your edit | ||
| --- | ||
| #REVIEWED_BAD #OSMCHA | ||
| Published using OSMCha: https://osmcha.mapbox.com/changesets/31982803 | ||
| """ | ||
| response = self.client.post( | ||
| reverse('changeset:comment', args=[self.harmful_changeset.id]), | ||
| data=comment) | ||
|
|
||
| self.assertEqual(response.status_code, 201) | ||
| mock_oauth_client.assert_called_with( | ||
| 'https://api.openstreetmap.org/api/0.6/changeset/{}/comment/'.format( | ||
| self.harmful_changeset.id | ||
| ), | ||
| method='POST', | ||
| body='text={}'.format(message) | ||
| ) | ||
|
|
||
| @override_settings(ENABLE_POST_CHANGESET_COMMENTS=True) | ||
| @mock.patch.object(oauth.Client, 'request') | ||
| def test_comment_good_changeset(self, mock_oauth_client): | ||
| mock_oauth_client.return_value = [{'status': '200'}] | ||
| self.client.login(username=self.user.username, password='password') | ||
| comment = {'comment': 'Hello! Awesome edit'} | ||
| message = """Hello! Awesome edit | ||
| --- | ||
| #REVIEWED_GOOD #OSMCHA | ||
| Published using OSMCha: https://osmcha.mapbox.com/changesets/31982804 | ||
| """ | ||
| response = self.client.post( | ||
| reverse('changeset:comment', args=[self.good_changeset.id]), | ||
| data=comment | ||
| ) | ||
|
|
||
| self.assertEqual(response.status_code, 201) | ||
| mock_oauth_client.assert_called_with( | ||
| 'https://api.openstreetmap.org/api/0.6/changeset/{}/comment/'.format( | ||
| self.good_changeset.id | ||
| ), | ||
| method='POST', | ||
| body='text={}'.format(message) | ||
| ) | ||
|
|
||
| @override_settings(ENABLE_POST_CHANGESET_COMMENTS=True) | ||
| @mock.patch.object(oauth.Client, 'request') | ||
| def test_comment_unreviewed_changeset(self, mock_oauth_client): | ||
| """Unreviewed changeset should not receive the #OSMCHA_(GOOD or BAD) | ||
| hashtag. | ||
| """ | ||
| mock_oauth_client.return_value = [{'status': '200'}] | ||
| self.client.login(username=self.user.username, password='password') | ||
| comment = {'comment': 'Hello! Do you know this area?'} | ||
| message = """Hello! Do you know this area? | ||
| ---\n \n Published using OSMCha: https://osmcha.mapbox.com/changesets/31982802 | ||
| """ | ||
| response = self.client.post( | ||
| reverse('changeset:comment', args=[self.changeset.id]), | ||
| data=comment | ||
| ) | ||
|
|
||
| self.assertEqual(response.status_code, 201) | ||
| mock_oauth_client.assert_called_with( | ||
| 'https://api.openstreetmap.org/api/0.6/changeset/{}/comment/'.format( | ||
| self.changeset.id | ||
| ), | ||
| method='POST', | ||
| body='text={}'.format(message) | ||
| ) | ||
|
|
||
| def test_comment_good_changeset_wrong_data(self): | ||
| self.client.login(username=self.user.username, password='password') | ||
| comment = {'message': 'Hello! Awesome edit'} | ||
| response = self.client.post( | ||
| reverse('changeset:comment', args=[self.good_changeset.id]), | ||
| data=comment | ||
| ) | ||
|
|
||
| self.assertEqual(response.status_code, 400) | ||
|
|
||
| def test_comment_changeset_doesnt_exist(self): | ||
| """Request should fail if the changeset id is not on our database.""" | ||
| self.client.login(username=self.user.username, password='password') | ||
| comment = {'message': 'Hello! Awesome edit'} | ||
| response = self.client.post( | ||
| reverse('changeset:comment', args=[2323]), | ||
| data=comment | ||
| ) | ||
|
|
||
| self.assertEqual(response.status_code, 404) |
Oops, something went wrong.