Skip to content

Commit 1bb70b6

Browse files
committed
Issue #3035318 by mpdonadio: DateFormatter() assumes 30 days per month, while February only has 28 days. Causes fails in tests
(cherry picked from commit bdfafab)
1 parent 415dae7 commit 1bb70b6

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

modules/datetime/tests/src/Functional/DateTimeTimeAgoFormatterTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,13 @@ public function testSettings() {
110110
$edit = [
111111
'fields[field_datetime][settings_edit_form][settings][future_format]' => 'ends in @interval',
112112
'fields[field_datetime][settings_edit_form][settings][past_format]' => 'started @interval ago',
113-
'fields[field_datetime][settings_edit_form][settings][granularity]' => 3,
113+
'fields[field_datetime][settings_edit_form][settings][granularity]' => 1,
114114
];
115115
$this->drupalPostForm(NULL, $edit, 'Update');
116116
$this->drupalPostForm(NULL, [], 'Save');
117117

118-
$this->assertSession()->pageTextContains('ends in 1 year 1 month 1 week');
119-
$this->assertSession()->pageTextContains('started 1 year 1 month 1 week ago');
118+
$this->assertSession()->pageTextContains('ends in 1 year');
119+
$this->assertSession()->pageTextContains('started 1 year ago');
120120
}
121121

122122
}

tests/Drupal/FunctionalTests/Datetime/TimestampAgoFormatterTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,13 @@ public function testSettings() {
110110
$edit = [
111111
'fields[field_timestamp][settings_edit_form][settings][future_format]' => 'ends in @interval',
112112
'fields[field_timestamp][settings_edit_form][settings][past_format]' => 'started @interval ago',
113-
'fields[field_timestamp][settings_edit_form][settings][granularity]' => 3,
113+
'fields[field_timestamp][settings_edit_form][settings][granularity]' => 1,
114114
];
115115
$this->drupalPostForm(NULL, $edit, 'Update');
116116
$this->drupalPostForm(NULL, [], 'Save');
117117

118-
$this->assertSession()->pageTextContains('ends in 1 year 1 month 1 week');
119-
$this->assertSession()->pageTextContains('started 1 year 1 month 1 week ago');
118+
$this->assertSession()->pageTextContains('ends in 1 year');
119+
$this->assertSession()->pageTextContains('started 1 year ago');
120120
}
121121

122122
}

0 commit comments

Comments
 (0)