diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-06-09 10:07:27 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-06-09 10:07:27 +0200 |
| commit | 1a94252831638cf41f0fe489939dee9dae1c1251 (patch) | |
| tree | be546222138d6dcbadb04dd683313126daa52939 | |
| parent | 80f4d85ac92ab4dc490c51f2d831ac7fa3853826 (diff) | |
| download | wallabag-1a94252831638cf41f0fe489939dee9dae1c1251.tar.gz wallabag-1a94252831638cf41f0fe489939dee9dae1c1251.tar.zst wallabag-1a94252831638cf41f0fe489939dee9dae1c1251.zip | |
Promote https
| -rw-r--r-- | app/config/parameters.yml.dist | 2 | ||||
| -rw-r--r-- | tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index d827219a..914fb1ef 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
| @@ -23,7 +23,7 @@ parameters: | |||
| 23 | # with PostgreSQL and SQLite, you must set "utf8" | 23 | # with PostgreSQL and SQLite, you must set "utf8" |
| 24 | database_charset: utf8mb4 | 24 | database_charset: utf8mb4 |
| 25 | 25 | ||
| 26 | domain_name: http://your-wallabag-url-instance.com | 26 | domain_name: https://your-wallabag-url-instance.com |
| 27 | 27 | ||
| 28 | mailer_transport: smtp | 28 | mailer_transport: smtp |
| 29 | mailer_host: 127.0.0.1 | 29 | mailer_host: 127.0.0.1 |
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php index 581ee952..4ffe02de 100644 --- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php | |||
| @@ -1000,7 +1000,7 @@ class EntryControllerTest extends WallabagCoreTestCase | |||
| 1000 | $this->assertEquals($url, $entry->getUrl()); | 1000 | $this->assertEquals($url, $entry->getUrl()); |
| 1001 | $this->assertContains('Perpignan', $entry->getTitle()); | 1001 | $this->assertContains('Perpignan', $entry->getTitle()); |
| 1002 | // instead of checking for the filename (which might change) check that the image is now local | 1002 | // instead of checking for the filename (which might change) check that the image is now local |
| 1003 | $this->assertContains('http://your-wallabag-url-instance.com/assets/images/', $entry->getContent()); | 1003 | $this->assertContains('https://your-wallabag-url-instance.com/assets/images/', $entry->getContent()); |
| 1004 | 1004 | ||
| 1005 | $client->getContainer()->get('craue_config')->set('download_images_enabled', 0); | 1005 | $client->getContainer()->get('craue_config')->set('download_images_enabled', 0); |
| 1006 | } | 1006 | } |