From f24c46b406bc139a2a377c19055ed356896e3ef3 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Wed, 9 Jan 2019 14:42:13 +0800 Subject: [PATCH] MDL-62514 behat: Remove potentially conflicting names from description --- lib/testing/generator/data_generator.php | 2 +- lib/testing/tests/generator_test.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/testing/generator/data_generator.php b/lib/testing/generator/data_generator.php index 961d669d91c..1b36c687c4e 100644 --- a/lib/testing/generator/data_generator.php +++ b/lib/testing/generator/data_generator.php @@ -340,7 +340,7 @@ EOD; } if (!isset($record['description'])) { - $record['description'] = "Test cohort $i\n$this->loremipsum"; + $record['description'] = "Description for '{$record['name']}' \n$this->loremipsum"; } if (!isset($record['descriptionformat'])) { diff --git a/lib/testing/tests/generator_test.php b/lib/testing/tests/generator_test.php index 33bdd99dfa1..d22a9101a4a 100644 --- a/lib/testing/tests/generator_test.php +++ b/lib/testing/tests/generator_test.php @@ -156,7 +156,7 @@ class core_test_generator_testcase extends advanced_testcase { $this->assertEquals(context_system::instance()->id, $cohort->contextid); $this->assertRegExp('/^Cohort \d/', $cohort->name); $this->assertSame('', $cohort->idnumber); - $this->assertRegExp('/^Test cohort \d/', $cohort->description); + $this->assertRegExp("/^Description for '{$cohort->name}' \\n/", $cohort->description); $this->assertSame(FORMAT_MOODLE, $cohort->descriptionformat); $this->assertSame('', $cohort->component); $this->assertLessThanOrEqual(time(), $cohort->timecreated);