Skip to content

Commit bf95d97

Browse files
watson8watson8
committed
CTP-3560 behat indentation
1 parent c56ae66 commit bf95d97

File tree

47 files changed

+1237
-1336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1237
-1336
lines changed

‎tests/behat/allocation_automatic_allocations_disabled.feature

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ Feature: Automatic allocations can be disabled
55
I want to be able to turn off automatic allocations
66
So that I can choose the teachers manually and not have weird or inappropriate allocations
77

8-
Background:
9-
Given the managers are not allowed to grade
10-
And there is a course
11-
And there is a coursework
12-
And there is a teacher
13-
And I am logged in as a manager
14-
And the managers are not allowed to grade
15-
And there are no allocations in the db
8+
Background:
9+
Given the managers are not allowed to grade
10+
And there is a course
11+
And there is a coursework
12+
And there is a teacher
13+
And I am logged in as a manager
14+
And the managers are not allowed to grade
15+
And there are no allocations in the db
1616

17-
Scenario: Nothing happens with
18-
Given the coursework "allocationenabled" setting is "1" in the database
19-
And the coursework "assessorallocationstrategy" setting is "none" in the database
20-
When there is a student
21-
Then there should be no allocations in the db
17+
Scenario: Nothing happens with
18+
Given the coursework "allocationenabled" setting is "1" in the database
19+
And the coursework "assessorallocationstrategy" setting is "none" in the database
20+
When there is a student
21+
Then there should be no allocations in the db

‎tests/behat/allocation_automatic_equal_assessor_allocations.feature

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,30 @@ Feature: Automatic equal assessor allocations
66
So that the marking is fairly distributed and the interface is less cluttered for teachers,
77
and they don't mark to many or too few.
88

9-
Background:
10-
Given the managers are not allowed to grade
11-
And there is a course
12-
And there is a coursework
13-
And the coursework "allocationenabled" setting is "1" in the database
14-
And the coursework "numberofmarkers" setting is "1" in the database
15-
And there is a student
16-
And there is a teacher
17-
And teachers hava a capability to administer grades
18-
And I am logged in as a manager
19-
And there are no allocations in the db
20-
21-
Scenario: Automatic allocations should work
22-
When I visit the allocations page
23-
And I save everything
24-
And I log out
25-
And I log in as the teacher
26-
And I visit the coursework page
27-
Then I should see the student's name on the page
28-
29-
Scenario: Automatic allocations of non-manually allocated should work
30-
When I visit the allocations page
31-
And I save everything
32-
And I log out
33-
And I log in as the teacher
34-
And I visit the coursework page
35-
Then I should see the student's name on the page
36-
37-
38-
39-
40-
9+
Background:
10+
Given the managers are not allowed to grade
11+
And there is a course
12+
And there is a coursework
13+
And the coursework "allocationenabled" setting is "1" in the database
14+
And the coursework "numberofmarkers" setting is "1" in the database
15+
And there is a student
16+
And there is a teacher
17+
And teachers hava a capability to administer grades
18+
And I am logged in as a manager
19+
And there are no allocations in the db
20+
21+
Scenario: Automatic allocations should work
22+
When I visit the allocations page
23+
And I save everything
24+
And I log out
25+
And I log in as the teacher
26+
And I visit the coursework page
27+
Then I should see the student's name on the page
28+
29+
Scenario: Automatic allocations of non-manually allocated should work
30+
When I visit the allocations page
31+
And I save everything
32+
And I log out
33+
And I log in as the teacher
34+
And I visit the coursework page
35+
Then I should see the student's name on the page

‎tests/behat/allocation_automatic_interacting_with_manual_allocations.feature

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,32 @@ Feature: Automatically allocations interacting with manually allocated students
55
I want to be able to reallocate all of the non manual students
66
So that if the number of students or teachers has changed, I can make sure everything remains balanced
77

8-
Background:
9-
Given there is a course
10-
And there is a coursework
11-
And the coursework "allocationenabled" setting is "1" in the database
12-
And the coursework "numberofmarkers" setting is "1" in the database
13-
And the managers are not allowed to grade
14-
And there is a student
15-
And there is a teacher
16-
And I am logged in as a manager
8+
Background:
9+
Given there is a course
10+
And there is a coursework
11+
And the coursework "allocationenabled" setting is "1" in the database
12+
And the coursework "numberofmarkers" setting is "1" in the database
13+
And the managers are not allowed to grade
14+
And there is a student
15+
And there is a teacher
16+
And I am logged in as a manager
1717

