fix: oembed query not working (#345)

atymic · Apr 15, 2021 · fec288a · fec288a
1 parent 335feed
commit fec288a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.1.3]
+
+### Fixed
+
+Fixed `getOembed` querying the wrong hostname/endpoint [#345](https://github.com/atymic/twitter/pull/345)
+
+
 ## [3.1.2]
 
 ### Fixed

diff --git a/src/ApiV1/Traits/StatusTrait.php b/src/ApiV1/Traits/StatusTrait.php
@@ -221,11 +221,7 @@ public function getOembed($parameters = [])
             throw new BadMethodCallException('Parameter required missing : url');
         }
 
-        // TODO re-implement this
-        $this->tconfig['API_URL'] = 'publish.twitter.com';
-        $this->tconfig['API_VERSION'] = '';
-
-        return $this->get('oembed', $parameters);
+        return $this->directQuery('https://publish.twitter.com/oembed', 'GET', $parameters);
     }
 
     /**

diff --git a/tests/Unit/ApiV1/Service/TwitterTest.php b/tests/Unit/ApiV1/Service/TwitterTest.php
@@ -26,7 +26,7 @@ final class TwitterTest extends TestCase
      */
     public function testGetUsersWithScreenName(): void
     {
-        $twitter = $this->getTwitterExpecting(
+        $twitter = $this->getTwitterExpectingQueryCall(
             'users/show',
             [
                 'screen_name' => 'my_screen_name',
@@ -46,7 +46,7 @@ public function testGetUsersWithScreenName(): void
      */
     public function testGetUsersWithId(): void
     {
-        $twitter = $this->getTwitterExpecting(
+        $twitter = $this->getTwitterExpectingQueryCall(
             'users/show',
             [
                 'user_id' => 1234567890,
@@ -83,7 +83,7 @@ public function testGetUsersInvalid(): void
      */
     public function testGetUsersLookupWithIds(): void
     {
-        $twitter = $this->getTwitterExpecting(
+        $twitter = $this->getTwitterExpectingQueryCall(
             'users/lookup',
             [
                 'user_id' => '1,2,3,4',
@@ -103,7 +103,7 @@ public function testGetUsersLookupWithIds(): void
      */
     public function testGetUsersLookupWithScreenNames(): void
     {
-        $twitter = $this->getTwitterExpecting(
+        $twitter = $this->getTwitterExpectingQueryCall(
             'users/lookup',
             [
                 'screen_name' => 'me,you,everybody',
@@ -305,12 +305,15 @@ public function providerGetListMemberBad(): array
      */
     public function testGetOembed(): void
     {
-        $twitter = $this->getTwitterExpecting(
-            'oembed',
-            [
-                'url' => 'https://twitter.com/jxeeno/status/1343506068236689408',
-            ]
-        );
+        $twitter = $this->getTwitter();
+
+        $twitter->expects(self::once())
+            ->method('directQuery')
+            ->with(
+                'https://publish.twitter.com/oembed',
+                'GET',
+                ['url' => 'https://twitter.com/jxeeno/status/1343506068236689408']
+            );
 
         $twitter->getOembed(['url' => 'https://twitter.com/jxeeno/status/1343506068236689408']);
     }
@@ -322,7 +325,7 @@ public function testGetOembed(): void
     protected function getTwitter(): MockObject
     {
         return $this->getMockBuilder(Twitter::class)
-            ->onlyMethods(['query'])
+            ->onlyMethods(['query', 'directQuery'])
             ->disableOriginalConstructor()
             ->getMock();
     }
@@ -331,7 +334,7 @@ protected function getTwitter(): MockObject
      * @return MockObject|Twitter
      * @throws Exception
      */
-    protected function getTwitterExpecting(string $endpoint, array $queryParams): MockObject
+    protected function getTwitterExpectingQueryCall(string $endpoint, array $queryParams): MockObject
     {
         $twitter = $this->getTwitter();
         $twitter->expects(self::once())
@@ -350,7 +353,7 @@ protected function getTwitterExpecting(string $endpoint, array $queryParams): Mo
      */
     private function paramTest(string $endpoint, string $testedMethod, array $params): void
     {
-        $twitter = $this->getTwitterExpecting($endpoint, $params);
+        $twitter = $this->getTwitterExpectingQueryCall($endpoint, $params);
 
         $twitter->{$testedMethod}($params);
     }