Merge pull request #268 from EasyPost/fix_report_params_payload_sleep

fix: event type param, payload test sleep
EasyPost · Feb 16, 2023 · 107596b · 107596b
2 parents 4818cc0 + 274265a
commit 107596b
Show file tree

Hide file tree

Showing 9 changed files with 414 additions and 473 deletions.
diff --git a/lib/EasyPost/Service/ReportService.php b/lib/EasyPost/Service/ReportService.php
@@ -38,6 +38,7 @@ public function all($params = null)
             $type = $params['type'];
             self::validate($params);
             $url = self::reportUrl($type);
+            unset($params['type']);
             $response = Requestor::request($this->client, 'get', $url, $params);
 
             return InternalUtil::convertToEasyPostObject($this->client, $response);
@@ -86,6 +87,6 @@ private function reportUrl($type)
         $type = str_replace('_report', '', $type);
         $name = urlencode($type);
 
-        return "/reports/{$name}/";
+        return "/reports/{$name}";
     }
 }
diff --git a/test/EasyPost/EventTest.php b/test/EasyPost/EventTest.php
@@ -100,10 +100,10 @@ public function testReceiveNoInput()
      */
     public function testRetrieveAllPayloads()
     {
-        $cassetteName = 'batches/retrieve_all_payloads.yml';
+        $cassetteName = 'events/retrieve_all_payloads.yml';
         $testRequiresWait = true ? file_exists(dirname(__DIR__, 1) . "/cassettes/$cassetteName") === false : false;
 
-        TestUtil::setupCassette('events/retrieve_all_payloads.yml');
+        TestUtil::setupCassette($cassetteName);
 
         // Create a webhook to receive the event.
         $webhook = self::$client->webhook->create([
@@ -140,10 +140,10 @@ public function testRetrieveAllPayloads()
      */
     public function testRetrievePayload()
     {
-        $cassetteName = 'batches/retrieve_all_payloads.yml';
+        $cassetteName = 'events/retrieve_payload.yml';
         $testRequiresWait = true ? file_exists(dirname(__DIR__, 1) . "/cassettes/$cassetteName") === false : false;
 
-        TestUtil::setupCassette('events/retrieve_payload.yml');
+        TestUtil::setupCassette($cassetteName);
 
         // Create a webhook to receive the event.
         $webhook = self::$client->webhook->create([
@@ -166,10 +166,10 @@ public function testRetrievePayload()
 
         // Payload does not exist due to queueing, so this will throw en exception.
         try {
-             self::$client->event->retrievePayload(
-                 $event->id,
-                 'payload_11111111111111111111111111111111',
-             );
+            self::$client->event->retrievePayload(
+                $event->id,
+                'payload_11111111111111111111111111111111',
+            );
         } catch (EasyPostException $error) {
             $this->assertEquals(404, $error->getHttpStatus());
         }

diff --git a/test/cassettes/events/retrieve_all_payloads.yml b/test/cassettes/events/retrieve_all_payloads.yml
diff --git a/test/cassettes/events/retrieve_payload.yml b/test/cassettes/events/retrieve_payload.yml
diff --git a/test/cassettes/reports/all.yml b/test/cassettes/reports/all.yml
diff --git a/test/cassettes/reports/createCustomAdditionalColumnReport.yml b/test/cassettes/reports/createCustomAdditionalColumnReport.yml
diff --git a/test/cassettes/reports/createCustomColumnReport.yml b/test/cassettes/reports/createCustomColumnReport.yml