18-
Scenario: Automatic allocations should not alter the manual allocations
19-
Given there is another teacher
20-
And there are no allocations in the db
21-
When I visit the allocations page
22-
And I manually allocate the student to the teacher
23-
And I set the allocation strategy to 100 percent for the other teacher
24-
And I save everything
25-
When I visit the allocations page
26-
Then I should see the student allocated to the teacher for the first assessor
27-
28-
@javascript
29-
Scenario: Automatic allocations should wipe the older automatic allocations
30-
Given the student is allocated to the teacher
31-
And there is another teacher
32-
When I visit the allocations page
33-
And I set the allocation strategy to 100 percent for the other teacher
34-
And I press "Apply"
35-
When I visit the allocations page
36-
Then I should see the student allocated to the other teacher for the first assessor
18+
Scenario: Automatic allocations should not alter the manual allocations
19+
Given there is another teacher
20+
And there are no allocations in the db
21+
When I visit the allocations page
22+
And I manually allocate the student to the teacher
23+
And I set the allocation strategy to 100 percent for the other teacher
24+
And I save everything
25+
When I visit the allocations page
26+
Then I should see the student allocated to the teacher for the first assessor
3727

28+
@javascript
29+
Scenario: Automatic allocations should wipe the older automatic allocations
30+
Given the student is allocated to the teacher
31+
And there is another teacher
32+
When I visit the allocations page
33+
And I set the allocation strategy to 100 percent for the other teacher
34+
And I press "Apply"
35+
When I visit the allocations page
36+
Then I should see the student allocated to the other teacher for the first assessor

‎tests/behat/allocation_automatic_percentage_assessor_allocations.feature

Lines changed: 31 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,34 @@ Feature: Automatic percentage assessor allocations
66
So that the marking is fairly distributed and the interface is less cluttered for teachers,
77
and they don't mark to many or too few.
88

9-
Background:
10-
Given there is a course
11-
And there is a coursework
12-
And the coursework "allocationenabled" setting is "1" in the database
13-
And the coursework "numberofmarkers" setting is "1" in the database
14-
And the managers are not allowed to grade
15-
And there is a student
16-
And there is a teacher
17-
And I am logged in as a manager
18-
And there are no allocations in the db
19-
20-
@javascript
21-
Scenario: Automatic percentage allocations should allocate to the right teacher
22-
Given there is another teacher
23-
And there are no allocations in the db
24-
When I visit the allocations page
25-
And I set the allocation strategy to 100 percent for the other teacher
26-
And I press "Apply"
27-
When I visit the allocations page
28-
Then I should see the student allocated to the other teacher for the first assessor
29-
30-
Scenario: percentage allocations should not allocate to the wrong teacher
31-
Given there is another teacher
32-
And there are no allocations in the db
33-
When I visit the allocations page
34-
And I set the allocation strategy to 100 percent for the other teacher
35-
And I save everything
36-
And I log out
37-
And I log in as the teacher
38-
And I visit the coursework page
39-
Then I should not see the student's name on the page
40-
41-
42-
43-
9+
Background:
10+
Given there is a course
11+
And there is a coursework
12+
And the coursework "allocationenabled" setting is "1" in the database
13+
And the coursework "numberofmarkers" setting is "1" in the database
14+
And the managers are not allowed to grade
15+
And there is a student
16+
And there is a teacher
17+
And I am logged in as a manager
18+
And there are no allocations in the db
19+
20+
@javascript
21+
Scenario: Automatic percentage allocations should allocate to the right teacher
22+
Given there is another teacher
23+
And there are no allocations in the db
24+
When I visit the allocations page
25+
And I set the allocation strategy to 100 percent for the other teacher
26+
And I press "Apply"
27+
When I visit the allocations page
28+
Then I should see the student allocated to the other teacher for the first assessor
29+
30+
Scenario: percentage allocations should not allocate to the wrong teacher
31+
Given there is another teacher
32+
And there are no allocations in the db
33+
When I visit the allocations page
34+
And I set the allocation strategy to 100 percent for the other teacher
35+
And I save everything
36+
And I log out
37+
And I log in as the teacher
38+
And I visit the coursework page
39+
Then I should not see the student's name on the page

‎tests/behat/allocation_manual_assessor_allocations.feature

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,51 +5,51 @@ Feature: Manually assessor allocations
55
As a course leader
66
I want to be able to manually allocate students to assessors
77

8-
Background:
9-
Given there is a course
10-
And there is a coursework
11-
And the coursework "allocationenabled" setting is "1" in the database
12-
And the coursework "assessorallocationstrategy" setting is "none" in the database
13-
And the coursework "numberofmarkers" setting is "2" in the database
14-
And there is a student
15-
And there is a teacher
16-
And I am logged in as a manager
8+
Background:
9+
Given there is a course
10+
And there is a coursework
11+
And the coursework "allocationenabled" setting is "1" in the database
12+
And the coursework "assessorallocationstrategy" setting is "none" in the database
13+
And the coursework "numberofmarkers" setting is "2" in the database
14+
And there is a student
15+
And there is a teacher
16+
And I am logged in as a manager
1717

