modify tests

Author: bodintsov

api_tests/metrics/test_counted_usage.py

@@ -88,15 +88,22 @@ def mock_now(self):
         with mock.patch('django.utils.timezone.now', return_value=timestamp):
             yield timestamp
 
+    @pytest.fixture
+    def preprint(self, request):
+        return PreprintFactory(
+            is_public=True,
+            is_published=True,
+        )
+
     @pytest.fixture()
     def user(self):
         with mock.patch('osf.models.base.generate_guid', return_value='guidy'):
             return AuthUserFactory()
 
-    def test_by_client_session_id(self, app, mock_save, user):
+    def test_by_client_session_id(self, app, mock_save, user, preprint):
         payload = counted_usage_payload(
             client_session_id='hello',
-            item_guid='zyxwv',
+            item_guid=preprint._id,
             action_labels=['view', 'api'],
             pageview_info={'page_url': 'http://example.foo/blahblah/blee'},
         )
@@ -111,7 +118,7 @@ def test_by_client_session_id(self, app, mock_save, user):
             expected_doc_id='3239044c7462dd318edd0522a0ed7d84b9c6502ef16cb40dfcae6c1f456d57a2',
             expected_attrs={
                 'platform_iri': 'http://example.foo/',
-                'item_guid': 'zyxwv',
+                'item_guid': preprint._id,
                 # session_id: sha256(b'hello|1981-01-01').hexdigest()
                 'session_id': '5b7c8b0a740a5b23712258a9d1164d2af008df02a8e3d339f16ead1d19595b34',
                 'action_labels': ['view', 'api'],
@@ -123,10 +130,10 @@ def test_by_client_session_id(self, app, mock_save, user):
             },
         )
 
-    def test_by_client_session_id_anon(self, app, mock_save):
+    def test_by_client_session_id_anon(self, app, mock_save, preprint):
         payload = counted_usage_payload(
             client_session_id='hello',
-            item_guid='zyxwv',
+            item_guid=preprint._id,
             action_labels=['view', 'web'],
             pageview_info={
                 'page_url': 'http://example.foo/bliz/',
@@ -144,7 +151,7 @@ def test_by_client_session_id_anon(self, app, mock_save):
             expected_doc_id='d01759e963893f9dc9b2ccf016a5ef29135673779802b5578f31449543677e82',
             expected_attrs={
                 'platform_iri': 'http://example.foo/',
-                'item_guid': 'zyxwv',
+                'item_guid': preprint._id,
                 # session_id: sha256(b'hello|1981-01-01').hexdigest()
                 'session_id': '5b7c8b0a740a5b23712258a9d1164d2af008df02a8e3d339f16ead1d19595b34',
                 'action_labels': ['view', 'web'],
@@ -158,9 +165,9 @@ def test_by_client_session_id_anon(self, app, mock_save):
             },
         )
 
-    def test_by_user_auth(self, app, mock_save, user):
+    def test_by_user_auth(self, app, mock_save, user, preprint):
         payload = counted_usage_payload(
-            item_guid='yxwvu',
+            item_guid=preprint._id,
             action_labels=['view', 'web'],
             pageview_info={
                 'page_url': 'http://osf.io/mst3k',
@@ -178,7 +185,7 @@ def test_by_user_auth(self, app, mock_save, user):
             expected_doc_id='7b8bc27c6d90fb45aa5bbd02deceba9f7384ed61b9a6e7253317c262020b94c2',
             expected_attrs={
                 'platform_iri': 'http://example.foo/',
-                'item_guid': 'yxwvu',
+                'item_guid': preprint._id,
                 # session_id: sha256(b'guidy|1981-01-01|0').hexdigest()
                 'session_id': 'ec768abb16c3411570af99b9d635c2c32d1ca31d1b25eec8ee73759e7242e74a',
                 'action_labels': ['view', 'web'],
@@ -192,10 +199,14 @@ def test_by_user_auth(self, app, mock_save, user):
             },
         )
 
-    def test_by_useragent_header(self, app, mock_save):
+    def test_by_useragent_header(self, app, mock_save, preprint):
         payload = counted_usage_payload(
-            item_guid='yxwvu',
+            item_guid=preprint._id,
             action_labels=['view', 'api'],
+            pageview_info={
+                'page_url': 'http://example.foo/bliz/',
+                'referer_url': 'http://elsewhere.baz/index.php',
+            },
         )
         headers = {
             'User-Agent': 'haha',
@@ -205,14 +216,20 @@ def test_by_useragent_header(self, app, mock_save):
         assert_saved_with(
             mock_save,
             # doc_id: sha256(b'http://example.foo/|yxwvu|97098dd3f7cd26053c0d0264d1c84eaeea8e08d2c55ca34017ffbe53c749ba5a|1981-01-01|3|api,view').hexdigest()
-            expected_doc_id='d669528b30f443ffe506e183537af9624ef290090e90a200ecce7b7ca19c77f7',
+            expected_doc_id='6d7549df6734bb955eb832c6316ffae46c2959c95b5817ab4fcb341dbc875c23',
             expected_attrs={
                 'platform_iri': 'http://example.foo/',
-                'item_guid': 'yxwvu',
+                'item_guid': preprint._id,
                 # session_id: sha256(b'localhost:80|haha|1981-01-01|0').hexdigest()
                 'session_id': '97098dd3f7cd26053c0d0264d1c84eaeea8e08d2c55ca34017ffbe53c749ba5a',
                 'action_labels': ['view', 'api'],
-                'pageview_info': None,
+                'pageview_info': {
+                    'page_url': 'http://example.foo/bliz/',
+                    'page_path': '/bliz',
+                    'referer_url': 'http://elsewhere.baz/index.php',
+                    'referer_domain': 'elsewhere.baz',
+                    'hour_of_day': 0,
+                },
             },
         )