diff --git a/config/schema/simplenews.schema.yml b/config/schema/simplenews.schema.yml index 24f6c6a..5f949e2 100644 --- a/config/schema/simplenews.schema.yml +++ b/config/schema/simplenews.schema.yml @@ -232,16 +232,6 @@ field.value.simplenews_subscription: block.settings.simplenews_subscription_block: type: block_settings mapping: - cache: - type: mapping - label: Cache - mapping: - max-age: - type: integer - label: Maximum Age - contexts: - type: sequence - label: Contexts newsletters: type: sequence label: Newsletters diff --git a/modules/simplenews_demo/config/install/block.block.simplenewssubscription.yml b/modules/simplenews_demo/config/install/block.block.simplenewssubscription.yml index 505e3b1..cf20d6f 100644 --- a/modules/simplenews_demo/config/install/block.block.simplenewssubscription.yml +++ b/modules/simplenews_demo/config/install/block.block.simplenewssubscription.yml @@ -3,8 +3,6 @@ status: true dependencies: module: - simplenews -# theme: -# - bartik id: simplenewssubscription theme: bartik region: sidebar_first @@ -18,7 +16,6 @@ settings: label_display: visible cache: max_age: 0 - contexts: { } newsletters: default: 'default' message: 'Stay informed - subscribe to our newsletter.' diff --git a/modules/simplenews_demo/config/install/block.block.simplenewssubscription_all.yml b/modules/simplenews_demo/config/install/block.block.simplenewssubscription_all.yml index 7c551a0..3a4ca4d 100644 --- a/modules/simplenews_demo/config/install/block.block.simplenewssubscription_all.yml +++ b/modules/simplenews_demo/config/install/block.block.simplenewssubscription_all.yml @@ -3,8 +3,6 @@ status: true dependencies: module: - simplenews -# theme: -# - bartik id: simplenewssubscription_all theme: bartik region: sidebar_first @@ -18,7 +16,6 @@ settings: label_display: visible cache: max_age: 0 - contexts: { } newsletters: weekly_content_update: weekly_content_update special_offers: special_offers diff --git a/modules/simplenews_demo/simplenews_demo.install b/modules/simplenews_demo/simplenews_demo.install index e082083..ca942f3 100644 --- a/modules/simplenews_demo/simplenews_demo.install +++ b/modules/simplenews_demo/simplenews_demo.install @@ -19,6 +19,11 @@ function simplenews_demo_install() { \Drupal::service('router.builder')->rebuild(); + // Set the default theme as active. + $theme = Drupal::theme(); + $default_theme = Drupal::config('system.theme'); +// $theme->setActiveTheme(); + // Set the default values for test_address, from_address and from_name. $site_mail = \Drupal::config('system.site')->get('mail'); $site_name = \Drupal::config('system.site')->get('name'); diff --git a/modules/simplenews_demo/src/Tests/SimplenewsDemoTest.php b/modules/simplenews_demo/src/Tests/SimplenewsDemoTest.php index 65f8cb9..4674f7a 100644 --- a/modules/simplenews_demo/src/Tests/SimplenewsDemoTest.php +++ b/modules/simplenews_demo/src/Tests/SimplenewsDemoTest.php @@ -27,7 +27,11 @@ class SimplenewsDemoTest extends WebTestBase { */ function setUp() { parent::setUp(); - + // Install bartik theme. + \Drupal::service('theme_handler')->install(array('bartik')); + $theme_settings = $this->config('system.theme'); + $theme_settings->set('default', 'bartik')->save(); + // Log in with all relevant permissions. $this->drupalLogin($this->drupalCreateUser(['administer simplenews subscriptions', 'send newsletter', 'administer newsletters', 'administer simplenews settings'])); } @@ -35,7 +39,7 @@ class SimplenewsDemoTest extends WebTestBase { * Asserts the demo instructions on the frontpage. */ protected function testInstalled() { - $this->drupalGet('/admin/config/services/simplenews'); + $this->drupalGet('admin/config/services/simplenews'); $this->clickLink(t('Edit')); // Assert default Description is present. $this->assertEqual('This is an example newsletter. Change it.', (string) $this->xpath('//textarea[@id="edit-description"]')[0]); @@ -44,17 +48,23 @@ class SimplenewsDemoTest extends WebTestBase { $this->assertEqual('Drupal', (string) $from_name['value']); $this->assertEqual('simpletest@example.com', (string) $from_address['value']); // Assert demo newsletters. - $this->drupalGet('/admin/config/services/simplenews'); + $this->drupalGet('admin/config/services/simplenews'); $this->assertText(t('Press releases')); $this->assertText(t('Special offers')); $this->assertText(t('Weekly content update')); // Assert demo newsletters sent. - $this->drupalGet('/admin/content/simplenews'); + $this->drupalGet('admin/content/simplenews'); + $this->assertText('Scheduled weekly content newsletter issue'); + $this->assertText('Sent press releases'); + $this->assertText('Unpublished press releases'); + $this->assertText('Pending special offers'); + $this->assertText('Stopped special offers'); + $this->assertText('Scheduled weekly content newsletter issue - Week '); $this->assertRaw(t('Newsletter issue sent to 2 subscribers.')); - $this->assertRaw(t('Newsletter issue is pending, mails sent out of 3.')); - $this->assertRaw(t('Newsletter issue is pending, mails sent out of 1.')); + $this->assertRaw(t('Newsletter issue is pending, 0 mails sent out of 3.')); + $this->assertRaw(t('Newsletter issue is pending, 0 mails sent out of 1.')); // Assert demo subscribers. - $this->drupalGet('/admin/people/simplenews'); + $this->drupalGet('admin/people/simplenews'); $this->assertText('a@example.com'); $this->assertText('b@example.com'); $this->assertText('demouser1@example.com'); diff --git a/src/Plugin/views/field/SendStatus.php b/src/Plugin/views/field/SendStatus.php index 45d88dc..509c6de 100644 --- a/src/Plugin/views/field/SendStatus.php +++ b/src/Plugin/views/field/SendStatus.php @@ -56,7 +56,7 @@ class SendStatus extends FieldPluginBase { */ protected function getMessage($node) { $status = $node->simplenews_issue->status; - $sent_count = $node->simplenews_issue->sent_count; + $sent_count = (int) $node->simplenews_issue->sent_count; $published = $node->isPublished(); $subscriber_count = $node->simplenews_issue->status == SIMPLENEWS_STATUS_SEND_READY ? $node->simplenews_issue->subscribers : simplenews_count_subscriptions($node->simplenews_issue->target_id); $message = array(); @@ -67,11 +67,11 @@ class SendStatus extends FieldPluginBase { SIMPLENEWS_STATUS_SEND_READY => 'images/sn-sent.png', ); if ($status == SIMPLENEWS_STATUS_SEND_READY) { - $message['description'] = 'Newsletter issue sent to ' . $sent_count . ' subscribers.'; + $message['description'] = t('Newsletter issue sent to @sent_count subscribers.', ['@sent_count' => $sent_count]); $message['uri'] = drupal_get_path('module', 'simplenews') . '/' . $images[$status]; } elseif ($status == SIMPLENEWS_STATUS_SEND_PENDING) { - $message['description'] = t('Newsletter issue is pending,@sent_count mails sent out of @count.', array( + $message['description'] = t('Newsletter issue is pending, @sent_count mails sent out of @count.', array( '@sent_count' => $sent_count, '@count' => $subscriber_count )); diff --git a/src/Tests/SimplenewsAdministrationTest.php b/src/Tests/SimplenewsAdministrationTest.php index 00d0e29..acb98f6 100644 --- a/src/Tests/SimplenewsAdministrationTest.php +++ b/src/Tests/SimplenewsAdministrationTest.php @@ -894,7 +894,7 @@ class SimplenewsAdministrationTest extends SimplenewsTestBase { $this->assertEqual('Newsletter issue will be sent to 3 subscribers on publish.', trim((string) $row->td[5]->span['title'])); } else { - $this->assertEqual('Newsletter issue is pending,0 mails sent out of 3.', trim((string) $row->td[5]->img['title'])); + $this->assertEqual('Newsletter issue is pending, 0 mails sent out of 3.', trim((string) $row->td[5]->img['title'])); $this->assertEqual(file_create_url(drupal_get_path('module', 'simplenews')) . '/images/sn-cron.png', trim((string) $row->td[5]->img['src'])); } } diff --git a/src/Tests/SimplenewsTestSubscriptionOutput.php b/src/Tests/SimplenewsTestSubscriptionOutput.php index a1c4f56..2018d3d 100644 --- a/src/Tests/SimplenewsTestSubscriptionOutput.php +++ b/src/Tests/SimplenewsTestSubscriptionOutput.php @@ -15,13 +15,6 @@ namespace Drupal\simplenews\Tests; class SimplenewsTestSubscriptionOutput extends SimplenewsTestBase { /** - * Modules to enable. - * - * @var string[] - */ - public static $modules = array('simplenews', 'simplenews_scheduler', 'simplenews_demo'); - - /** * Test subscription output visibility for different users. */ public function testSubscriptionVisiblity() {