corrections and updates

integration_testing/016-features/admin/device/admin-manage-content.feature

@@ -3,15 +3,19 @@ Feature: Facility admin device management
 
   Background:
     Given I am signed into Kolibri as a facility admin user with device permissions for content import
+    	And there are imported channels on the device
 
   Scenario: View all the options for managing content
-    When I go to *Device > Channels* page
-    Then I see the list of already imported channels
-      And I see the *Options* button for each channel
-      And I see the *Import* and *Export* buttons
-    When I click the *Options* button
-      And I select *Import more*
-    Then I see the *Select a source* modal
-      And I can select one of the options
+    When I go to the *Device > Channels* page
+    Then I see the *Channels* label
+    	And I see the *Options* drop-down and the *Import* button to the right
+    	And I see the list with already imported channels
+      And I see the *Manage* button for each channel
+    When I click the *Manage* button for a channel
+    Then I see the *Manage <channel>* modal
+    	And I see all the available channel details
+    	And I see all the imported channel resources
+    	And I see an *Import more* button
+    	And I see that the *Delete* and *Export* buttons are disabled
 
-      # Continue testing content management by using the scenarios for super admins
+    # Continue testing content management by using the scenarios for super admins

integration_testing/016-features/admin/device/admin-rearrange-channels.feature

@@ -1,19 +1,21 @@
 Feature: Admin can rearrange channels
-  Admins need to be able to customize the order channels appear for Learners and Coaches
+  Admins need to be able to customize the order in which the channels are displayed for Learners and Coaches
 
   Background:
     Given I am signed in as an Admin or other user with content management permissions
-    And I am on the *Device > Rearrange Channels* page
+    And I am at the *Device > Channels* page
 
   Scenario: User can move a channel
-    When I move a channel using my mouse or keyboard to a new position
-    Then I see a success notification
+    When I click the *Options drop-down*
+    	And I select the *Edit channel order* option
+    Then I see the *Edit channel order* modal
+    When I drag a channel using my mouse or keyboard to a new position
+    Then I see a *Channel order saved* snackbar notification
+    When I close the modal
+    Then I am back at the *Device > Channels* page
+    	And I can see that the order of the channels is changes as intended
 
   Scenario: The new channel order is reflected in all parts of the app
-    When I move a channel
-    Then I see the new order on the *Rearrange Channels* Page
-      And ... the *Manage Device Channels* Page
-      And ... the *Your Channels* Page when exporting to a USB drive
-      And ... the *Learn > Channels* Page
-      And ... the *Coach > Create New Quiz* Page
-      And ... the *Coach > Manage Lesson Resources* Page
+    Given I've already reordered the channels
+    When I navigate to any of the following locations: *Device > Channels > Export channels*, *Device > Channels > Delete channels*, *Coach > Create new quiz*, *Coach > Manage lesson resources*, *Learn > Home > Explore channels* and *Learn > Library*
+    Then I see that the channels are ordered as intended

integration_testing/016-features/admin/facility/facility-users/admin-create-users.feature

@@ -6,9 +6,9 @@ Feature: Admin creates users
       And I am at *Facility > Users* page
 
   Scenario: Create a learner user account
-    hen I click on *New user* button
+    When I click on *New user* button
     Then I see *Create new user* page
-    When I enter user's full name
+    When I enter the user's full name
       And I enter the username
       And I enter the password
       And I re-enter the password

integration_testing/016-features/admin/facility/facility-users/admin-find-user.feature

@@ -1,4 +1,4 @@
-Feature: Admin find users
+Feature: Admin finds users
   Admin needs to be able to search for and find users
 
   # Make sure you have many users in the facility (import from the CSV file, or use the `manage generateusers` command), to be able to test the pagination
@@ -16,32 +16,31 @@ Feature: Admin find users
     When I click the left arrow (previous page) button
     Then I am back on the first page of the list of facility users
     When I keep clicking the right arrow to find a user
-    Then I see the numbers of pages correctly increasing in increments of 10 # or 30, if th enumber of users is close to 1000
+    Then I see the numbers of pages correctly increasing in increments of 10 # or 30, if the number of users is close to 1000
 
   Scenario: Search for and find user using the search field
     When I click or tab into the search field
-      And I start writing the user's <full_name> or <username>
+      And I start writing the user's full name or username
     Then I see the list of users below is being filtered according to the characters I write
       And I see the number of pages decreasing accordingly
     When I write enough characters for all other users to be excluded
     Then I see just the user I was searching for
 
   Scenario: Clear search
