diff --git a/mod/data/index.php b/mod/data/index.php index 80eecf7224d..292098d94e4 100644 --- a/mod/data/index.php +++ b/mod/data/index.php @@ -87,9 +87,6 @@ if ($rss) { array_push($table->align, 'center'); } -$options = new stdClass(); -$options->noclean = true; - $currentsection = ""; foreach ($datas as $data) { @@ -130,10 +127,12 @@ foreach ($datas as $data) { } $currentsection = $data->section; } - $row = array ($printsection, $link, format_text($data->intro, $data->introformat, $options), $numrecords, $numunapprovedrecords); + $row = array($printsection, $link, format_module_intro('data', $data, $data->coursemodule), + $numrecords, $numunapprovedrecords); } else { - $row = array ($link, format_text($data->intro, $data->introformat, $options), $numrecords, $numunapprovedrecords); + $row = array($link, format_module_intro('data', $data, $data->coursemodule), + $numrecords, $numunapprovedrecords); } if ($rss) { diff --git a/mod/data/tests/behat/data_activities.feature b/mod/data/tests/behat/data_activities.feature new file mode 100644 index 00000000000..5274cffa7e7 --- /dev/null +++ b/mod/data/tests/behat/data_activities.feature @@ -0,0 +1,47 @@ +@mod @mod_data +Feature: Users can view the list of data activities and their formatted descriptions + + Background: + Given the following "users" exist: + | username | firstname | lastname | email | + | student1 | Bob | 1 | student1@example.com | + | teacher1 | Teacher | 1 | teacher1@example.com | + And the following "courses" exist: + | fullname | shortname | category | + | Course 1 | C1 | 0 | + And the following "course enrolments" exist: + | user | course | role | + | teacher1 | C1 | editingteacher | + | student1 | C1 | student | + And the following "activities" exist: + | activity | name | intro | course | idnumber | + | data | Test database 1 | This is an intro without an image | C1 | data1 | + | data | Test database 2 | This is an intro with an image: | C1 | data2 | + And I log in as "admin" + And I am on "Course 1" course homepage with editing mode on + And I add the "Activities" block + And I log out + + Scenario: Teachers can view the list of data activities and their formatted descriptions + Given I log in as "teacher1" + And I am on "Course 1" course homepage + When I follow "Databases" + Then I should see "Test database 1" + And I should see "Test database 2" + And I should see "This is an intro without an image" + And I should see "This is an intro with an image: " + And "//img[contains(@src, 'some_image.jpg')]" "xpath_element" should exist + And "//img[contains(@src, '@@PLUGINFILE@@/some_image.jpg')]" "xpath_element" should not exist + And I log out + + Scenario: Students can view the list of data activities and their formatted descriptions + Given I log in as "student1" + And I am on "Course 1" course homepage + When I follow "Databases" + Then I should see "Test database 1" + And I should see "Test database 2" + And I should see "This is an intro without an image" + And I should see "This is an intro with an image: " + And "//img[contains(@src, 'some_image.jpg')]" "xpath_element" should exist + And "//img[contains(@src, '@@PLUGINFILE@@/some_image.jpg')]" "xpath_element" should not exist + And I log out