Ooof, got the dependencies all up to date as well

Lots of tests needed fixing, but it seemed to be a whitespace parsing
error in the view files 🤔

tests/Feature/ArticlesTest.php

@@ -15,19 +15,19 @@ class ArticlesTest extends TestCase
 
     public function test_single_article()
     {
-        $response = $this->get('/blog/' . date('Y') . '/' . date('m') . '/my-new-blog');
+        $response = $this->get('/blog/' . date('Y') . '/' . date('m') . '/some-code-i-did');
         $response->assertViewIs('articles.show');
     }
 
     public function test_wrong_date_redirects()
     {
-        $response = $this->get('/blog/1900/01/my-new-blog');
-        $response->assertRedirect('/blog/' . date('Y') . '/' . date('m') . '/my-new-blog');
+        $response = $this->get('/blog/1900/01/some-code-i-did');
+        $response->assertRedirect('/blog/' . date('Y') . '/' . date('m') . '/some-code-i-did');
     }
 
     public function test_redirect_for_id()
     {
-        $response = $this->get('/blog/s/1');
-        $response->assertRedirect('/blog/' . date('Y') . '/' . date('m') . '/my-new-blog');
+        $response = $this->get('/blog/s/2');
+        $response->assertRedirect('/blog/' . date('Y') . '/' . date('m') . '/some-code-i-did');
     }
 }

tests/Feature/BridgyPosseTest.php