-    Given that I wrote user's <username> in the search field
+    Given that I wrote user's username in the search field
       And I see the filtered results
       And I see the number of pages as '1 of 1'
-    When I click the clear *X* button, OR tab to focus it and press Enter, OR I delete what I wrote
+    When I click the clear *X* button, or tab to focus it and press Enter, or I delete what I wrote
     Then I see the full (unfiltered) list of users
       And I see the full number of pages
 
-  Scenario: Search for and find user using the role dropdown filter
+  Scenario: Search for and find a user using the user type dropdown filter
     When I click to open the *User type* filter
-      And I select the role <role>
-    Then in the list bellow I see just the users with the role <role>
+      And I select a type
+    Then in the list bellow I see only the users with the selected type
       And I see the number of pages decreased accordingly
-      But I don't see any other user type
     When I click or tab into the search field to further filter the results
-      And I start writing the user's <full_name> or <username>
+      And I start writing the user's full name or username
     Then I see the list of users below is being filtered according to the characters I write
       And I see the number of pages decreasing accordingly
     When I write enough characters for all other users to be excluded

integration_testing/016-features/admin/profile/admin-change-profile-information.feature

@@ -3,33 +3,34 @@ Feature: Admin changes profile information
 
   Background:
     Given I am signed in to Kolibri as a facility admin
-      And I am on the *User > Profile* page
+      And I am on my *Profile* page
 
   Scenario: Admin changes username and full name
     When I click the *Edit* button
     Then I see the *Edit profile* page
     When I change my full name
-      And I change my username
-      And if my changes are valid (I did not leave the fields empty)
-      And I click the “Save” button
-    Then I see the *Changes saved* snackbar notification
-    When I go back to my *Profile > Details* page
-    Then I see the new full name and username on the profile page
+  	  And I change my username
+  	  And I click the *Save* button
+    Then I am back at my *Profile* page
+    	And I see the *Changes saved* snackbar notification
+      And I see the new full name and username
+      And I see the new username in the user menu
 
   Scenario: Admin selects gender and birth year
     When I click the *Edit* button
     Then I see the *Edit profile* page
-    When I select my gender
-      And I select my birth year
-      And I click the “Save” button
-    Then I see the *Changes saved* snackbar notification
-      And I see my selected gender and birth year on the profile page
+    When I select a value from the *Gender* drop-down
+      And I select a birth year from the *Birth year* drop-down
+      And I click the *Save* button
+    Then I am back at my *Profile* page
+      And I see the *Changes saved* snackbar notification
+      And I see my selected gender and birth year at the profile page
 
   Scenario: Admin changes password
-    When I click the “Change password” link
-    Then I see the “Change password” modal
-    When I enter the new password
+    When I click the *Change password* link
+    Then I see the *Change password* modal
+    When I enter a new password
       And I re-enter the new password
-      And if my changes are valid (I did not leave the fields empty, or entered two different passwords)
-      And I click the “Update” button
-    Then I see the *Password changed* snackbar notification
+      And I click the *Update* button
+    Then I am back at my *Profile* page
+    	And I see the *Your password has been changed* snackbar notification

integration_testing/016-features/coach/class/class-coach-view.feature

@@ -3,13 +3,19 @@ Feature: Class coach view
 
   Background:
     Given I am signed in as a class coach
-      And there is more than one class in the facility
+      And there are several classes in the facility
+      And I am assigned to some of the classes
 
-  Scenario: Open *Coach* tab
+  Scenario: Open the *Class home* page
     When I open the sidebar
-      And click on *Coach*
-    Then I see a list of classes I am assigned to as a *Coach*
-      But I cannot see any other class in the facility
-    When I click on the class <class>
-    Then I am on *Class home* for class <class>
+      And click on *Coach > Class home*
+    Then I see the *Classes* page
+    	And I see a list of the classes to which I am assigned as a *Coach*
+      And I cannot see any other class in the facility
+    When I click on the class name of a class
+    Then I am on *Class home* page for the class
+    	And I can view all of the available information for the learners' progress and activities
+    When I click the *All classes* link
+    Then I am back at the *Classes* page
+    	And I can select a different class
     # Run the rest of the coach scenarios

integration_testing/016-features/coach/class/coach-class-home-with-interaction.feature

