Merge pull request GoogleCloudPlatform#44 from GoogleCloudPlatform/profile

waprin · waprin · commit dadd5117687b · 2016-04-05T17:26:21.000-07:00
Fixes Loading of User Credentials
diff --git a/4-auth/bookshelf/__init__.py b/4-auth/bookshelf/__init__.py
@@ -119,6 +119,6 @@ def _request_user_info(credentials):
         current_app.logger.error(
             "Error while obtaining user profile: %s" % resp)
         return None
+    session['profile'] = json.loads(content.decode('utf-8'))
 
-    session['profile'] = json.loads(content)
 # [END request_user_info]
diff --git a/4-auth/requirements-dev.txt b/4-auth/requirements-dev.txt
@@ -4,3 +4,4 @@ flaky==3.1.0
 pytest==2.8.7
 pytest-cov==2.2.1
 retrying==1.3.3
+mock==1.3.0
diff --git a/4-auth/tests/test_auth.py b/4-auth/tests/test_auth.py
@@ -14,8 +14,10 @@
 
 import contextlib
 
+import bookshelf
 from conftest import flaky_filter
 from flaky import flaky
+import mock
 from oauth2client.client import OAuth2Credentials
 import pytest
 
@@ -55,7 +57,6 @@ def inner():
 # in conftest.py
 @pytest.mark.usefixtures('app', 'model')
 class TestAuth(object):
-
     def test_not_logged_in(self, app):
         with app.test_client() as c:
             rv = c.get('/books/')
@@ -120,3 +121,13 @@ def test_mine(self, model, client_with_credentials):
         body = rv.data.decode('utf-8')
         assert 'Book 1' in body
         assert 'Book 2' not in body
+
+    @mock.patch("httplib2.Http")
+    def test_request_user_info(self, HttpMock):
+        httpObj = mock.MagicMock()
+        responseMock = mock.MagicMock(status=200)
+        httpObj.request = mock.MagicMock(
+            return_value=(responseMock, b'{"name": "bill"}'))
+        HttpMock.return_value = httpObj
+        credentials = mock.MagicMock()
+        bookshelf._request_user_info(credentials)
diff --git a/5-logging/bookshelf/__init__.py b/5-logging/bookshelf/__init__.py
@@ -115,4 +115,4 @@ def _request_user_info(credentials):
             "Error while obtaining user profile: %s" % resp)
         return None
 
-    session['profile'] = json.loads(content)
+    session['profile'] = json.loads(content.decode('utf-8'))
diff --git a/5-logging/requirements-dev.txt b/5-logging/requirements-dev.txt
@@ -4,3 +4,4 @@ flaky==3.1.0
 pytest==2.8.7
 pytest-cov==2.2.1
 retrying==1.3.3
+mock==1.3.0
diff --git a/5-logging/tests/test_auth.py b/5-logging/tests/test_auth.py
@@ -14,8 +14,10 @@
 
 import contextlib
 
+import bookshelf
 from conftest import flaky_filter
 from flaky import flaky
+import mock
 from oauth2client.client import OAuth2Credentials
 import pytest
 
@@ -120,3 +122,13 @@ def test_mine(self, model, client_with_credentials):
         body = rv.data.decode('utf-8')
         assert 'Book 1' in body
         assert 'Book 2' not in body
+
+    @mock.patch("httplib2.Http")
+    def test_request_user_info(self, HttpMock):
+        httpObj = mock.MagicMock()
+        responseMock = mock.MagicMock(status=200)
+        httpObj.request = mock.MagicMock(
+            return_value=(responseMock, b'{"name": "bill"}'))
+        HttpMock.return_value = httpObj
+        credentials = mock.MagicMock()
+        bookshelf._request_user_info(credentials)
diff --git a/6-pubsub/bookshelf/__init__.py b/6-pubsub/bookshelf/__init__.py
@@ -113,4 +113,4 @@ def _request_user_info(credentials):
             "Error while obtaining user profile: %s" % resp)
         return None
 
-    session['profile'] = json.loads(content)
+    session['profile'] = json.loads(content.decode('utf-8'))
diff --git a/6-pubsub/requirements-dev.txt b/6-pubsub/requirements-dev.txt
@@ -1,6 +1,7 @@
 tox==2.3.1
 flake8==2.5.4
 flaky==3.1.0
+mock==1.3.0
 pytest==2.8.7
 pytest-cov==2.2.1
 BeautifulSoup4==4.4.1
diff --git a/6-pubsub/tests/test_auth.py b/6-pubsub/tests/test_auth.py
@@ -14,8 +14,10 @@
 
 import contextlib
 
