Browse Source

Fix testing after scheduler release

tags/3.4.6
Christian Fritsch GitHub 2 months ago
parent
commit
c9e24834c9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 10 deletions
  1. +4
    -1
      composer.json
  2. +8
    -6
      config/install/scheduler.settings.yml
  3. +2
    -1
      drupal-org.make
  4. +1
    -1
      tests/src/FunctionalJavascript/Integration/AutosaveFormTest.php
  5. +1
    -1
      tests/src/Traits/ThunderTestTrait.php

+ 4
- 1
composer.json View File

@@ -70,6 +70,9 @@
},
"drupal/simple_sitemap": {
"Warning if excluded_languages is not set": "https://www.drupal.org/files/issues/2020-04-14/3127501.patch"
},
"drupal/scheduler": {
"User messages are gone after update": "https://www.drupal.org/files/issues/2020-06-03/3145169.patch"
}
}
},
@@ -120,7 +123,7 @@
"drupal/pathauto": "^1.6",
"drupal/responsive_preview": "^1.0-alpha7",
"drupal/redirect": "^1.6",
"drupal/scheduler": "^1.1",
"drupal/scheduler": "1.2",
"drupal/scheduler_content_moderation_integration": "^1.1",
"drupal/select2": "^1.3",
"drupal/simple_sitemap": "3.6",


+ 8
- 6
config/install/scheduler.settings.yml View File

@@ -1,18 +1,20 @@
allow_date_only: true
date_format: 'Y-m-d H:i:s'
date_letters: djmnFMyY
date_only_format: Y-m-d
default_expand_fieldset: when_required
default_fields_display_mode: vertical_tab
date_letters: 'djmnFMyY'
date_only_format: 'Y-m-d'
default_expand_fieldset: 'when_required'
default_fields_display_mode: 'vertical_tab'
default_publish_enable: false
default_publish_past_date: error
default_publish_past_date: 'error'
default_publish_past_date_created: false
default_publish_required: false
default_publish_revision: false
default_publish_touch: false
default_show_message_after_update: true
default_time: '00:00:00'
default_unpublish_enable: false
default_unpublish_required: false
default_unpublish_revision: false
log: true
time_letters: hHgGisaA
time_letters: 'hHgGisaA'
time_only_format: 'H:i:s'

+ 2
- 1
drupal-org.make View File

@@ -99,7 +99,8 @@ projects[riddle_marketplace][version] = 3
projects[redirect][type] = module
projects[redirect][version] = 1
projects[scheduler][type] = module
projects[scheduler][version] = 1
projects[scheduler][version] = 1.2
projects[scheduler][patch][] = https://www.drupal.org/files/issues/2020-06-03/3145169.patch
projects[scheduler_content_moderation_integration][type] = module
projects[scheduler_content_moderation_integration][version] = 1
projects[select2][type] = module


+ 1
- 1
tests/src/FunctionalJavascript/Integration/AutosaveFormTest.php View File

@@ -63,7 +63,7 @@ class AutosaveFormTest extends ThunderJavascriptTestBase {
$this->clickSave();

// Check some things.
$this->assertSession()->pageTextContains('This post is unpublished and will be published');
$this->assertSession()->pageTextContains('New title is scheduled to be published');
$this->assertSession()->pageTextContains('Awesome quote');
}



+ 1
- 1
tests/src/Traits/ThunderTestTrait.php View File

@@ -109,7 +109,7 @@ trait ThunderTestTrait {
*/
protected function doInstall() {

if (!empty($_SERVER['thunderDumpFile'])) {
if (!empty($_SERVER['thunderDumpFile']) && file_exists($_SERVER['thunderDumpFile'])) {
$file = $_SERVER['thunderDumpFile'];
// Load the database.
if (substr($file, -3) == '.gz') {


Loading…
Cancel
Save