diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-09-16 19:45:37 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-09-16 19:45:37 +0200 |
| commit | b6d72e0c91be648208f8ee881876b11684c3247d (patch) | |
| tree | e69798d20213b54b76ee5f95c0ef36ea3bf25cea /tests/Wallabag | |
| parent | 7083c0a21d27e7e1bf45a9807a76844116d61fb8 (diff) | |
| parent | 8013f35d96c42b15c1da28cdff40e97289ad4e25 (diff) | |
| download | wallabag-b6d72e0c91be648208f8ee881876b11684c3247d.tar.gz wallabag-b6d72e0c91be648208f8ee881876b11684c3247d.tar.zst wallabag-b6d72e0c91be648208f8ee881876b11684c3247d.zip | |
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'tests/Wallabag')
| -rw-r--r-- | tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php index 6a4c775b..3d599ec8 100644 --- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php | |||
| @@ -1325,12 +1325,12 @@ class EntryControllerTest extends WallabagCoreTestCase | |||
| 1325 | 'http://www.hao123.com/shequ?__noscript__-=1', | 1325 | 'http://www.hao123.com/shequ?__noscript__-=1', |
| 1326 | 'zh_CN', | 1326 | 'zh_CN', |
| 1327 | ], | 1327 | ], |
| 1328 | 'ru_RU' => [ | 1328 | 'ru' => [ |
| 1329 | 'http://netler.ru/ikt/windows-error-reporting.htm', | 1329 | 'https://www.kp.ru/daily/26879.7/3921982/', |
| 1330 | 'ru_RU', | 1330 | 'ru', |
| 1331 | ], | 1331 | ], |
| 1332 | 'pt_BR' => [ | 1332 | 'pt_BR' => [ |
| 1333 | 'http://precodoscombustiveis.com.br/postos/cidade/4121/pr/maringa', | 1333 | 'https://politica.estadao.com.br/noticias/eleicoes,campanha-catatonica,70002491983', |
| 1334 | 'pt_BR', | 1334 | 'pt_BR', |
| 1335 | ], | 1335 | ], |
| 1336 | 'fucked_list_of_languages' => [ | 1336 | 'fucked_list_of_languages' => [ |