removing t() from asserts - remaining changes. [#2035077]

Comment	File	Size	Author
#5	removing_remaining_ts-2035077-5.patch	21.98 KB	lazysoundsystem

#3	removing_remaining_ts-2035077-3.patch	21.79 KB	lazysoundsystem

#1	removing_remaining_ts-2035077-1.patch	21.54 KB	lazysoundsystem

Comment #1

lazysoundsystem CreditAttribution: lazysoundsystem commented 4 July 2013 at 18:39

Assigned:	lazysoundsystem	» Unassigned
Status:	Active	» Needs review

File	Size
removing_remaining_ts-2035077-1.patch	21.54 KB

Here's the patch for 8.x.

Log in or register to post comments

Comment #2

Crell CreditAttribution: Crell commented 4 July 2013 at 19:02

+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -482,7 +482,7 @@ protected function drupalCreateUser(array $permissions = array(), $name = NULL)
+    $this->assertTrue(!empty($account->uid), format_string('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])), 'User login');

Please use Drupal\Component\Utility\String::format() instead of format_string(). There's several places in this patch that need that change.

Log in or register to post comments

Comment #3

lazysoundsystem CreditAttribution: lazysoundsystem commented 4 July 2013 at 19:47

File	Size
removing_remaining_ts-2035077-3.patch	21.79 KB

Thanks for the quick feedback. I think this one is better.

Log in or register to post comments

Comment #4

Crell CreditAttribution: Crell commented 5 July 2013 at 06:10

Status:

Needs review

» Needs work

+++ b/core/modules/system/lib/Drupal/system/Tests/System/DefaultMobileMetaTagsTest.php
@@ -34,7 +34,7 @@ function setUp() {
+      $this->assertRaw($metatag, format_string('Default Mobile meta tag "@name" displayed properly.', array('@name' => $name)), 'System');

Missed a format_string().

+++ b/core/modules/system/lib/Drupal/system/Tests/System/DefaultMobileMetaTagsTest.php
@@ -45,7 +45,7 @@ public function testRemovingDefaultMetaTags() {
+      $this->assertNoRaw($metatag, format_string('Default Mobile meta tag "@name" removed properly.', array('@name' => $name)), 'System');

Missed a format_string().

Log in or register to post comments

Comment #5

lazysoundsystem CreditAttribution: lazysoundsystem commented 5 July 2013 at 08:11

File	Size
removing_remaining_ts-2035077-5.patch	21.98 KB

Thanks - I wasn't sure whether to change those two as they were already there (and there are thousands of other format_string() calls in the tests that need changing, which I'll happily do in a separate issue.)

Here they are removed.

Log in or register to post comments

Comment #6

lazysoundsystem CreditAttribution: lazysoundsystem commented 5 July 2013 at 08:13

Status:

Needs work

» Needs review

Setting back to 'needs review'.

Log in or register to post comments

Comment #7

Crell CreditAttribution: Crell commented 5 July 2013 at 15:43

Status:

Needs review

» Reviewed & tested by the community

That's always a gray area. :-) This looks good for now. Thanks!

Log in or register to post comments

Comment #8

jhodgdon

she/her

English

CreditAttribution: jhodgdon commented 8 July 2013 at 17:50

Status:

Reviewed & tested by the community

» Fixed

Thanks! Committed this one to 8.x. I don't think it probably needs backporting to 7.x?

Log in or register to post comments

Comment #9

lazysoundsystem CreditAttribution: lazysoundsystem commented 8 July 2013 at 21:00

Version:

8.x-dev

» 7.x-dev

I think 'needs' is too strong, but there are quite a few of these remaining in the 7.x tests.

I looked through the original list and found the following modules still have outstanding t()s - with an approximate number of instances in parentheses (I haven't checked they all should be removed):

blog (20), dashboard (17), profile (28) and trigger (15) (these have no 8.x equivalents and so got overlooked)
simpletest (85) - the 7.x patch was a straight port of the 8.x patch, and so there are many instances remaining in tests which aren't in 8.x
system (10), menu (1) and node (1).