diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-10-10 21:30:13 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-10-10 21:30:13 +0200 |
| commit | 322b86da1f6b497d38fb346d233d64d97a5d2b14 (patch) | |
| tree | 146860a0d1ff4146c77eb6eaed660f053d8dda67 /tests | |
| parent | 8ce95413aa2fc6295100c5f5678ac39256c01083 (diff) | |
| parent | b2711371f1267a1314ccf1de976d5432c03a2357 (diff) | |
| download | forums-322b86da1f6b497d38fb346d233d64d97a5d2b14.tar forums-322b86da1f6b497d38fb346d233d64d97a5d2b14.tar.gz forums-322b86da1f6b497d38fb346d233d64d97a5d2b14.tar.bz2 forums-322b86da1f6b497d38fb346d233d64d97a5d2b14.tar.xz forums-322b86da1f6b497d38fb346d233d64d97a5d2b14.zip | |
Merge pull request #4476 from Nicofuma/ticket/14807
[ticket/14807] Updates dependencies
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/di/create_container_test.php | 2 | ||||
| -rw-r--r-- | tests/text_formatter/s9e/default_formatting_test.php | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php index 4dd0583ebe..aba7a3560b 100644 --- a/tests/di/create_container_test.php +++ b/tests/di/create_container_test.php @@ -73,8 +73,6 @@ namespace // Checks the construction of a dumped container $container = $this->builder->get_container(); $this->assertInstanceOf('phpbb_cache_container', $container); - $this->assertFalse($container->isFrozen()); - $container->getParameterBag(); // needed, otherwise the container is not marked as frozen $this->assertTrue($container->isFrozen()); } diff --git a/tests/text_formatter/s9e/default_formatting_test.php b/tests/text_formatter/s9e/default_formatting_test.php index a70528aba3..e25c3246b5 100644 --- a/tests/text_formatter/s9e/default_formatting_test.php +++ b/tests/text_formatter/s9e/default_formatting_test.php @@ -298,7 +298,7 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case ), array( "Emoji: \xF0\x9F\x98\x80", - 'Emoji: <img alt="' . "\xF0\x9F\x98\x80" . '" class="smilies" draggable="false" width="18" height="18" src="//twemoji.maxcdn.com/svg/1f600.svg">' + 'Emoji: <img alt="' . "\xF0\x9F\x98\x80" . '" class="smilies" draggable="false" width="18" height="18" src="//cdn.jsdelivr.net/emojione/assets/svg/1f600.svg">' ), array( "Emoji: \xF0\x9F\x98\x80", |