From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 27 May 2019 08:46:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.4
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=92a66835624acf6fd14f5adc5f8aab399658592e;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge remote-tracking branch 'origin/master' into 2.4
---

92a66835624acf6fd14f5adc5f8aab399658592e
diff --combined tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
index caa8929d,265e4205..9dee9891
--- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
@@@ -236,7 -236,7 +236,7 @@@ class EntryControllerTest extends Walla
          $this->logInAs('admin');
          $client = $this->getClient();
  
-         $url = 'http://www.aritylabs.com/post/106091708292/des-contr%C3%B4leurs-optionnels-gr%C3%A2ce-%C3%A0-constmissing';
+         $url = 'https://www.aritylabs.com/post/106091708292/des-contr%C3%B4leurs-optionnels-gr%C3%A2ce-%C3%A0-constmissing';
  
          $crawler = $client->request('GET', '/new');
  
@@@ -522,12 -522,9 +522,12 @@@
  
          $crawler = $client->followRedirect();
  
 -        $this->assertGreaterThan(1, $title = $crawler->filter('div[id=article] h1')->extract(['_text']));
 +        $title = $crawler->filter('div[id=article] h1')->extract(['_text']);
 +        $this->assertGreaterThan(1, $title);
          $this->assertContains('My updated title hehe :)', $title[0]);
 -        $this->assertSame(1, \count($stats = $crawler->filter('div[class=tools] ul[class=stats] li a[class=tool]')->extract(['_text'])));
 +
 +        $stats = $crawler->filter('div[class=tools] ul[class=stats] li a[class=tool]')->extract(['_text']);
 +        $this->assertCount(1, $stats);
          $this->assertNotContains('example.io', trim($stats[0]));
      }
  
@@@ -623,7 -620,7 +623,7 @@@
          $content->setMimetype('text/html');
          $content->setTitle('test title entry');
          $content->setContent('This is my content /o/');
 -        $content->setArchived(true);
 +        $content->updateArchived(true);
          $content->setLanguage('fr');
  
          $em->persist($content);
@@@ -776,7 -773,7 +776,7 @@@
  
          $entry = new Entry($this->getLoggedInUser());
          $entry->setUrl($this->url);
 -        $entry->setArchived(false);
 +        $entry->updateArchived(false);
          $this->getEntityManager()->persist($entry);
          $this->getEntityManager()->flush();
  
@@@ -987,13 -984,8 +987,13 @@@
          $client->request('GET', '/share/' . $content->getId());
          $this->assertSame(302, $client->getResponse()->getStatusCode());
  
 -        // follow link with uid
 -        $crawler = $client->followRedirect();
 +        $shareUrl = $client->getResponse()->getTargetUrl();
 +
 +        // use a new client to have a fresh empty session (instead of a logged one from the previous client)
 +        $client->restart();
 +
 +        $client->request('GET', $shareUrl);
 +
          $this->assertSame(200, $client->getResponse()->getStatusCode());
          $this->assertContains('max-age=25200', $client->getResponse()->headers->get('cache-control'));
          $this->assertContains('public', $client->getResponse()->headers->get('cache-control'));
@@@ -1009,6 -1001,9 +1009,6 @@@
          $client->request('GET', '/share/' . $content->getUid());
          $this->assertSame(404, $client->getResponse()->getStatusCode());
  
 -        $client->request('GET', '/view/' . $content->getId());
 -        $this->assertContains('no-cache', $client->getResponse()->headers->get('cache-control'));
 -
          // removing the share
          $client->request('GET', '/share/delete/' . $content->getId());
          $this->assertSame(302, $client->getResponse()->getStatusCode());
@@@ -1249,7 -1244,7 +1249,7 @@@
          $entry = new Entry($this->getLoggedInUser());
          $entry->setUrl('http://0.0.0.0/foo/baz/qux');
          $entry->setTitle('Le manège');
 -        $entry->setArchived(true);
 +        $entry->updateArchived(true);
          $this->getEntityManager()->persist($entry);
          $this->getEntityManager()->flush();
  
@@@ -1279,7 -1274,7 +1279,7 @@@
          $entry = new Entry($this->getLoggedInUser());
          $entry->setUrl('http://domain/qux');
          $entry->setTitle('Le manège');
 -        $entry->setArchived(true);
 +        $entry->updateArchived(true);
          $this->getEntityManager()->persist($entry);
          $this->getEntityManager()->flush();
  
@@@ -1330,6 -1325,10 +1330,6 @@@
                  'http://www.hao123.com/shequ?__noscript__-=1',
                  'zh_CN',
              ],
 -            'ru' => [
 -                'https://www.kp.ru/daily/26879.7/3921982/',
 -                'ru',
 -            ],
              'pt_BR' => [
                  'https://politica.estadao.com.br/noticias/eleicoes,campanha-catatonica,70002491983',
                  'pt_BR',
@@@ -1495,30 -1494,4 +1495,30 @@@
  
          $this->assertSame(sprintf('/remove-tag/%s/%s', $entry->getId(), $tag->getId()), $link);
      }
 +
 +    public function testRandom()
 +    {
 +        $this->logInAs('admin');
 +        $client = $this->getClient();
 +
 +        $client->request('GET', '/unread/random');
 +        $this->assertSame(302, $client->getResponse()->getStatusCode());
 +        $this->assertContains('/view/', $client->getResponse()->getTargetUrl(), 'Unread random');
 +
 +        $client->request('GET', '/starred/random');
 +        $this->assertSame(302, $client->getResponse()->getStatusCode());
 +        $this->assertContains('/view/', $client->getResponse()->getTargetUrl(), 'Starred random');
 +
 +        $client->request('GET', '/archive/random');
 +        $this->assertSame(302, $client->getResponse()->getStatusCode());
 +        $this->assertContains('/view/', $client->getResponse()->getTargetUrl(), 'Archive random');
 +
 +        $client->request('GET', '/untagged/random');
 +        $this->assertSame(302, $client->getResponse()->getStatusCode());
 +        $this->assertContains('/view/', $client->getResponse()->getTargetUrl(), 'Untagged random');
 +
 +        $client->request('GET', '/all/random');
 +        $this->assertSame(302, $client->getResponse()->getStatusCode());
 +        $this->assertContains('/view/', $client->getResponse()->getTargetUrl(), 'All random');
 +    }
  }