]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge pull request #3425 from wallabag/add-setting-for-headers
authorNicolas LÅ“uillet <nicolas@loeuillet.org>
Tue, 21 Nov 2017 12:26:24 +0000 (13:26 +0100)
committerGitHub <noreply@github.com>
Tue, 21 Nov 2017 12:26:24 +0000 (13:26 +0100)
Added internal setting to enable/disable headers storage

1  2 
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php

index c6a523e3f98fd7cb9679ef96b22c9c8b1f4ddb3a,2a2fd1a4c80086037f1659fc3dc16816cbe92bf0..4ac4548b2624b2f75035e525a4f4e0fb5ec577f9
@@@ -137,6 -137,8 +137,8 @@@ class EntryControllerTest extends Walla
          $this->logInAs('admin');
          $client = $this->getClient();
  
+         $client->getContainer()->get('craue_config')->set('store_article_headers', 1);
          $crawler = $client->request('GET', '/new');
  
          $this->assertSame(200, $client->getResponse()->getStatusCode());
          $this->assertSame('2015-03-28 11:43:19', $content->getPublishedAt()->format('Y-m-d H:i:s'));
          $this->assertSame('Morgane Tual', $author[0]);
          $this->assertArrayHasKey('x-varnish1', $content->getHeaders());
+         $client->getContainer()->get('craue_config')->set('store_article_headers', 0);
      }
  
      public function testPostWithMultipleAuthors()
  
          $data = [
              'entry[title]' => 'My updated title hehe :)',
 +            'entry[origin_url]' => 'https://example.io',
          ];
  
          $client->submit($form, $data);
  
          $crawler = $client->followRedirect();
  
 -        $this->assertGreaterThan(1, $alert = $crawler->filter('div[id=article] h1')->extract(['_text']));
 -        $this->assertContains('My updated title hehe :)', $alert[0]);
 +        $this->assertGreaterThan(1, $title = $crawler->filter('div[id=article] h1')->extract(['_text']));
 +        $this->assertContains('My updated title hehe :)', $title[0]);
 +        $this->assertGreaterThan(1, $stats = $crawler->filter('div[class=tools] ul[class=stats] li a[class=tool]')->extract(['_text']));
 +        $this->assertContains('example.io', trim($stats[1]));
 +    }
 +
 +    public function testEditRemoveOriginUrl()
 +    {
 +        $this->logInAs('admin');
 +        $client = $this->getClient();
 +
 +        $entry = new Entry($this->getLoggedInUser());
 +        $entry->setUrl($this->url);
 +        $this->getEntityManager()->persist($entry);
 +        $this->getEntityManager()->flush();
 +
 +        $crawler = $client->request('GET', '/edit/' . $entry->getId());
 +
 +        $this->assertSame(200, $client->getResponse()->getStatusCode());
 +
 +        $form = $crawler->filter('button[type=submit]')->form();
 +
 +        $data = [
 +            'entry[title]' => 'My updated title hehe :)',
 +            'entry[origin_url]' => '',
 +        ];
 +
 +        $client->submit($form, $data);
 +
 +        $this->assertSame(302, $client->getResponse()->getStatusCode());
 +
 +        $crawler = $client->followRedirect();
 +
 +        $this->assertGreaterThan(1, $title = $crawler->filter('div[id=article] h1')->extract(['_text']));
 +        $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'])));
 +        $this->assertNotContains('example.io', trim($stats[0]));
      }
  
      public function testToggleArchive()