diff options
author | diosmosis <diosmosis@users.noreply.github.com> | 2019-01-07 03:52:42 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-07 03:52:42 +0300 |
commit | 4fc054b0219d4c1c35c47616536488d6ff10d0dd (patch) | |
tree | 8c27cb0ebb16adcf27803a8be9c285fbbfb31f1f /plugins/Marketplace | |
parent | d16f5b2de775cabcac62b518b1fa5f5908c5fd36 (diff) |
Update submodules. (#13936)
* Update submodules.
* Update expected files.
* Fix more integration tests.
* Update submodule.
* Update screenshots.
Diffstat (limited to 'plugins/Marketplace')
-rw-r--r-- | plugins/Marketplace/tests/Integration/UpdateCommunicationTest.php | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/plugins/Marketplace/tests/Integration/UpdateCommunicationTest.php b/plugins/Marketplace/tests/Integration/UpdateCommunicationTest.php index bb7f46fba7..4b1ab846fe 100644 --- a/plugins/Marketplace/tests/Integration/UpdateCommunicationTest.php +++ b/plugins/Marketplace/tests/Integration/UpdateCommunicationTest.php @@ -15,6 +15,7 @@ use Piwik\Plugins\CoreUpdater\SystemSettings; use Piwik\Plugins\Marketplace\UpdateCommunication; use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; +use Piwik\View; /** * @group Plugins @@ -117,23 +118,33 @@ class UpdateCommunicationTest extends IntegrationTestCase { $subject = 'CoreUpdater_NotificationSubjectAvailablePluginUpdate'; $rootUrl = Fixture::getTestRootUrl(); - $message = "ScheduledReports_EmailHello + $message = "<p>ScheduledReports_EmailHello</p> +<p>CoreUpdater_ThereIsNewPluginVersionAvailableForUpdate</p> -CoreUpdater_ThereIsNewPluginVersionAvailableForUpdate +<ul> +<li>MyTest1 33.0.0</li> +<li>MyTest2 32.0.0</li> +<li>MyTest3 31.0.0</li> +</ul> - * MyTest1 33.0.0 - * MyTest2 32.0.0 - * MyTest3 31.0.0 -CoreUpdater_NotificationClickToUpdatePlugins +<p> +CoreUpdater_NotificationClickToUpdatePlugins<br/> {$rootUrl}index.php?module=CorePluginsAdmin&action=plugins +</p> -Installation_HappyAnalysing"; +<p> +Installation_HappyAnalysing +</p> +"; $mock = $this->getCommunicationMockHavingManyUpdates(); $mock->expects($this->once())->method('sendEmailNotification') - ->with($this->equalTo($subject), $this->equalTo($message)); + ->with($this->equalTo($subject), $this->callback(function (View $view) use ($message) { + $this->assertEquals($message, $view->render()); + return true; + })); $mock->sendNotificationIfUpdatesAvailable(); } |