@@ -8,7 +8,7 @@ class BridgyPosseTest extends TestCase
 {
     public function test_bridgy_twitter_content()
     {
-        $response = $this->get('/notes/E');
+        $response = $this->get('/notes/4');
 
         $html = $response->content();
         $this->assertTrue(is_string(mb_stristr($html, 'p-bridgy-twitter-content')));

tests/Feature/LikesTest.php

@@ -2,7 +2,9 @@
 
 namespace Tests\Feature;
 
+use Codebird\Codebird;
 use Queue;
+use stdClass;
 use Tests\TestCase;
 use App\Models\Like;
 use Tests\TestToken;
@@ -191,6 +193,7 @@ END;
         $handler = HandlerStack::create($mock);
         $client = new Client(['handler' => $handler]);
         $this->app->bind(Client::class, $client);
+
         $authorship = new Authorship();
 
         $job->handle($client, $authorship);

tests/Feature/MicropubControllerTest.php

@@ -676,7 +676,7 @@ class MicropubControllerTest extends TestCase
             '/api/post',
             [
                 'action' => 'update',
-                'url' => config('app.url') . '/notes/L',
+                'url' => config('app.url') . '/notes/B',
                 'replace' => [
                     'syndication' => [
                         'https://www.swarmapp.com/checkin/the-id',

tests/Unit/ArticlesTest.php

@@ -58,7 +58,7 @@ class ArticlesTest extends TestCase
     public function test_date_scope()
     {
         $yearAndMonth = Article::date(date('Y'), date('m'))->get();
-        $this->assertTrue(count($yearAndMonth) === 2);
+        $this->assertTrue(count($yearAndMonth) === 1);
 
         $monthDecember = Article::date(date('Y') - 1, 12)->get();
         $this->assertTrue(count($monthDecember) === 0);

tests/Unit/NotesTest.php

@@ -8,7 +8,6 @@ use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use App\Models\{Media, Note, Tag};
 use GuzzleHttp\Handler\MockHandler;
-use Thujohn\Twitter\Facades\Twitter;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class NotesTest extends TestCase
@@ -24,7 +23,7 @@ class NotesTest extends TestCase
     public function test_get_note_attribute_method()
     {
         $expected = '<p>Having a <a rel="tag" class="p-category" href="/notes/tagged/beer">#beer</a> at the local. <span role="img" aria-label="beer mug">🍺</span></p>' . PHP_EOL;
-        $note = Note::find(12);
+        $note = Note::find(2);
         $this->assertEquals($expected, $note->note);
     }
 
@@ -36,7 +35,7 @@ class NotesTest extends TestCase
     public function test_default_image_used_in_makehcards_method()
     {
         $expected = '<p>Hi <span class="u-category h-card mini-h-card"><a class="u-url p-name" href="http://tantek.com">Tantek Çelik</a><span class="hovercard"> <a class="u-url" href="https://twitter.com/t"><img class="social-icon" src="/assets/img/social-icons/twitter.svg"> t</a><img class="u-photo" alt="" src="/assets/profile-images/default-image"></span></span></p>' . PHP_EOL;
-        $note = Note::find(14);
+        $note = Note::find(4);
         $this->assertEquals($expected, $note->note);
     }
 
@@ -48,7 +47,7 @@ class NotesTest extends TestCase
     public function test_specific_profile_image_used_in_makehcards_method()
     {
         $expected = '<p>Hi <span class="u-category h-card mini-h-card"><a class="u-url p-name" href="https://aaronparecki.com">Aaron Parecki</a><span class="hovercard"><a class="u-url" href="https://www.facebook.com/123456"><img class="social-icon" src="/assets/img/social-icons/facebook.svg"> Facebook</a> <img class="u-photo" alt="" src="/assets/profile-images/aaronparecki.com/image"></span></span></p>' . PHP_EOL;
-        $note = Note::find(15);
+        $note = Note::find(5);
         $this->assertEquals($expected, $note->note);
     }
 
@@ -60,7 +59,7 @@ class NotesTest extends TestCase
     public function test_twitter_link_created_when_no_contact_found()
     {
         $expected = '<p>Hi <a href="https://twitter.com/bob">@bob</a></p>' . PHP_EOL;
-        $note = Note::find(16);
+        $note = Note::find(6);
         $this->assertEquals($expected, $note->note);
     }
 
@@ -72,7 +71,7 @@ class NotesTest extends TestCase
 
     public function test_latlng_of_associated_place()
     {
-        $note = Note::find(12); // should be having beer at bridgewater note
+        $note = Note::find(2); // should be having beer at bridgewater note
         $this->assertEquals('53.4983', $note->latitude);
         $this->assertEquals('-2.3805', $note->longitude);
     }
@@ -86,7 +85,7 @@ class NotesTest extends TestCase
 
     public function test_address_attribute_for_places()
     {
-        $note = Note::find(12);
+        $note = Note::find(2);
         $this->assertEquals('The Bridgewater Pub', $note->address);
     }
 
@@ -280,12 +279,8 @@ JSON;
     /** @test */
     public function twitter_content_is_null_when_oembed_error_occurs()
     {
-        Twitter::shouldReceive('getOembed')
-            ->once()
-            ->andThrow('Exception');
-
         $note = new Note();
-        $note->in_reply_to = 'https://twitter.com/foo';
+        $note->in_reply_to = 'https://twitter.com/search';
 
         $this->assertNull($note->twitter);
     }

tests/Unit/WebMentionTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests\Unit;
 
+use Codebird\Codebird;
 use Tests\TestCase;
 use App\Models\WebMention;
 use Thujohn\Twitter\Facades\Twitter;
@@ -94,18 +95,21 @@ class WebMentionTest extends TestCase
 
     public function test_create_photo_link_with_noncached_twitter_url()
     {
+        $info = new \stdClass();
+        $info->profile_image_url_https = 'https://pbs.twimg.com/static_profile_link.jpg';
+        $codebirdMock = $this->getMockBuilder(Codebird::class)
+            ->addMethods(['users_show'])
+            ->getMock();
+        $codebirdMock->method('users_show')
+            ->willReturn($info);
+        $this->app->instance(Codebird::class, $codebirdMock);
+
         Cache::shouldReceive('has')
                     ->once()
                     ->andReturn(false);
         Cache::shouldReceive('put')
                     ->once()
                     ->andReturn(true);
-        $info = new \stdClass();
-        $info->profile_image_url_https = 'https://pbs.twimg.com/static_profile_link.jpg';
-        Twitter::shouldReceive('getUsers')
-                    ->once()
-                    ->with(['screen_name' => 'example'])
-                    ->andReturn($info);
 
         $webmention = new WebMention();
         $twitterURL = 'https://twitter.com/example';