+import bookshelf
 from conftest import flaky_filter
 from flaky import flaky
+import mock
 from oauth2client.client import OAuth2Credentials
 import pytest
 
@@ -120,3 +122,13 @@ def test_mine(self, model, client_with_credentials):
         body = rv.data.decode('utf-8')
         assert 'Book 1' in body
         assert 'Book 2' not in body
+
+    @mock.patch("httplib2.Http")
+    def test_request_user_info(self, HttpMock):
+        httpObj = mock.MagicMock()
+        responseMock = mock.MagicMock(status=200)
+        httpObj.request = mock.MagicMock(
+            return_value=(responseMock, b'{"name": "bill"}'))
+        HttpMock.return_value = httpObj
+        credentials = mock.MagicMock()
+        bookshelf._request_user_info(credentials)
diff --git a/7-gce/bookshelf/__init__.py b/7-gce/bookshelf/__init__.py
@@ -121,4 +121,4 @@ def _request_user_info(credentials):
             "Error while obtaining user profile: %s" % resp)
         return None
 
-    session['profile'] = json.loads(content)
+    session['profile'] = json.loads(content.decode('utf-8'))
diff --git a/7-gce/requirements-dev.txt b/7-gce/requirements-dev.txt
@@ -1,6 +1,7 @@
 tox==2.3.1
 flake8==2.5.4
 flaky==3.1.0
+mock==1.3.0
 pytest==2.8.7
 pytest-cov==2.2.1
 BeautifulSoup4==4.4.1
diff --git a/7-gce/tests/test_auth.py b/7-gce/tests/test_auth.py
@@ -14,8 +14,10 @@
 
 import contextlib
 
+import bookshelf
 from conftest import flaky_filter
 from flaky import flaky
+import mock
 from oauth2client.client import OAuth2Credentials
 import pytest
 
@@ -120,3 +122,13 @@ def test_mine(self, model, client_with_credentials):
         body = rv.data.decode('utf-8')
         assert 'Book 1' in body
         assert 'Book 2' not in body
+
+    @mock.patch("httplib2.Http")
+    def test_request_user_info(self, HttpMock):
+        httpObj = mock.MagicMock()
+        responseMock = mock.MagicMock(status=200)
+        httpObj.request = mock.MagicMock(
+            return_value=(responseMock, b'{"name": "bill"}'))
+        HttpMock.return_value = httpObj
+        credentials = mock.MagicMock()
+        bookshelf._request_user_info(credentials)
diff --git a/optional-container-engine/bookshelf/__init__.py b/optional-container-engine/bookshelf/__init__.py
@@ -121,4 +121,4 @@ def _request_user_info(credentials):
             "Error while obtaining user profile: %s" % resp)
         return None
 
-    session['profile'] = json.loads(content)
+    session['profile'] = json.loads(content.decode('utf-8'))
diff --git a/optional-container-engine/requirements.txt b/optional-container-engine/requirements.txt
@@ -2,6 +2,7 @@ Flask==0.10.1
 gcloud==0.12.0
 gunicorn==19.4.5
 oauth2client==2.0.1
+mock==1.3.0
 Flask-SQLAlchemy==2.1
 PyMySQL==0.7.2
 Flask-PyMongo==0.4.1
diff --git a/optional-container-engine/tests/test_auth.py b/optional-container-engine/tests/test_auth.py
@@ -14,8 +14,10 @@
 
 import contextlib
 
+import bookshelf
 from conftest import flaky_filter
 from flaky import flaky
+import mock
 from oauth2client.client import OAuth2Credentials
 import pytest
 
@@ -55,7 +57,6 @@ def inner():
 # in conftest.py
 @pytest.mark.usefixtures('app', 'model')
 class TestAuth(object):
-
     def test_not_logged_in(self, app):
         with app.test_client() as c:
             rv = c.get('/books/')
@@ -120,3 +121,13 @@ def test_mine(self, model, client_with_credentials):
         body = rv.data.decode('utf-8')
         assert 'Book 1' in body
         assert 'Book 2' not in body
+
+    @mock.patch("httplib2.Http")
+    def test_request_user_info(self, HttpMock):
+        httpObj = mock.MagicMock()
+        responseMock = mock.MagicMock(status=200)
+        httpObj.request = mock.MagicMock(
+            return_value=(responseMock, b'{"name": "bill"}'))
+        HttpMock.return_value = httpObj
+        credentials = mock.MagicMock()
+        bookshelf._request_user_info(credentials)
