Updated pubsubhubbub to use pytest fixture

itsmemattchung · itsmemattchung · commit 71096f43c7b6 · 2016-01-07T14:23:34.000Z
Configures cassette to use betamax_simple_body as matcher.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,6 +1,7 @@
 import base64
 import betamax
 import os
+import pytest
 
 from betamax_matchers import json_body
 
@@ -29,3 +30,11 @@
         '<BASIC_AUTH>',
         base64.b64encode(b':'.join(credentials)).decode()
         )
+
+
+@pytest.fixture
+def betamax_simple_body(request):
+    """Return configuration to match cassette on uri, method and body."""
+    request.cls.betamax_simple_body = {
+        'match_requests_on': ['uri', 'method', 'body']
+    }
diff --git a/tests/integration/helper.py b/tests/integration/helper.py
@@ -2,9 +2,11 @@
 import betamax
 import github3
 import os
+import pytest
 import unittest
 
 
+@pytest.mark.usefixtures('betamax_simple_body')
 class IntegrationHelper(unittest.TestCase):
     def setUp(self):
         self.user = os.environ.get('GH_USER', 'foo')
diff --git a/tests/integration/test_github.py b/tests/integration/test_github.py
@@ -360,13 +360,11 @@ def test_organization(self):
         assert isinstance(o, github3.orgs.Organization)
 
     def test_pubsubhubbub(self):
-        """Test the ability to createa a pubsubhubbub hook."""
+        """Test the ability to create a pubsubhubbub hook."""
         self.token_login()
-        betamax_kwargs = {
-            'match_requests_on': ['uri', 'method', 'body']
-        }
         cassette_name = self.cassette_name('pubsubhubbub')
-        with self.recorder.use_cassette(cassette_name, **betamax_kwargs):
+        with self.recorder.use_cassette(cassette_name,
+                                        **self.betamax_simple_body):
             topic = 'https://github.com/itsmemattchung/github3.py/events/push'
             status = self.gh.pubsubhubbub(
                 mode='subscribe',