@@ -3,34 +3,36 @@ Feature: General navigation on *Class home* tab
 
   Background:
     Given I am signed in as a class or facility coach
-      And I am on *Class home* for class <class>
-      And there are learners and coaches assigned to the class <class>
+      And I am on the *Class home* page for a class
+      And there are learners and coaches assigned to the class
 
-  Scenario: Review progress of a started quiz
-    Given there is a <quiz> quiz available
-      And there has been learner progress on a <quiz> quiz
-    When I click the <quiz> quiz progress bar
-    Then I am on <quiz> quiz page in the *Reports* tab
-      And I see high level quiz summary data
-      And I see a list of learners with quiz progress
+  Scenario: Review the progress of a started quiz
+    Given there is a started quiz
+      And there has been learner progress on the quiz
+    When I click the quiz progress bar
+    Then I am on the quiz page in the *Reports* tab
+      And I see a high level quiz summary data
+      And I see a list of learners and the progress made
 
-  Scenario: Review progress of a started lesson
-    Given there is a <lesson> lesson available
-      And there has been learner progress on a <lesson> lesson
-    When I click the <lesson> lesson progress bar
-    Then I am on <lesson> lesson page in the *Reports* tab
-      And I see high level lesson summary data
-      And I see a list of learners with lesson progress
+  Scenario: Review the progress of a started lesson
+    Given there is a lesson made visible to the learners
+      And there has been learner progress on a the lesson
+    When I click the lesson's progress bar
+    Then I am on the lesson page in the *Reports* tab
+      And I see a high level lesson summary data
+      And I see a list of learners and the progress made
 
   Scenario: Review all class activity notifications
-    When I click *View all* in the *Class activity* block
+    When I click *View all* in the *Class activity* section
     Then I am on the *Class activity* page
       And I see a history of all notifications
       And I see filters for *Resource type* and *Progress type*
 
   Scenario: Filter notifications by resource and progress
     Given that I am on the *Class activity* notifications page
-      When I open the *Resource type* filter
-      Then I see a list of resource options
-      When I open the *Progress type* filter
-      Then I see a list of progress options: all, completed, started, help needed
+    When I open the *Resource type* filter
+    Then I see a list of resource options
+    When I open the *Progress type* filter
+    Then I see a list of progress options: All, Completed, Started, Help needed
+    When I select a resource type and progress type
+    Then I see only results for corresponding to the applied filters

integration_testing/016-features/coach/class/coach-class-home.feature

@@ -3,38 +3,33 @@ Feature: General navigation on *Class home* tab
 
   Background:
     Given I am signed in as a class or facility coach
-      And there is more than one class in the facility
-      And I am on *Class home* for class <class>
-      And there are learners and coaches assigned to the class <class>
+      And there are several classes in the facility
+      And I am on *Class home* for a specific class
+      And there are learners and coaches assigned to the class
 
   Scenario: Navigate back to the class list
-    When I press the link “All classes”
+    When I press the link *All classes*
     Then I am back on the class selection page
       And I see a list of all the facility classes, or those I'm assigned to (if class coach)
 
-  Scenario: There are no quizzes
-    Given there are no created quizzes
-    When I look at the *Quizzes* block
-    Then I see no quizzes
-
-  Scenario: There are no lessons
-    Given there are no created lessons
-    When I look at the *Lessons* block
-    Then I see no lessons
+  Scenario: There are no quizzes and lessons
+    Given there are no created quizzes and lessons
+    When I look at the *Quizzes* and *Lessons* sections
+    Then I see the *There are no quizzes/lessons* message
 
   Scenario: There has been no activity in the class
     Given that there has not been any learner engagement in the class
     When I look at the *Class activity* block
-    Then I see *No activity in your class* notification
+    Then I see *No activity in your class* message
 
   Scenario: No coaches assigned to class
-    Given I am facility coach
-      And there are no coaches assigned to the class <class>
-    When I look at the <class> class home summary block at the top
+    Given I am a facility coach
+      And there are no coaches assigned to the class
+    When I look at the class home summary section at the top
     Then I see no coaches listed
       And I see *-* instead
 
   Scenario: No learners enrolled in the class
-    Given there are no learners assigned to the class
-    When I look at the <class> class home summary block at the top
-    Then I see *0* listed as number of learners
+    Given there are no learners enrolled in the class
+    When I look at the class home summary section at the top
+    Then I see *0* displayed as the number of learners