From 0f09368cbbcda29d929d3cbf0d7a9a84658f7b40 Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Tue, 10 Oct 2017 18:02:20 +0800 Subject: [PATCH] MDL-57455 mod_data: extended Behat test to cover searching names Merged two Behat files that were doing similar things. --- mod/data/tests/behat/edit_tags.feature | 64 ---------- mod/data/tests/behat/view_entries.feature | 138 ++++++++++++++++------ 2 files changed, 102 insertions(+), 100 deletions(-) delete mode 100644 mod/data/tests/behat/edit_tags.feature diff --git a/mod/data/tests/behat/edit_tags.feature b/mod/data/tests/behat/edit_tags.feature deleted file mode 100644 index 7349ec489e1..00000000000 --- a/mod/data/tests/behat/edit_tags.feature +++ /dev/null @@ -1,64 +0,0 @@ -@mod @mod_data @core_tag -Feature: Edited data entries handle tags correctly - In order to get data entries properly labelled - As a user - I need to introduce the tags while editing - - Background: - Given the following "users" exist: - | username | firstname | lastname | email | - | student1 | Student | 1 | student1@example.com | - | teacher1 | Teacher | 1 | teacher1@example.com | - And the following "tags" exist: - | name | isstandard | - | Tag1 | 1 | - 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 name | n | C1 | data1 | - And I log in as "teacher1" - And I am on "Course 1" course homepage - And I add a "Text input" field to "Test database name" database and I fill the form with: - | Field name | Test field name | - | Field description | Test field description | - And I add a "Text input" field to "Test database name" database and I fill the form with: - | Field name | Test field 2 name | - | Field description | Test field 2 description | - # To generate the default templates. - And I follow "Templates" - And I wait until the page is ready - And I log out - - @javascript - Scenario: Data entry of custom tags works as expected - Given I log in as "student1" - And I am on "Course 1" course homepage - And I add an entry to "Test database name" database with: - | Test field name | Student original entry untagged | - | Test field 2 name | Student original entry untagged 2 | - And I add an entry to "Test database name" database with: - | Test field name | Student original entry tagged | - | Test field 2 name | Student original entry tagged 2 | - And I set the field with xpath "//div[@class='datatagcontrol']//input[@type='text']" to "Tag1" - And I click on "[data-value='Tag1']" "css_element" - And I press "Save and view" - Then I should see "Student original entry" - And I should see "Tag1" in the "div.tag_list" "css_element" - And I follow "Edit" - And I should see "Tag1" in the ".form-autocomplete-selection" "css_element" - And I follow "View list" - And I should see "Tag1" in the "div.tag_list" "css_element" - And I follow "Search" - And I set the field with xpath "//div[@class='datatagcontrol']//input[@type='text']" to "Tag1" - And I click on "[data-value='Tag1']" "css_element" - And I press "Save settings" - And I should see "Student original entry tagged" - And I should see "Student original entry tagged 2" - And I should not see "Student original entry untagged" - And I should not see "Student original entry untagged 2" diff --git a/mod/data/tests/behat/view_entries.feature b/mod/data/tests/behat/view_entries.feature index b7f66798a76..5c07ebedf01 100644 --- a/mod/data/tests/behat/view_entries.feature +++ b/mod/data/tests/behat/view_entries.feature @@ -4,68 +4,134 @@ Feature: Users can view and search database entries As a user I need to list and search the database entries - Scenario: Students can add view, list and search entries + Background: Given the following "users" exist: - | username | firstname | lastname | email | - | student1 | Student | 1 | student1@example.com | - | teacher1 | Teacher | 1 | teacher1@example.com | + | username | firstname | lastname | email | + | student1 | Bob | 1 | student1@example.com | + | student2 | Alice | 2 | student2@example.com | + | teacher1 | Teacher | 1 | teacher1@example.com | + And the following "tags" exist: + | name | isstandard | + | Tag1 | 1 | And the following "courses" exist: | fullname | shortname | category | - | Course 1 | C1 | 0 | + | Course 1 | C1 | 0 | And the following "course enrolments" exist: - | user | course | role | - | teacher1 | C1 | editingteacher | - | student1 | C1 | student | + | user | course | role | + | teacher1 | C1 | editingteacher | + | student1 | C1 | student | + | student2 | C1 | student | And the following "activities" exist: - | activity | name | intro | course | idnumber | - | data | Test database name | n | C1 | data1 | + | activity | name | intro | course | idnumber | + | data | Test database name | Database intro | C1 | data1 | And I log in as "teacher1" And I am on "Course 1" course homepage And I add a "Text input" field to "Test database name" database and I fill the form with: - | Field name | Test field name | + | Field name | Test field name | | Field description | Test field description | + And I add a "Text input" field to "Test database name" database and I fill the form with: + | Field name | Test field 2 name | + | Field description | Test field 2 description | # To generate the default templates. And I follow "Templates" + And I log out + + Scenario: Students can add view, list and search entries + Given I log in as "student1" + And I am on "Course 1" course homepage + And I follow "Test database name" And I add an entry to "Test database name" database with: - | Test field name | Teacher entry 1 | + | Test field name | Student entry 1 | And I press "Save and add another" And I add an entry to "Test database name" database with: - | Test field name | Teacher entry 2 | + | Test field name | Student entry 2 | And I press "Save and add another" And I add an entry to "Test database name" database with: - | Test field name | Teacher entry 3 | + | Test field name | Student entry 3 | And I press "Save and view" - And I log out - When I log in as "student1" - And I am on "Course 1" course homepage And I follow "Test database name" - Then I should see "Teacher entry 1" - And I should see "Teacher entry 2" - And I should see "Teacher entry 3" + Then I should see "Student entry 1" + And I should see "Student entry 2" + And I should see "Student entry 3" And I follow "View single" - And I should see "Teacher entry 1" - And I should not see "Teacher entry 2" + And I should see "Student entry 1" + And I should not see "Student entry 2" And "2" "link" should exist And "3" "link" should exist And I follow "Next" - And I should see "Teacher entry 2" - And I should not see "Teacher entry 1" + And I should see "Student entry 2" + And I should not see "Student entry 1" And I click on "3" "link" in the "region-main" "region" - And I should see "Teacher entry 3" - And I should not see "Teacher entry 2" + And I should see "Student entry 3" + And I should not see "Student entry 2" And I follow "Previous" - And I should see "Teacher entry 2" - And I should not see "Teacher entry 1" - And I should not see "Teacher entry 3" + And I should see "Student entry 2" + And I should not see "Student entry 1" + And I should not see "Student entry 3" And I follow "Search" - And I set the field "Test field name" to "Teacher entry 1" + And I set the field "Test field name" to "Student entry 1" And I press "Save settings" - And I should see "Teacher entry 1" - And I should not see "Teacher entry 2" - And I should not see "Teacher entry 3" + And I should see "Student entry 1" + And I should not see "Student entry 2" + And I should not see "Student entry 3" And I follow "Search" - And I set the field "Test field name" to "Teacher entry" + And I set the field "Test field name" to "Student entry" And I set the field "Order" to "Descending" And I press "Save settings" - And "Teacher entry 3" "text" should appear before "Teacher entry 2" "text" - And "Teacher entry 2" "text" should appear before "Teacher entry 1" "text" + And "Student entry 3" "text" should appear before "Student entry 2" "text" + And "Student entry 2" "text" should appear before "Student entry 1" "text" + + @javascript + Scenario: Check that searching by tags works as expected + Given I log in as "student1" + And I am on "Course 1" course homepage + And I add an entry to "Test database name" database with: + | Test field name | Student original entry untagged | + | Test field 2 name | Student original entry untagged 2 | + And I add an entry to "Test database name" database with: + | Test field name | Student original entry tagged | + | Test field 2 name | Student original entry tagged 2 | + And I set the field with xpath "//div[@class='datatagcontrol']//input[@type='text']" to "Tag1" + And I click on "[data-value='Tag1']" "css_element" + And I press "Save and view" + And I should see "Student original entry" + And I should see "Tag1" in the "div.tag_list" "css_element" + And I follow "Edit" + And I should see "Tag1" in the ".form-autocomplete-selection" "css_element" + And I follow "View list" + And I should see "Tag1" in the "div.tag_list" "css_element" + And I follow "Search" + And I set the field with xpath "//div[@class='datatagcontrol']//input[@type='text']" to "Tag1" + And I click on "[data-value='Tag1']" "css_element" + When I press "Save settings" + Then I should see "Student original entry tagged" + And I should see "Student original entry tagged 2" + And I should not see "Student original entry untagged" + And I should not see "Student original entry untagged 2" + + Scenario: Check that searching by first and last name works as expected + Given I log in as "student1" + And I am on "Course 1" course homepage + And I add an entry to "Test database name" database with: + | Test field name | Student entry 1 | + And I press "Save and view" + And I log out + And I log in as "student2" + And I am on "Course 1" course homepage + And I add an entry to "Test database name" database with: + | Test field name | Student entry 2 | + And I press "Save and view" + And I log out + When I log in as "teacher1" + And I am on "Course 1" course homepage + And I follow "Test database name" + And I follow "Search" + And I set the field "Author first name" to "Bob" + And I press "Save settings" + Then I should see "Student entry 1" + And I should not see "Student entry 2" + And I set the field "Author first name" to "" + And I set the field "Author surname" to "2" + And I press "Save settings" + And I should not see "Student entry 1" + And I should see "Student entry 2" -- 2.17.1