18-
Scenario: Teachers do not see students who are allocated to other teachers
19-
Given there is another teacher
20-
And there are no allocations in the db
21-
When I visit the allocations page
22-
And I manually allocate the student to the other teacher
23-
And I log out
24-
And I log in as the teacher
25-
And I visit the coursework page
26-
Then I should not see the student's name on the page
18+
Scenario: Teachers do not see students who are allocated to other teachers
19+
Given there is another teacher
20+
And there are no allocations in the db
21+
When I visit the allocations page
22+
And I manually allocate the student to the other teacher
23+
And I log out
24+
And I log in as the teacher
25+
And I visit the coursework page
26+
Then I should not see the student's name on the page
2727

28-
Scenario: auto allocations should not alter the manual allocations
29-
Given there is another teacher
30-
And there are no allocations in the db
31-
When I visit the allocations page
32-
And I manually allocate the student to the teacher
33-
And I set the allocation strategy to 100 percent for the other teacher
34-
And I save everything
35-
And I visit the allocations page
36-
Then I should see the student allocated to the teacher for the first assessor
28+
Scenario: auto allocations should not alter the manual allocations
29+
Given there is another teacher
30+
And there are no allocations in the db
31+
When I visit the allocations page
32+
And I manually allocate the student to the teacher
33+
And I set the allocation strategy to 100 percent for the other teacher
34+
And I save everything
35+
And I visit the allocations page
36+
Then I should see the student allocated to the teacher for the first assessor
3737

38-
Scenario: allocating multiple teachers
39-
Given there is another teacher
40-
When I visit the allocations page
41-
And I manually allocate the student to the teacher
42-
And I save everything
43-
And I visit the allocations page
44-
And I manually allocate the student to the other teacher for the second assessment
45-
And I save everything
46-
And I visit the allocations page
47-
Then I should see that the student has two allcations
38+
Scenario: allocating multiple teachers
39+
Given there is another teacher
40+
When I visit the allocations page
41+
And I manually allocate the student to the teacher
42+
And I save everything
43+
And I visit the allocations page
44+
And I manually allocate the student to the other teacher for the second assessment
45+
And I save everything
46+
And I visit the allocations page
47+
Then I should see that the student has two allcations
4848

49-
Scenario: Allocations work for more than one student
50-
Given there is another student
51-
When I visit the allocations page
52-
And I manually allocate the student to the teacher
53-
And I manually allocate the other student to the teacher
54-
And I save everything
55-
Then I should see that both students are allocated to the teacher
49+
Scenario: Allocations work for more than one student
50+
Given there is another student
51+
When I visit the allocations page
52+
And I manually allocate the student to the teacher
53+
And I manually allocate the other student to the teacher
54+
And I save everything
55+
Then I should see that both students are allocated to the teacher

‎tests/behat/allocation_visibility_of_all_students_capability.feature

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,3 @@ Feature: View of all students: allocated and non allocated students
3838
And I visit the coursework page
3939
And I click show all students button
4040
Then I should see another student's name on the page
41-
42-
43-
44-
45-
46-
47-
48-

‎tests/behat/allocation_visibility_of_allocated_students.feature

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ Feature: Visibility of allocated students
55
As a course leader
66
I want teachers to only see the students who have been allocated to them
77

8-
Background:
9-
Given there is a course
10-
And there is a coursework
11-
And the coursework "allocationenabled" setting is "1" in the database
12-
And the coursework "assessorallocationstrategy" setting is "none" in the database
13-
And there is a student
14-
And there is a teacher
8+
Background:
9+
Given there is a course
10+
And there is a coursework
11+
And the coursework "allocationenabled" setting is "1" in the database
12+
And the coursework "assessorallocationstrategy" setting is "none" in the database
13+
And there is a student
14+
And there is a teacher
1515

16-
Scenario: Teachers do not see students who are unallocated
17-
Given I log in as the teacher
18-
And I visit the coursework page
19-
Then I should not see the student's name on the page
16+
Scenario: Teachers do not see students who are unallocated
17+
Given I log in as the teacher
18+
And I visit the coursework page
19+
Then I should not see the student's name on the page
2020

21-
Scenario: I can allocate a student manually and the teacher will see them
22-
Given I am logged in as a manager
23-
When I visit the allocations page
24-
And I manually allocate the student to the teacher
25-
And I save everything
26-
And I log out
27-
And I log in as the teacher
28-
And I visit the coursework page
29-
Then I should see the student's name on the page
21+
Scenario: I can allocate a student manually and the teacher will see them
22+
Given I am logged in as a manager
23+
When I visit the allocations page
24+
And I manually allocate the student to the teacher
25+
And I save everything
26+
And I log out
27+
And I log in as the teacher
28+
And I visit the coursework page
29+
Then I should see the student's name on the page

0 commit comments

Comments
 (0)