refactor(tests): switch from prism to steady

Author: stainless-app[bot]

CONTRIBUTING.md

@@ -85,7 +85,7 @@ $ pip install ./path-to-wheel-file.whl
 
 ## Running tests
 
-Most tests require you to [set up a mock server](https://github.com/stoplightio/prism) against the OpenAPI spec to run the tests.
+Most tests require you to [set up a mock server](https://github.com/dgellow/steady) against the OpenAPI spec to run the tests.
 
 ```sh
 $ ./scripts/mock

scripts/mock

@@ -19,34 +19,34 @@ fi
 
 echo "==> Starting mock server with URL ${URL}"
 
-# Run prism mock on the given spec
+# Run steady mock on the given spec
 if [ "$1" == "--daemon" ]; then
   # Pre-install the package so the download doesn't eat into the startup timeout
-  npm exec --package=@stainless-api/prism-cli@5.15.0 -- prism --version
+  npm exec --package=@stdy/cli@0.19.3 -- steady --version
 
-  npm exec --package=@stainless-api/prism-cli@5.15.0 -- prism mock "$URL" &> .prism.log &
+  npm exec --package=@stdy/cli@0.19.3 -- steady --host 127.0.0.1 -p 4010 --validator-query-array-format=brackets --validator-query-object-format=brackets "$URL" &> .stdy.log &
 
-  # Wait for server to come online (max 30s)
+  # Wait for server to come online via health endpoint (max 30s)
   echo -n "Waiting for server"
   attempts=0
-  while ! grep -q "✖  fatal\|Prism is listening" ".prism.log" ; do
+  while ! curl --silent --fail "http://127.0.0.1:4010/_x-steady/health" >/dev/null 2>&1; do
+    if ! kill -0 $! 2>/dev/null; then
+      echo
+      cat .stdy.log
+      exit 1
+    fi
     attempts=$((attempts + 1))
     if [ "$attempts" -ge 300 ]; then
       echo
-      echo "Timed out waiting for Prism server to start"
-      cat .prism.log
+      echo "Timed out waiting for Steady server to start"
+      cat .stdy.log
       exit 1
     fi
     echo -n "."
     sleep 0.1
   done
 
-  if grep -q "✖  fatal" ".prism.log"; then
-    cat .prism.log
-    exit 1
-  fi
-
   echo
 else
-  npm exec --package=@stainless-api/prism-cli@5.15.0 -- prism mock "$URL"
+  npm exec --package=@stdy/cli@0.19.3 -- steady --host 127.0.0.1 -p 4010 --validator-query-array-format=brackets --validator-query-object-format=brackets "$URL"
 fi

scripts/test

@@ -9,8 +9,8 @@ GREEN='\033[0;32m'
 YELLOW='\033[0;33m'
 NC='\033[0m' # No Color
 
-function prism_is_running() {
-  curl --silent "http://localhost:4010" >/dev/null 2>&1
+function steady_is_running() {
+  curl --silent "http://127.0.0.1:4010/_x-steady/health" >/dev/null 2>&1
 }
 
 kill_server_on_port() {
@@ -25,7 +25,7 @@ function is_overriding_api_base_url() {
   [ -n "$TEST_API_BASE_URL" ]
 }
 
-if ! is_overriding_api_base_url && ! prism_is_running ; then
+if ! is_overriding_api_base_url && ! steady_is_running ; then
   # When we exit this script, make sure to kill the background mock server process
   trap 'kill_server_on_port 4010' EXIT
 
@@ -36,19 +36,19 @@ fi
 if is_overriding_api_base_url ; then
   echo -e "${GREEN}✔ Running tests against ${TEST_API_BASE_URL}${NC}"
   echo
-elif ! prism_is_running ; then
-  echo -e "${RED}ERROR:${NC} The test suite will not run without a mock Prism server"
+elif ! steady_is_running ; then
+  echo -e "${RED}ERROR:${NC} The test suite will not run without a mock Steady server"
   echo -e "running against your OpenAPI spec."
   echo
   echo -e "To run the server, pass in the path or url of your OpenAPI"
-  echo -e "spec to the prism command:"
+  echo -e "spec to the steady command:"
   echo
-  echo -e "  \$ ${YELLOW}npm exec --package=@stainless-api/prism-cli@5.15.0 -- prism mock path/to/your.openapi.yml${NC}"
+  echo -e "  \$ ${YELLOW}npm exec --package=@stdy/cli@0.19.3 -- steady path/to/your.openapi.yml --host 127.0.0.1 -p 4010 --validator-query-array-format=brackets --validator-query-object-format=brackets${NC}"
   echo
 
   exit 1
 else
-  echo -e "${GREEN}✔ Mock prism server is running with your OpenAPI spec${NC}"
+  echo -e "${GREEN}✔ Mock steady server is running with your OpenAPI spec${NC}"
   echo
 fi
 

tests/api_resources/channels/test_bulk.py

@@ -18,7 +18,6 @@
 class TestBulk:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     def test_method_update_message_status(self, client: Knock) -> None:
         bulk = client.channels.bulk.update_message_status(
@@ -27,7 +26,6 @@ def test_method_update_message_status(self, client: Knock) -> None:
         )
         assert_matches_type(BulkOperation, bulk, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     def test_method_update_message_status_with_all_params(self, client: Knock) -> None:
         bulk = client.channels.bulk.update_message_status(
@@ -46,7 +44,6 @@ def test_method_update_message_status_with_all_params(self, client: Knock) -> No
         )
         assert_matches_type(BulkOperation, bulk, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     def test_raw_response_update_message_status(self, client: Knock) -> None:
         response = client.channels.bulk.with_raw_response.update_message_status(
@@ -59,7 +56,6 @@ def test_raw_response_update_message_status(self, client: Knock) -> None:
         bulk = response.parse()
         assert_matches_type(BulkOperation, bulk, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     def test_streaming_response_update_message_status(self, client: Knock) -> None:
         with client.channels.bulk.with_streaming_response.update_message_status(
@@ -74,7 +70,6 @@ def test_streaming_response_update_message_status(self, client: Knock) -> None:
 
         assert cast(Any, response.is_closed) is True
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     def test_path_params_update_message_status(self, client: Knock) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `channel_id` but received ''"):
@@ -89,7 +84,6 @@ class TestAsyncBulk:
         "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
     )
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     async def test_method_update_message_status(self, async_client: AsyncKnock) -> None:
         bulk = await async_client.channels.bulk.update_message_status(
@@ -98,7 +92,6 @@ async def test_method_update_message_status(self, async_client: AsyncKnock) -> N
         )
         assert_matches_type(BulkOperation, bulk, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     async def test_method_update_message_status_with_all_params(self, async_client: AsyncKnock) -> None:
         bulk = await async_client.channels.bulk.update_message_status(
@@ -117,7 +110,6 @@ async def test_method_update_message_status_with_all_params(self, async_client:
         )
         assert_matches_type(BulkOperation, bulk, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     async def test_raw_response_update_message_status(self, async_client: AsyncKnock) -> None:
         response = await async_client.channels.bulk.with_raw_response.update_message_status(
@@ -130,7 +122,6 @@ async def test_raw_response_update_message_status(self, async_client: AsyncKnock
         bulk = await response.parse()
         assert_matches_type(BulkOperation, bulk, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     async def test_streaming_response_update_message_status(self, async_client: AsyncKnock) -> None:
         async with async_client.channels.bulk.with_streaming_response.update_message_status(
@@ -145,7 +136,6 @@ async def test_streaming_response_update_message_status(self, async_client: Asyn
 
         assert cast(Any, response.is_closed) is True
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     async def test_path_params_update_message_status(self, async_client: AsyncKnock) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `channel_id` but received ''"):

tests/api_resources/integrations/test_census.py

@@ -17,7 +17,6 @@
 class TestCensus:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     def test_method_custom_destination(self, client: Knock) -> None:
         census = client.integrations.census.custom_destination(
@@ -27,7 +26,6 @@ def test_method_custom_destination(self, client: Knock) -> None:
         )
         assert_matches_type(CensusCustomDestinationResponse, census, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     def test_method_custom_destination_with_all_params(self, client: Knock) -> None:
         census = client.integrations.census.custom_destination(
@@ -38,7 +36,6 @@ def test_method_custom_destination_with_all_params(self, client: Knock) -> None:
         )
         assert_matches_type(CensusCustomDestinationResponse, census, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     def test_raw_response_custom_destination(self, client: Knock) -> None:
         response = client.integrations.census.with_raw_response.custom_destination(
@@ -52,7 +49,6 @@ def test_raw_response_custom_destination(self, client: Knock) -> None:
         census = response.parse()
         assert_matches_type(CensusCustomDestinationResponse, census, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     def test_streaming_response_custom_destination(self, client: Knock) -> None:
         with client.integrations.census.with_streaming_response.custom_destination(
@@ -74,7 +70,6 @@ class TestAsyncCensus:
         "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
     )
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     async def test_method_custom_destination(self, async_client: AsyncKnock) -> None:
         census = await async_client.integrations.census.custom_destination(
@@ -84,7 +79,6 @@ async def test_method_custom_destination(self, async_client: AsyncKnock) -> None
         )
         assert_matches_type(CensusCustomDestinationResponse, census, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     async def test_method_custom_destination_with_all_params(self, async_client: AsyncKnock) -> None:
         census = await async_client.integrations.census.custom_destination(
@@ -95,7 +89,6 @@ async def test_method_custom_destination_with_all_params(self, async_client: Asy
         )
         assert_matches_type(CensusCustomDestinationResponse, census, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     async def test_raw_response_custom_destination(self, async_client: AsyncKnock) -> None:
         response = await async_client.integrations.census.with_raw_response.custom_destination(
@@ -109,7 +102,6 @@ async def test_raw_response_custom_destination(self, async_client: AsyncKnock) -
         census = await response.parse()
         assert_matches_type(CensusCustomDestinationResponse, census, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     async def test_streaming_response_custom_destination(self, async_client: AsyncKnock) -> None:
         async with async_client.integrations.census.with_streaming_response.custom_destination(

tests/api_resources/integrations/test_hightouch.py

@@ -17,7 +17,6 @@
 class TestHightouch:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     def test_method_embedded_destination(self, client: Knock) -> None:
         hightouch = client.integrations.hightouch.embedded_destination(
@@ -27,7 +26,6 @@ def test_method_embedded_destination(self, client: Knock) -> None:
         )
         assert_matches_type(HightouchEmbeddedDestinationResponse, hightouch, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     def test_method_embedded_destination_with_all_params(self, client: Knock) -> None:
         hightouch = client.integrations.hightouch.embedded_destination(
@@ -38,7 +36,6 @@ def test_method_embedded_destination_with_all_params(self, client: Knock) -> Non
         )
         assert_matches_type(HightouchEmbeddedDestinationResponse, hightouch, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     def test_raw_response_embedded_destination(self, client: Knock) -> None:
         response = client.integrations.hightouch.with_raw_response.embedded_destination(
@@ -52,7 +49,6 @@ def test_raw_response_embedded_destination(self, client: Knock) -> None:
         hightouch = response.parse()
         assert_matches_type(HightouchEmbeddedDestinationResponse, hightouch, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     def test_streaming_response_embedded_destination(self, client: Knock) -> None:
         with client.integrations.hightouch.with_streaming_response.embedded_destination(
@@ -74,7 +70,6 @@ class TestAsyncHightouch:
         "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
     )
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     async def test_method_embedded_destination(self, async_client: AsyncKnock) -> None:
         hightouch = await async_client.integrations.hightouch.embedded_destination(
@@ -84,7 +79,6 @@ async def test_method_embedded_destination(self, async_client: AsyncKnock) -> No
         )
         assert_matches_type(HightouchEmbeddedDestinationResponse, hightouch, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     async def test_method_embedded_destination_with_all_params(self, async_client: AsyncKnock) -> None:
         hightouch = await async_client.integrations.hightouch.embedded_destination(
@@ -95,7 +89,6 @@ async def test_method_embedded_destination_with_all_params(self, async_client: A
         )
         assert_matches_type(HightouchEmbeddedDestinationResponse, hightouch, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     async def test_raw_response_embedded_destination(self, async_client: AsyncKnock) -> None:
         response = await async_client.integrations.hightouch.with_raw_response.embedded_destination(
@@ -109,7 +102,6 @@ async def test_raw_response_embedded_destination(self, async_client: AsyncKnock)
         hightouch = await response.parse()
         assert_matches_type(HightouchEmbeddedDestinationResponse, hightouch, path=["response"])
 
-    @pytest.mark.skip(reason="Mock server doesn't support callbacks yet")
     @parametrize
     async def test_streaming_response_embedded_destination(self, async_client: AsyncKnock) -> None:
         async with async_client.integrations.hightouch.with_streaming_response.embedded_destination(