fix: publish verification results was wrong (#222)

* fix: publish verification results was wrong

* fix: PR comments

Author: elliottmurray

examples/e2e/tests/provider/test_provider.py

@@ -31,7 +31,7 @@ def default_opts():
         'broker_password': PACT_BROKER_PASSWORD,
         'broker_url': PACT_BROKER_URL,
         'publish_version': '3',
-        'publish_verification_results': True
+        'publish_verification_results': False
     }
 
 

examples/e2e/verify_pact.sh

@@ -30,4 +30,4 @@ else
     --pact-broker-password pactbroker \
     --publish-verification-results \
     --provider-states-setup-url=http://localhost:5001/_pact/provider_states
-fi
+fi

pact/cli/verify.py

@@ -175,6 +175,7 @@ def main(pacts, base_url, pact_url, pact_urls, states_url, states_setup_url,
         'log_level': log_level,
         'provider_app_version': provider_app_version,
         'custom_provider_headers': list(headers),
+        'publish_verification_results': publish_verification_results,
         'timeout': timeout,
         'verbose': verbose,
         'consumer_tags': list(consumer_version_tag),

pact/verify_wrapper.py

@@ -154,9 +154,6 @@ def call_verify(
             '--log-level': kwargs.get('log_level')
         }
 
-        if(kwargs.get('publish_verification_results', False) is not None):
-            options['--publish-verification-results'] = ''
-
         command = [VERIFIER_PATH]
         all_pact_urls = expand_directories(list(pacts))
 
@@ -165,9 +162,10 @@ def call_verify(
 
         if(provider_app_version):
             command.extend(["--provider-app-version",
-                            provider_app_version,
-                            "--publish-verification-results"])
-            # self.publish_results(provider_app_version, command)
+                            provider_app_version])
+
+        if(kwargs.get('publish_verification_results', False) is True):
+            command.extend(['--publish-verification-results'])
 
         if(kwargs.get('verbose', False) is True):
             command.extend(['--verbose'])

tests/cli/test_verify.py

@@ -112,6 +112,7 @@ def test_successful_verification(self, mock_isfile, mock_wrapper):
                                 timeout=30,
                                 verbose=True,
                                 enable_pending=False,
+                                publish_verification_results=False,
                                 include_wip_pacts_since=None)
 
     @patch("pact.verify_wrapper.VerifyWrapper.call_verify")
@@ -141,6 +142,7 @@ def test_pact_url_param_supported(self, mock_isfile, mock_wrapper):
                                         timeout=30,
                                         verbose=False,
                                         enable_pending=False,
+                                        publish_verification_results=False,
                                         include_wip_pacts_since=None)
         self.assertEqual(result.exit_code, 0)
 
@@ -163,6 +165,7 @@ def test_pact_urls_param_supported(self, mock_isfile, mock_wrapper):
                                         timeout=30,
                                         verbose=False,
                                         enable_pending=False,
+                                        publish_verification_results=False,
                                         include_wip_pacts_since=None)
         self.assertEqual(result.exit_code, 0)
 
@@ -189,6 +192,7 @@ def test_failed_verification(self, mock_isfile, mock_wrapper):
                                         timeout=30,
                                         verbose=False,
                                         enable_pending=False,
+                                        publish_verification_results=False,
                                         include_wip_pacts_since=None)
 
     @patch.dict(os.environ, {'PACT_BROKER_PASSWORD': 'pwd',
@@ -212,6 +216,7 @@ def test_broker_creds_from_env_var(self, mock_isfile, mock_wrapper):
                                 timeout=30,
                                 verbose=False,
                                 enable_pending=False,
+                                publish_verification_results=False,
                                 include_wip_pacts_since=None)
 
     @patch("pact.verify_wrapper.VerifyWrapper.call_verify")
@@ -233,7 +238,6 @@ def test_all_url_options(self, mock_isfile, mock_wrapper):
             '--pact-broker-token=token',
             '--pact-broker-url=http://localhost/docker',
             '--provider=provider',
-            '--publish-verification-results',
             '--provider-app-version=1.2.3',
             '--log-dir=tmp/logs/pact.test.log',
             '--log-level=INFO',
@@ -263,6 +267,7 @@ def test_all_url_options(self, mock_isfile, mock_wrapper):
                                 timeout=60,
                                 verbose=True,
                                 enable_pending=True,
+                                publish_verification_results=False,
                                 include_wip_pacts_since=None)
 
     @patch("pact.verify_wrapper.VerifyWrapper.call_verify")
@@ -305,7 +310,7 @@ def test_all_broker_options(self, mock_wrapper):
                                                     '{"tag": "staging", "latest": true}'],
                                 provider_tags=['dev', 'qa'],
                                 provider_app_version='1.2.3',
-                                # custom_provider_header=['Authorization: Basic cGFj', 'CustomHeader: somevalue'],
+                                publish_verification_results=True,
                                 provider_states_setup_url='http://localhost/provider-states/set',
                                 timeout=60,
                                 verbose=True,

tests/test_verify_wrapper.py

@@ -34,9 +34,6 @@ def setUp(self):
 
         self.mock_Popen.return_value.communicate.return_value = self.locale
 
-        # self.mock_isfile = patch.object(
-        #     VerifyWrapper, 'isfile', autospec=True).start()
-
         self.mock_rerun_command = patch.object(
             verify_wrapper, 'rerun_command', autospec=True).start()
 
@@ -114,7 +111,6 @@ def test_all_url_options(self, mock_isfile):
                                              provider_base_url='http://localhost',
                                              provider_states_setup_url='http://localhost/provider-states/set',
                                              provider='provider',
-                                             publish_verification_results=True,
                                              provider_app_version='1.2.3',
                                              custom_provider_headers=['Authorization: Basic cGFj', 'CustomHeader: somevalue'],
                                              log_dir='tmp/logs/pact.test.log',
@@ -135,7 +131,6 @@ def test_all_url_options(self, mock_isfile):
             '--provider-base-url=http://localhost',
             '--provider-states-setup-url=http://localhost/provider-states/set',
             '--provider=provider',
-            '--publish-verification-results',
             '--provider-app-version', '1.2.3',
             '--log-dir=tmp/logs/pact.test.log',
             '--log-level=INFO',
@@ -199,8 +194,9 @@ def test_publishing_with_version(self, mock_sanitize_logs, mock_path_exists):
                                              './pacts/consumer-provider2.json',
                                              provider='test_provider',
                                              provider_base_url='http://localhost',
-                                             provider_app_version='1.2.3'
-                                             )
+                                             provider_app_version='1.2.3',
+                                             publish_verification_results=True)
+
         self.default_call.extend(['--provider-app-version', '1.2.3', '--publish-verification-results'])
 
         self.assertProcess(*self.default_call)