refactor(verifier): add enable_pending to signature of verify methods

Author: Maciej Olko

pact/verifier.py

@@ -30,7 +30,7 @@ def validate_publish(self, **kwargs):
             # do something
             raise Exception()
 
-    def verify_pacts(self, *pacts, **kwargs):
+    def verify_pacts(self, *pacts, enable_pending=False, **kwargs):
         """Verify our pacts from the provider.
 
         Returns:
@@ -53,17 +53,19 @@ def verify_pacts(self, *pacts, **kwargs):
         success, logs = VerifyWrapper().call_verify(*pacts,
                                                     provider=self.provider,
                                                     provider_base_url=self.provider_base_url,
+                                                    enable_pending=enable_pending,
                                                     **options)
 
         return success, logs
 
-    def verify_with_broker(self, **kwargs):
+    def verify_with_broker(self, enable_pending=False, **kwargs):
         """Use Broker to verify.
 
         Args:
             broker_username ([String]): broker username
             broker_password ([String]): broker password
             broker_url ([String]): url of broker
+            enable_pending ([Boolean])
 
         """
         broker_username = kwargs.get('broker_username', None)
@@ -81,6 +83,7 @@ def verify_with_broker(self, **kwargs):
 
         success, logs = VerifyWrapper().call_verify(provider=self.provider,
                                                     provider_base_url=self.provider_base_url,
+                                                    enable_pending=enable_pending,
                                                     **options)
         return success, logs
 
@@ -97,7 +100,6 @@ def extract_params(self, **kwargs):
         states_setup_url = kwargs.get('provider_states_setup_url', None)
         verbose = kwargs.get('verbose', False)
         publish_version = kwargs.get('publish_version', None)
-        enable_pending = kwargs.get('enable_pending', None)
 
         options = {
             'log_dir': log_dir,
@@ -111,7 +113,6 @@ def extract_params(self, **kwargs):
             'provider_states_setup_url': states_setup_url,
             'verbose': verbose,
             'publish_version': publish_version,
-            'enable_pending': enable_pending,
         }
         return self.filter_empty_options(**options)
 

tests/test_verifier.py

@@ -36,7 +36,8 @@ def test_verifier_with_provider_and_files(self, mock_path_exists, mock_wrapper):
                            provider='test_provider',
                            provider_base_url='http://localhost:8888',
                            log_level='INFO',
-                           verbose=False)
+                           verbose=False,
+                           enable_pending=False)
 
     def test_validate_on_publish_results(self):
         self.assertRaises(Exception, self.verifier.verify_pacts, 'path/to/pact1', publish=True)
@@ -54,7 +55,8 @@ def test_publish_on_success(self, mock_path_exists, mock_wrapper):
                            provider_base_url='http://localhost:8888',
                            log_level='INFO',
                            verbose=False,
-                           publish_version='1.0.0')
+                           publish_version='1.0.0',
+                           enable_pending=False)
 
     @patch('pact.verifier.path_exists', return_value=False)
     def test_raises_error_on_missing_pact_files(self, mock_path_exists):
@@ -122,7 +124,8 @@ def test_verifier_with_broker(self, mock_wrapper):
                            broker_token='token',
                            broker_url=self.broker_url,
                            log_level='INFO',
-                           verbose=False)
+                           verbose=False,
+                           enable_pending=False)
 
     @patch("pact.verify_wrapper.VerifyWrapper.call_verify")
     @patch('pact.verifier.path_exists', return_value=True)
@@ -140,7 +143,8 @@ def test_publish_on_success(self, mock_path_exists, mock_wrapper):
                            broker_url=self.broker_url,
                            log_level='INFO',
                            verbose=False,
-                           publish_version='1.0.0')
+                           publish_version='1.0.0',
+                           enable_pending=False)
 
     @patch('pact.verify_wrapper.VerifyWrapper.call_verify', return_value=(0, None))
     def test_passes_enable_pending_flag_value(self, mock_wrapper):