diff options
| author | Tom Christie | 2011-12-29 13:31:12 +0000 | 
|---|---|---|
| committer | Tom Christie | 2011-12-29 13:31:12 +0000 | 
| commit | 07349597ab936dc9887caa70b5d7d2860c897b12 (patch) | |
| tree | db1fdb8934e4d8dc8d3afe8d1e9fd076e3a4e27d /djangorestframework/tests/oauthentication.py | |
| parent | 1bdc5eacc6290c486796eb5ab8fa29092137dab6 (diff) | |
| download | django-rest-framework-07349597ab936dc9887caa70b5d7d2860c897b12.tar.bz2 | |
whitespace fixes
Diffstat (limited to 'djangorestframework/tests/oauthentication.py')
| -rw-r--r-- | djangorestframework/tests/oauthentication.py | 46 | 
1 files changed, 23 insertions, 23 deletions
diff --git a/djangorestframework/tests/oauthentication.py b/djangorestframework/tests/oauthentication.py index 109d9a72..b4bcf2fa 100644 --- a/djangorestframework/tests/oauthentication.py +++ b/djangorestframework/tests/oauthentication.py @@ -23,14 +23,14 @@ else:      class ClientView(View):          def get(self, request):              return {'resource': 'Protected!'} -     +      urlpatterns = patterns('',          url(r'^$', oauth_required(ClientView.as_view())),          url(r'^oauth/', include('oauth_provider.urls')),          url(r'^accounts/login/$', 'djangorestframework.utils.staticviews.api_login'),      ) -     -     + +      class OAuthTests(TestCase):          """          OAuth authentication: @@ -42,23 +42,23 @@ else:          * the third-party website is able to retrieve data from the API          """          urls = 'djangorestframework.tests.oauthentication' -     +          def setUp(self):              self.client = Client()              self.username = 'john'              self.email = 'lennon@thebeatles.com'              self.password = 'password'              self.user = User.objects.create_user(self.username, self.email, self.password) -             +              # OAuth requirements              self.resource = Resource(name='data', url='/')              self.resource.save()              self.CONSUMER_KEY = 'dpf43f3p2l4k3l03'              self.CONSUMER_SECRET = 'kd94hf93k423kf44' -            self.consumer = Consumer(key=self.CONSUMER_KEY, secret=self.CONSUMER_SECRET,  +            self.consumer = Consumer(key=self.CONSUMER_KEY, secret=self.CONSUMER_SECRET,                                  name='api.example.com', user=self.user)              self.consumer.save() -     +          def test_oauth_invalid_and_anonymous_access(self):              """              Verify that the resource is protected and the OAuth authorization view @@ -69,16 +69,16 @@ else:              self.assertEqual(response.status_code, 401)              response = self.client.get('/oauth/authorize/', follow=True)              self.assertRedirects(response, '/accounts/login/?next=/oauth/authorize/') -     +          def test_oauth_authorize_access(self):              """ -            Verify that once logged in, the user can access the authorization page  +            Verify that once logged in, the user can access the authorization page              but can't display the page because the request token is not specified.              """              self.client.login(username=self.username, password=self.password)              response = self.client.get('/oauth/authorize/', follow=True)              self.assertEqual(response.content, 'No request token specified.') -     +          def _create_request_token_parameters(self):              """              A shortcut to create request's token parameters. @@ -93,28 +93,28 @@ else:                  'oauth_callback': 'http://api.example.com/request_token_ready',                  'scope': 'data',              } -     +          def test_oauth_request_token_retrieval(self):              """              Verify that the request token can be retrieved by the server.              """ -            response = self.client.get("/oauth/request_token/",  +            response = self.client.get("/oauth/request_token/",                                          self._create_request_token_parameters())              self.assertEqual(response.status_code, 200)              token = list(Token.objects.all())[-1]              self.failIf(token.key not in response.content)              self.failIf(token.secret not in response.content) -             +          def test_oauth_user_request_authorization(self):              """              Verify that the user can access the authorization page once logged in              and the request token has been retrieved.              """              # Setup -            response = self.client.get("/oauth/request_token/",  +            response = self.client.get("/oauth/request_token/",                                          self._create_request_token_parameters())              token = list(Token.objects.all())[-1] -             +              # Starting the test here              self.client.login(username=self.username, password=self.password)              parameters = {'oauth_token': token.key,} @@ -129,7 +129,7 @@ else:              token = Token.objects.get(key=token.key)              self.failIf(token.key not in response['Location'])              self.assertEqual(token.is_approved, 1) -             +          def _create_access_token_parameters(self, token):              """              A shortcut to create access' token parameters. @@ -145,13 +145,13 @@ else:                  'oauth_verifier': token.verifier,                  'scope': 'data',              } -     +          def test_oauth_access_token_retrieval(self):              """              Verify that the request token can be retrieved by the server.              """              # Setup -            response = self.client.get("/oauth/request_token/",  +            response = self.client.get("/oauth/request_token/",                                          self._create_request_token_parameters())              token = list(Token.objects.all())[-1]              self.client.login(username=self.username, password=self.password) @@ -160,7 +160,7 @@ else:              parameters['authorize_access'] = 1 # fake authorization by the user              response = self.client.post("/oauth/authorize/", parameters)              token = Token.objects.get(key=token.key) -     +              # Starting the test here              response = self.client.get("/oauth/access_token/", self._create_access_token_parameters(token))              self.assertEqual(response.status_code, 200) @@ -169,7 +169,7 @@ else:              self.failIf(access_token.key not in response.content)              self.failIf(access_token.secret not in response.content)              self.assertEqual(access_token.user.username, 'john') -     +          def _create_access_parameters(self, access_token):              """              A shortcut to create access' parameters. @@ -188,13 +188,13 @@ else:              signature = signature_method.sign(oauth_request, self.consumer, access_token)              parameters['oauth_signature'] = signature              return parameters -     +          def test_oauth_protected_resource_access(self):              """              Verify that the request token can be retrieved by the server.              """              # Setup -            response = self.client.get("/oauth/request_token/",  +            response = self.client.get("/oauth/request_token/",                                          self._create_request_token_parameters())              token = list(Token.objects.all())[-1]              self.client.login(username=self.username, password=self.password) @@ -205,7 +205,7 @@ else:              token = Token.objects.get(key=token.key)              response = self.client.get("/oauth/access_token/", self._create_access_token_parameters(token))              access_token = list(Token.objects.filter(token_type=Token.ACCESS))[-1] -     +              # Starting the test here              response = self.client.get("/", self._create_access_token_parameters(access_token))              self.assertEqual(response.status_code, 200)  | 
