mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +02:00
Merge branch 'MDL-75912-master' of https://github.com/andelacruz/moodle
This commit is contained in:
commit
929e5b4552
9 changed files with 17 additions and 56 deletions
|
@ -19,18 +19,10 @@ Feature: A teacher can set a wiki to be collaborative or individual
|
|||
| teacher1 | C1 | editingteacher |
|
||||
| student1 | C1 | student |
|
||||
| student2 | C1 | student |
|
||||
And the following "activity" exists:
|
||||
| course | C1 |
|
||||
| activity | wiki |
|
||||
| name | Collaborative wiki name |
|
||||
| firstpagetitle | Collaborative index |
|
||||
| wikimode | collaborative |
|
||||
And the following "activity" exists:
|
||||
| course | C1 |
|
||||
| activity | wiki |
|
||||
| name | Individual wiki name |
|
||||
| firstpagetitle | Individual index |
|
||||
| wikimode | individual |
|
||||
And the following "activities" exist:
|
||||
| activity | course | name | firstpagetitle | wikimode |
|
||||
| wiki | C1 | Collaborative wiki name | Collaborative index | collaborative |
|
||||
| wiki | C1 | Individual wiki name | Individual index | individual |
|
||||
And I am on the "Collaborative wiki name" "wiki activity" page logged in as teacher1
|
||||
And I press "Create page"
|
||||
And I set the following fields to these values:
|
||||
|
@ -41,7 +33,6 @@ Feature: A teacher can set a wiki to be collaborative or individual
|
|||
And I set the following fields to these values:
|
||||
| HTML format | Individual teacher1 edition |
|
||||
And I press "Save"
|
||||
And I log out
|
||||
And I am on the "Collaborative wiki name" "wiki activity" page logged in as student1
|
||||
Then I should see "Collaborative teacher1 edition"
|
||||
And I select "Edit" from the "jump" singleselect
|
||||
|
@ -56,7 +47,6 @@ Feature: A teacher can set a wiki to be collaborative or individual
|
|||
And I set the following fields to these values:
|
||||
| HTML format | Individual student1 edition |
|
||||
And I press "Save"
|
||||
And I log out
|
||||
And I am on the "Individual wiki name" "wiki activity" page logged in as student2
|
||||
And I should not see "Individual teacher1 edition"
|
||||
And I should not see "Individual student1 edition"
|
||||
|
@ -64,7 +54,6 @@ Feature: A teacher can set a wiki to be collaborative or individual
|
|||
And I set the following fields to these values:
|
||||
| HTML format | Individual student2 edition |
|
||||
And I press "Save"
|
||||
And I log out
|
||||
And I am on the "Collaborative wiki name" "wiki activity" page logged in as teacher1
|
||||
And I should see "Collaborative student1 edition"
|
||||
And I am on the "Individual wiki name" "wiki activity" page
|
||||
|
|
|
@ -30,13 +30,11 @@ Feature: A history of each wiki page is available
|
|||
And I set the following fields to these values:
|
||||
| HTML format | First edition |
|
||||
And I press "Save"
|
||||
And I log out
|
||||
When I am on the "Test wiki name" "wiki activity" page logged in as student1
|
||||
And I select "Edit" from the "jump" singleselect
|
||||
And I set the following fields to these values:
|
||||
| HTML format | Second edition |
|
||||
And I press "Save"
|
||||
And I log out
|
||||
When I am on the "Test wiki name" "wiki activity" page logged in as student2
|
||||
And I select "Edit" from the "jump" singleselect
|
||||
And I set the following fields to these values:
|
||||
|
|
|
@ -20,7 +20,6 @@ Feature: Edited wiki pages may be previewed before saving
|
|||
| activity | wiki |
|
||||
| course | C1 |
|
||||
| name | Test wiki name |
|
||||
| intro | Test wiki description |
|
||||
| wikimode | collaborative |
|
||||
And I am on the "Test wiki name" "wiki activity" page logged in as student1
|
||||
When I press "Create page"
|
||||
|
|
|
@ -18,7 +18,6 @@ Feature: Teachers can reset wiki pages, tags and files
|
|||
| activity | wiki |
|
||||
| course | C1 |
|
||||
| name | Test wiki name |
|
||||
| intro | Test wiki description |
|
||||
| wikimode | collaborative |
|
||||
And I am on the "Test wiki name" "wiki activity" page logged in as teacher1
|
||||
And I press "Create page"
|
||||
|
|
|
@ -21,12 +21,10 @@ Feature: View activity completion information in the Wiki activity
|
|||
| course | C1 |
|
||||
| idnumber | mh1 |
|
||||
| name | Music history |
|
||||
| section | 1 |
|
||||
| completion | 2 |
|
||||
| completionview | 1 |
|
||||
And I am on the "Music history" "wiki activity" page logged in as teacher1
|
||||
And I click on "Create page" "button"
|
||||
And I log out
|
||||
|
||||
Scenario: View automatic completion items as a teacher and confirm all tabs display conditions
|
||||
When I am on the "Music history" "wiki activity" page logged in as teacher1
|
||||
|
@ -57,7 +55,6 @@ Feature: View activity completion information in the Wiki activity
|
|||
And I press "Save and display"
|
||||
# Teacher view.
|
||||
And the manual completion button for "Music history" should be disabled
|
||||
And I log out
|
||||
# Student view.
|
||||
When I am on the "Music history" "wiki activity" page logged in as student1
|
||||
Then the manual completion button of "Music history" is displayed as "Mark as done"
|
||||
|
|
|
@ -22,7 +22,6 @@ Feature: Users can comment on wiki pages
|
|||
| activity | wiki |
|
||||
| course | C1 |
|
||||
| name | Test wiki name |
|
||||
| intro | Test wiki description |
|
||||
| firstpagetitle | First page |
|
||||
| wikimode | collaborative |
|
||||
And I am on the "Test wiki name" "wiki activity" page logged in as teacher1
|
||||
|
@ -30,7 +29,6 @@ Feature: Users can comment on wiki pages
|
|||
And I set the following fields to these values:
|
||||
| HTML format | First edition |
|
||||
And I press "Save"
|
||||
And I log out
|
||||
And I am on the "Test wiki name" "wiki activity" page logged in as student1
|
||||
And I select "Comments" from the "jump" singleselect
|
||||
And I follow "Add comment"
|
||||
|
@ -54,16 +52,14 @@ Feature: Users can comment on wiki pages
|
|||
|
||||
@javascript
|
||||
Scenario: Student cannot edit another student's comment
|
||||
When I log out
|
||||
And I am on the "Test wiki name" "wiki activity" page logged in as student2
|
||||
When I am on the "Test wiki name" "wiki activity" page logged in as student2
|
||||
And I select "Comments" from the "jump" singleselect
|
||||
Then "Edit" "link" should not exist in the "wiki-comments" "table"
|
||||
And "Delete" "link" should not exist in the "wiki-comments" "table"
|
||||
|
||||
@javascript
|
||||
Scenario: Teacher can delete a student comment
|
||||
When I log out
|
||||
And I am on the "Test wiki name" "wiki activity" page logged in as teacher1
|
||||
When I am on the "Test wiki name" "wiki activity" page logged in as teacher1
|
||||
And I select "Comments" from the "jump" singleselect
|
||||
Then "Edit" "link" should not exist in the "wiki-comments" "table"
|
||||
And "Delete" "link" should exist in the "wiki-comments" "table"
|
||||
|
|
|
@ -32,8 +32,6 @@ Feature: Users can search wikis
|
|||
And I set the following fields to these values:
|
||||
| HTML format | Collaborative teacher1 page [[new page]] |
|
||||
And I press "Save"
|
||||
And I am on "Course 1" course homepage
|
||||
And I log out
|
||||
And I am on the "Collaborative wiki name" "wiki activity" page logged in as student1
|
||||
And I follow "new page"
|
||||
And I press "Create page"
|
||||
|
@ -66,7 +64,6 @@ Feature: Users can search wikis
|
|||
And I set the following fields to these values:
|
||||
| HTML format | Individual teacher1 page |
|
||||
And I press "Save"
|
||||
And I log out
|
||||
And I am on the "Individual wiki name" "wiki activity" page logged in as student1
|
||||
And I press "Create page"
|
||||
And I set the following fields to these values:
|
||||
|
@ -76,7 +73,6 @@ Feature: Users can search wikis
|
|||
And I press "Search wikis"
|
||||
Then I should see "Individual student1 page"
|
||||
And I should not see "Individual teacher1 page"
|
||||
And I log out
|
||||
And I am on the "Individual wiki name" "wiki activity" page logged in as student2
|
||||
And I press "Create page"
|
||||
And I set the following fields to these values:
|
||||
|
@ -87,7 +83,6 @@ Feature: Users can search wikis
|
|||
And I should see "Individual student2 page"
|
||||
And I should not see "Individual student1 page"
|
||||
And I should not see "Individual teacher1 page"
|
||||
And I log out
|
||||
And I am on the "Individual wiki name" "wiki activity" page logged in as teacher1
|
||||
And I set the field "searchstring" to "page"
|
||||
And I press "Search wikis"
|
||||
|
@ -136,7 +131,6 @@ Feature: Users can search wikis
|
|||
And I set the following fields to these values:
|
||||
| HTML format | Group2 teacher1 page [[new page2]] |
|
||||
And I press "Save"
|
||||
And I log out
|
||||
And I am on the "Group wiki name" "wiki activity" page logged in as student1
|
||||
And I follow "new page1"
|
||||
And I press "Create page"
|
||||
|
@ -149,7 +143,6 @@ Feature: Users can search wikis
|
|||
And I should not see "Group2 teacher1 page"
|
||||
And I should see "Group1 student1 new page"
|
||||
And I should not see "All participants teacher1 page"
|
||||
And I log out
|
||||
And I am on the "Group wiki name" "wiki activity" page logged in as student2
|
||||
And I follow "new page2"
|
||||
And I press "Create page"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue