chore: unskip tests

Some tests were skipped due to an upstream issue. As the issue is now
fixed, the tests can be re-enabled.

Signed-off-by: JP-Ellis <josh@jpellis.me>

tests/v3/compatibility_suite/test_v1_consumer.py

@@ -4,7 +4,6 @@
 
 import logging
 
-import pytest
 from pytest_bdd import given, parsers, scenario
 
 from tests.v3.compatibility_suite.util import (
@@ -153,9 +152,6 @@ def test_request_with_invalid_body() -> None:
     """
 
 
-# TODO: Enable this test when the upstream issue is resolved:
-# https://github.com/pact-foundation/pact-compatibility-suite/issues/3
-@pytest.mark.skip("Waiting on upstream fix")
 @scenario(
     "definition/features/V1/http_consumer.feature",
     "Request with the incorrect type of body contents",
@@ -226,9 +222,6 @@ def test_request_with_xml_body_negative_case() -> None:
     """
 
 
-# TODO: Enable this test when the upstream issue is resolved:
-# https://github.com/pact-foundation/pact-reference/issues/336
-@pytest.mark.skip("Waiting on upstream fix")
 @scenario(
     "definition/features/V1/http_consumer.feature",
     "Request with a binary body (positive case)",
@@ -239,9 +232,6 @@ def test_request_with_a_binary_body_positive_case() -> None:
     """
 
 
-# TODO: Enable this test when the upstream issue is resolved:
-# https://github.com/pact-foundation/pact-reference/issues/336
-@pytest.mark.skip("Waiting on upstream fix")
 @scenario(
     "definition/features/V1/http_consumer.feature",
     "Request with a binary body (negative case)",

tests/v3/compatibility_suite/util/__init__.py

@@ -199,7 +199,6 @@ def __init__(self, data: str) -> None:
 
             self.bytes = data.encode("utf-8")
             self.string = data
-            self.mime_type = "text/plain"
 
         def __repr__(self) -> str:
             """
@@ -311,7 +310,7 @@ def update(self, **kwargs: str) -> None:  # noqa: C901, PLR0912
             # the content type.
             orig_content_type = self.body.mime_type if self.body else None
             self.body = InteractionDefinition.Body(body)
-            self.body.mime_type = orig_content_type or self.body.mime_type
+            self.body.mime_type = self.body.mime_type or orig_content_type
 
         if content_type := (
             kwargs.pop("content_type", None) or kwargs.pop("content type", None)