diff --git a/integration_testing/features/create-account.feature b/integration_testing/features/access-kolibri-studio/create-account.feature similarity index 100% rename from integration_testing/features/create-account.feature rename to integration_testing/features/access-kolibri-studio/create-account.feature diff --git a/integration_testing/features/explore-without-an-account.feature b/integration_testing/features/access-kolibri-studio/explore-without-an-account.feature similarity index 100% rename from integration_testing/features/explore-without-an-account.feature rename to integration_testing/features/access-kolibri-studio/explore-without-an-account.feature diff --git a/integration_testing/features/reset-your-password.feature b/integration_testing/features/access-kolibri-studio/reset-your-password.feature similarity index 100% rename from integration_testing/features/reset-your-password.feature rename to integration_testing/features/access-kolibri-studio/reset-your-password.feature diff --git a/integration_testing/features/url-updates.feature b/integration_testing/features/access-kolibri-studio/url-updates.feature similarity index 100% rename from integration_testing/features/url-updates.feature rename to integration_testing/features/access-kolibri-studio/url-updates.feature diff --git a/integration_testing/features/change-language.feature b/integration_testing/features/manage-account/change-language.feature similarity index 100% rename from integration_testing/features/change-language.feature rename to integration_testing/features/manage-account/change-language.feature diff --git a/integration_testing/features/delete-account.feature b/integration_testing/features/manage-account/delete-account.feature similarity index 100% rename from integration_testing/features/delete-account.feature rename to integration_testing/features/manage-account/delete-account.feature diff --git a/integration_testing/features/edit-account-information.feature b/integration_testing/features/manage-account/edit-account-information.feature similarity index 100% rename from integration_testing/features/edit-account-information.feature rename to integration_testing/features/manage-account/edit-account-information.feature diff --git a/integration_testing/features/export-account-information.feature b/integration_testing/features/manage-account/export-account-information.feature similarity index 100% rename from integration_testing/features/export-account-information.feature rename to integration_testing/features/manage-account/export-account-information.feature diff --git a/integration_testing/features/open-sidebar-and-user-menus.feature b/integration_testing/features/manage-account/open-sidebar-and-user-menus.feature similarity index 100% rename from integration_testing/features/open-sidebar-and-user-menus.feature rename to integration_testing/features/manage-account/open-sidebar-and-user-menus.feature diff --git a/integration_testing/features/report-issue.feature b/integration_testing/features/manage-account/report-issue.feature similarity index 100% rename from integration_testing/features/report-issue.feature rename to integration_testing/features/manage-account/report-issue.feature diff --git a/integration_testing/features/request-more-storage-space.feature b/integration_testing/features/manage-account/request-more-storage-space.feature similarity index 100% rename from integration_testing/features/request-more-storage-space.feature rename to integration_testing/features/manage-account/request-more-storage-space.feature diff --git a/integration_testing/features/review-used-storage.feature b/integration_testing/features/manage-account/review-used-storage.feature similarity index 100% rename from integration_testing/features/review-used-storage.feature rename to integration_testing/features/manage-account/review-used-storage.feature diff --git a/integration_testing/features/view-support-links.feature b/integration_testing/features/manage-account/view-support-links.feature similarity index 100% rename from integration_testing/features/view-support-links.feature rename to integration_testing/features/manage-account/view-support-links.feature diff --git a/integration_testing/features/add-channel-to-starred.feature b/integration_testing/features/manage-channels/add-channel-to-starred.feature similarity index 100% rename from integration_testing/features/add-channel-to-starred.feature rename to integration_testing/features/manage-channels/add-channel-to-starred.feature diff --git a/integration_testing/features/create-a-channel.feature b/integration_testing/features/manage-channels/create-a-channel.feature similarity index 100% rename from integration_testing/features/create-a-channel.feature rename to integration_testing/features/manage-channels/create-a-channel.feature diff --git a/integration_testing/features/create-a-collection.feature b/integration_testing/features/manage-channels/create-a-collection.feature similarity index 100% rename from integration_testing/features/create-a-collection.feature rename to integration_testing/features/manage-channels/create-a-collection.feature diff --git a/integration_testing/features/delete-a-collection.feature b/integration_testing/features/manage-channels/delete-a-collection.feature similarity index 100% rename from integration_testing/features/delete-a-collection.feature rename to integration_testing/features/manage-channels/delete-a-collection.feature diff --git a/integration_testing/features/delete-channel.feature b/integration_testing/features/manage-channels/delete-channel.feature similarity index 100% rename from integration_testing/features/delete-channel.feature rename to integration_testing/features/manage-channels/delete-channel.feature diff --git a/integration_testing/features/deploy-channel.feature b/integration_testing/features/manage-channels/deploy-channel.feature similarity index 100% rename from integration_testing/features/deploy-channel.feature rename to integration_testing/features/manage-channels/deploy-channel.feature diff --git a/integration_testing/features/edit-a-collection.feature b/integration_testing/features/manage-channels/edit-a-collection.feature similarity index 100% rename from integration_testing/features/edit-a-collection.feature rename to integration_testing/features/manage-channels/edit-a-collection.feature diff --git a/integration_testing/features/edit-channel-details.feature b/integration_testing/features/manage-channels/edit-channel-details.feature similarity index 100% rename from integration_testing/features/edit-channel-details.feature rename to integration_testing/features/manage-channels/edit-channel-details.feature diff --git a/integration_testing/features/get-channel-token-after-publishing.feature b/integration_testing/features/manage-channels/get-channel-token-after-publishing.feature similarity index 100% rename from integration_testing/features/get-channel-token-after-publishing.feature rename to integration_testing/features/manage-channels/get-channel-token-after-publishing.feature diff --git a/integration_testing/features/manage-additional-channel-options.feature b/integration_testing/features/manage-channels/manage-additional-channel-options.feature similarity index 100% rename from integration_testing/features/manage-additional-channel-options.feature rename to integration_testing/features/manage-channels/manage-additional-channel-options.feature diff --git a/integration_testing/features/open-a-channel-in-a-new-tab.feature b/integration_testing/features/manage-channels/open-a-channel-in-a-new-tab.feature similarity index 100% rename from integration_testing/features/open-a-channel-in-a-new-tab.feature rename to integration_testing/features/manage-channels/open-a-channel-in-a-new-tab.feature diff --git a/integration_testing/features/publish-channel.feature b/integration_testing/features/manage-channels/publish-channel.feature similarity index 100% rename from integration_testing/features/publish-channel.feature rename to integration_testing/features/manage-channels/publish-channel.feature diff --git a/integration_testing/features/share-channels.feature b/integration_testing/features/manage-channels/share-channels.feature similarity index 100% rename from integration_testing/features/share-channels.feature rename to integration_testing/features/manage-channels/share-channels.feature diff --git a/integration_testing/features/stop-channel-publish.feature b/integration_testing/features/manage-channels/stop-channel-publish.feature similarity index 100% rename from integration_testing/features/stop-channel-publish.feature rename to integration_testing/features/manage-channels/stop-channel-publish.feature diff --git a/integration_testing/features/sync-channel.feature b/integration_testing/features/manage-channels/sync-channel.feature similarity index 100% rename from integration_testing/features/sync-channel.feature rename to integration_testing/features/manage-channels/sync-channel.feature diff --git a/integration_testing/features/use-channels-with-view-only-access.feature b/integration_testing/features/manage-channels/use-channels-with-view-only-access.feature similarity index 100% rename from integration_testing/features/use-channels-with-view-only-access.feature rename to integration_testing/features/manage-channels/use-channels-with-view-only-access.feature diff --git a/integration_testing/features/view-channel-details.feature b/integration_testing/features/manage-channels/view-channel-details.feature similarity index 100% rename from integration_testing/features/view-channel-details.feature rename to integration_testing/features/manage-channels/view-channel-details.feature diff --git a/integration_testing/features/cancel-copy.feature b/integration_testing/features/manage-resources/cancel-copy.feature similarity index 100% rename from integration_testing/features/cancel-copy.feature rename to integration_testing/features/manage-resources/cancel-copy.feature diff --git a/integration_testing/features/cancel-sync.feature b/integration_testing/features/manage-resources/cancel-sync.feature similarity index 100% rename from integration_testing/features/cancel-sync.feature rename to integration_testing/features/manage-resources/cancel-sync.feature diff --git a/integration_testing/features/copy-resource-via-right-click.feature b/integration_testing/features/manage-resources/copy-resource-via-right-click.feature similarity index 100% rename from integration_testing/features/copy-resource-via-right-click.feature rename to integration_testing/features/manage-resources/copy-resource-via-right-click.feature diff --git a/integration_testing/features/copy-resource-via-selection-bar.feature b/integration_testing/features/manage-resources/copy-resource-via-selection-bar.feature similarity index 100% rename from integration_testing/features/copy-resource-via-selection-bar.feature rename to integration_testing/features/manage-resources/copy-resource-via-selection-bar.feature diff --git a/integration_testing/features/copy-to-clipboard.feature b/integration_testing/features/manage-resources/copy-to-clipboard.feature similarity index 100% rename from integration_testing/features/copy-to-clipboard.feature rename to integration_testing/features/manage-resources/copy-to-clipboard.feature diff --git a/integration_testing/features/create-a-topic.feature b/integration_testing/features/manage-resources/create-a-topic.feature similarity index 100% rename from integration_testing/features/create-a-topic.feature rename to integration_testing/features/manage-resources/create-a-topic.feature diff --git a/integration_testing/features/create-exercise.feature b/integration_testing/features/manage-resources/create-exercise.feature similarity index 100% rename from integration_testing/features/create-exercise.feature rename to integration_testing/features/manage-resources/create-exercise.feature diff --git a/integration_testing/features/delete-resources.feature b/integration_testing/features/manage-resources/delete-resources.feature similarity index 100% rename from integration_testing/features/delete-resources.feature rename to integration_testing/features/manage-resources/delete-resources.feature diff --git a/integration_testing/features/drag-drop-out-of-clipboard.feature b/integration_testing/features/manage-resources/drag-drop-out-of-clipboard.feature similarity index 100% rename from integration_testing/features/drag-drop-out-of-clipboard.feature rename to integration_testing/features/manage-resources/drag-drop-out-of-clipboard.feature diff --git a/integration_testing/features/drag-drop-to-clipboard.feature b/integration_testing/features/manage-resources/drag-drop-to-clipboard.feature similarity index 100% rename from integration_testing/features/drag-drop-to-clipboard.feature rename to integration_testing/features/manage-resources/drag-drop-to-clipboard.feature diff --git a/integration_testing/features/edit-resource-details.feature b/integration_testing/features/manage-resources/edit-resource-details.feature similarity index 100% rename from integration_testing/features/edit-resource-details.feature rename to integration_testing/features/manage-resources/edit-resource-details.feature diff --git a/integration_testing/features/expand-and-collapse-clipboard-topics.feature b/integration_testing/features/manage-resources/expand-and-collapse-clipboard-topics.feature similarity index 100% rename from integration_testing/features/expand-and-collapse-clipboard-topics.feature rename to integration_testing/features/manage-resources/expand-and-collapse-clipboard-topics.feature diff --git a/integration_testing/features/go-back-from-review-import-selections-to-channel-list.feature b/integration_testing/features/manage-resources/go-back-from-review-import-selections-to-channel-list.feature similarity index 100% rename from integration_testing/features/go-back-from-review-import-selections-to-channel-list.feature rename to integration_testing/features/manage-resources/go-back-from-review-import-selections-to-channel-list.feature diff --git a/integration_testing/features/go-to-resource-original-location.feature b/integration_testing/features/manage-resources/go-to-resource-original-location.feature similarity index 100% rename from integration_testing/features/go-to-resource-original-location.feature rename to integration_testing/features/manage-resources/go-to-resource-original-location.feature diff --git a/integration_testing/features/import-content-from-another-channel.feature b/integration_testing/features/manage-resources/import-content-from-another-channel.feature similarity index 100% rename from integration_testing/features/import-content-from-another-channel.feature rename to integration_testing/features/manage-resources/import-content-from-another-channel.feature diff --git a/integration_testing/features/import-from-search-results-at-my-channels-channel-2.feature b/integration_testing/features/manage-resources/import-from-search-results-at-my-channels-channel-2.feature similarity index 100% rename from integration_testing/features/import-from-search-results-at-my-channels-channel-2.feature rename to integration_testing/features/manage-resources/import-from-search-results-at-my-channels-channel-2.feature diff --git a/integration_testing/features/import-from-search-results-at-my-channels-channel.feature b/integration_testing/features/manage-resources/import-from-search-results-at-my-channels-channel.feature similarity index 100% rename from integration_testing/features/import-from-search-results-at-my-channels-channel.feature rename to integration_testing/features/manage-resources/import-from-search-results-at-my-channels-channel.feature diff --git a/integration_testing/features/jump-to-new-location.feature b/integration_testing/features/manage-resources/jump-to-new-location.feature similarity index 100% rename from integration_testing/features/jump-to-new-location.feature rename to integration_testing/features/manage-resources/jump-to-new-location.feature diff --git a/integration_testing/features/move-resources-from-clipboard.feature b/integration_testing/features/manage-resources/move-resources-from-clipboard.feature similarity index 100% rename from integration_testing/features/move-resources-from-clipboard.feature rename to integration_testing/features/manage-resources/move-resources-from-clipboard.feature diff --git a/integration_testing/features/move-resources.feature b/integration_testing/features/manage-resources/move-resources.feature similarity index 100% rename from integration_testing/features/move-resources.feature rename to integration_testing/features/manage-resources/move-resources.feature diff --git a/integration_testing/features/move-to-clipboard-via-right-click.feature b/integration_testing/features/manage-resources/move-to-clipboard-via-right-click.feature similarity index 100% rename from integration_testing/features/move-to-clipboard-via-right-click.feature rename to integration_testing/features/manage-resources/move-to-clipboard-via-right-click.feature diff --git a/integration_testing/features/preview-resource-in-clipboard.feature b/integration_testing/features/manage-resources/preview-resource-in-clipboard.feature similarity index 100% rename from integration_testing/features/preview-resource-in-clipboard.feature rename to integration_testing/features/manage-resources/preview-resource-in-clipboard.feature diff --git a/integration_testing/features/remove-from-clipboard-via-right-click.feature b/integration_testing/features/manage-resources/remove-from-clipboard-via-right-click.feature similarity index 100% rename from integration_testing/features/remove-from-clipboard-via-right-click.feature rename to integration_testing/features/manage-resources/remove-from-clipboard-via-right-click.feature diff --git a/integration_testing/features/remove-from-clipboard-via-selection-bar.feature b/integration_testing/features/manage-resources/remove-from-clipboard-via-selection-bar.feature similarity index 100% rename from integration_testing/features/remove-from-clipboard-via-selection-bar.feature rename to integration_testing/features/manage-resources/remove-from-clipboard-via-selection-bar.feature diff --git a/integration_testing/features/remove-multiple-resources-from-the-clipboard.feature b/integration_testing/features/manage-resources/remove-multiple-resources-from-the-clipboard.feature similarity index 100% rename from integration_testing/features/remove-multiple-resources-from-the-clipboard.feature rename to integration_testing/features/manage-resources/remove-multiple-resources-from-the-clipboard.feature diff --git a/integration_testing/features/remove-resource-from-channel.feature b/integration_testing/features/manage-resources/remove-resource-from-channel.feature similarity index 100% rename from integration_testing/features/remove-resource-from-channel.feature rename to integration_testing/features/manage-resources/remove-resource-from-channel.feature diff --git a/integration_testing/features/resource-count-updates-properly.feature b/integration_testing/features/manage-resources/resource-count-updates-properly.feature similarity index 100% rename from integration_testing/features/resource-count-updates-properly.feature rename to integration_testing/features/manage-resources/resource-count-updates-properly.feature diff --git a/integration_testing/features/restore-resources-from-trash.feature b/integration_testing/features/manage-resources/restore-resources-from-trash.feature similarity index 100% rename from integration_testing/features/restore-resources-from-trash.feature rename to integration_testing/features/manage-resources/restore-resources-from-trash.feature diff --git a/integration_testing/features/review-import-selection-at-my-channels.feature b/integration_testing/features/manage-resources/review-import-selection-at-my-channels.feature similarity index 100% rename from integration_testing/features/review-import-selection-at-my-channels.feature rename to integration_testing/features/manage-resources/review-import-selection-at-my-channels.feature diff --git a/integration_testing/features/search-for-resources.feature b/integration_testing/features/manage-resources/search-for-resources.feature similarity index 100% rename from integration_testing/features/search-for-resources.feature rename to integration_testing/features/manage-resources/search-for-resources.feature diff --git a/integration_testing/features/set-up-empty-topic-tree.feature b/integration_testing/features/manage-resources/set-up-empty-topic-tree.feature similarity index 100% rename from integration_testing/features/set-up-empty-topic-tree.feature rename to integration_testing/features/manage-resources/set-up-empty-topic-tree.feature diff --git a/integration_testing/features/undo-removal-of-clipboard-resources.feature b/integration_testing/features/manage-resources/undo-removal-of-clipboard-resources.feature similarity index 100% rename from integration_testing/features/undo-removal-of-clipboard-resources.feature rename to integration_testing/features/manage-resources/undo-removal-of-clipboard-resources.feature diff --git a/integration_testing/features/upload-files.feature b/integration_testing/features/manage-resources/upload-files.feature similarity index 100% rename from integration_testing/features/upload-files.feature rename to integration_testing/features/manage-resources/upload-files.feature diff --git a/integration_testing/features/view-resource-details.feature b/integration_testing/features/manage-resources/view-resource-details.feature similarity index 100% rename from integration_testing/features/view-resource-details.feature rename to integration_testing/features/manage-resources/view-resource-details.feature diff --git a/integration_testing/features/new-layout-in-the-edit-modal.feature b/integration_testing/features/new-layout-in-the-edit-modal.feature deleted file mode 100755 index b725878959..0000000000 --- a/integration_testing/features/new-layout-in-the-edit-modal.feature +++ /dev/null @@ -1,57 +0,0 @@ -Feature: New layout in the edit modal - User can see new fields: learning level, learning activity, what you will need, duration, completion, for beginners, accessibility, and category - -# Comment here - - Background: - Given I am signed into Studio - And I am in an editable channel - - Scenario: View .PDF/.EPUB layout - When I right click a .PDF or .EPUB resource - Then I see an options menu for that .PDF or .EPUB - When I click *Edit details* - Then I see *Title*, *Description*, *Learning activity*, *Level*, *What you will need*, *Tags*, and *Category* dropdowns under the *Basic information* section - And I see a *Completion* section underneath the *Basic information* section - And I see a *For beginners* checkbox in the Audience section - And I see an *Accessibility* section underneath the *Audience* section - - Scenario: View .MP3 layout - When I right click an .MP3 resource - Then I see an options menu for that .MP3 - When I click *Edit details* - Then I see *Title*, *Description*, *Learning activity*, *Level*, *What you will need*, *Tags*, and *Category* dropdowns under the *Basic information* section - And I see a *Completion* section underneath the *Basic information* section - And I see a *For beginners* checkbox in the Audience section - And I see *Captions and subtitles* underneath the *Source* section - - Scenario: View .MP4 / .MOV layout - When I right click an .MP4 or .MOV resource - Then I see an options menu for that .MP4 or .MOV - When I click *Edit details* - Then I see *Title*, *Description*, *Learning activity*, *Level*, *What you will need*, *Tags*, and *Category* dropdowns under the *Basic information* section - And I see a *Completion* section underneath the *Basic information* section - And I see a *Completion* dropdown under the *Completion* section - And I see *Allow learners to mark as complete* under the *Completion* section - And I see a *For beginners* checkbox in the Audience section - And I see an *Accessibility* section underneath the *Audience* section - - Scenario: View *Practice* resource layout - When I right click a *Practice* resource - Then I see an options menu for that *Practice* resource - When I click *Edit details* - Then I see *Title*, *Description*, *Learning activity*, *Level*, *What you will need*, *Tags*, and *Category* dropdowns under the *Basic information* section - And I see an *Assessment options* section underneath the *Basic information* section - And I see a *Completion* section underneath the *Assessment options* section - And I see a *For beginners* checkbox in the Audience section - And I see an *Accessibility* section underneath the *Audience* section - - Scenario: View .ZIP resource layout - When I right click a *.ZIP* resource - Then I see an options menu for that *.ZIP* resource - When I click *Edit details* - Then I see *Title*, *Description*, *Learning activity*, *Level*, *What you will need*, *Tags*, and *Category* dropdowns under the *Basic information* section - And I see an *Assessment options* section underneath the *Basic information* section - And I see a *Completion* section underneath the *Assessment options* section - And I see a *For beginners* checkbox in the Audience section - And I see an *Accessibility* section underneath the *Audience* section diff --git a/integration_testing/features/allow-marking-as-complete.feature b/integration_testing/features/wip-studio-edit-modal/allow-marking-as-complete.feature similarity index 61% rename from integration_testing/features/allow-marking-as-complete.feature rename to integration_testing/features/wip-studio-edit-modal/allow-marking-as-complete.feature index e840cb6a5b..18540109c8 100755 --- a/integration_testing/features/allow-marking-as-complete.feature +++ b/integration_testing/features/wip-studio-edit-modal/allow-marking-as-complete.feature @@ -1,22 +1,17 @@ Feature: Allow marking as complete This feature allows learners to manually mark a resource as complete in the learning platform. This option is available on all file types. -# Comment here - Background: Given I am signed into Studio - And I am in an editable channel - And I see the *Edit* modal for + And I am in an editable channel with all resource types + And I see the *Edit details* modal for the + And the *Allow marking as complete* checkbox is empty Scenario: Toggle *Allow learners to mark as complete* setting - Given the *Allow marking as complete* checkbox is empty When I click the *Allow marking as complete* checkbox Then I see the *Allow marking as complete* is selected When I click the selected *Allow marking as complete* checkbox Then I see the *Allow marking as complete* is empty - - Scenario: See that *Allow learners to mark as complete* is optional - Given the *Allow marking as complete* checkbox of is empty When I click *FINISH* - Then I see in the topic tree + Then I see the in the topic tree And I do not see an error icon diff --git a/integration_testing/features/edit-category-field.feature b/integration_testing/features/wip-studio-edit-modal/edit-category-field.feature similarity index 93% rename from integration_testing/features/edit-category-field.feature rename to integration_testing/features/wip-studio-edit-modal/edit-category-field.feature index 5191172a67..5c7812bcc2 100755 --- a/integration_testing/features/edit-category-field.feature +++ b/integration_testing/features/wip-studio-edit-modal/edit-category-field.feature @@ -1,14 +1,12 @@ Feature: Edit *Category* field Across all file types. -# Comment here - Background: Given I am signed into Studio - And I am in an editable channel - When I right click - When I click *Edit details* - Then I see the edit modal for + And I am in an editable channel with all resource types + When I right click a + And I click *Edit details* + Then I see the *Edit details* modal for the And I see the *Category* dropdown in the *Basic information* section Scenario: View category options @@ -53,7 +51,7 @@ Feature: Edit *Category* field Given that checkbox is selected And is a chip in the *Category* text field When I click under - then I see that is determinately selected + Then I see that is determinately selected And is still determinately selected And I see the chip in the *Category* text field changed to And I do not see as a chip in the *Category* text field diff --git a/integration_testing/features/edit-completion-field.feature b/integration_testing/features/wip-studio-edit-modal/edit-completion-field.feature similarity index 72% rename from integration_testing/features/edit-completion-field.feature rename to integration_testing/features/wip-studio-edit-modal/edit-completion-field.feature index 8d232bed46..e480ba6aec 100755 --- a/integration_testing/features/edit-completion-field.feature +++ b/integration_testing/features/wip-studio-edit-modal/edit-completion-field.feature @@ -1,44 +1,37 @@ -Feature: Edit completion field +Feature: Edit completion/duration field Across all file types -# Comment here - Background: Given I am signed into Studio - And I am in an editable channel - When I right click - When I click *Edit details* - Then I see the edit modal for + And I am in an editable channel with all resource types + When I right click a + And I click *Edit details* + Then I see the *Edit details* modal for the And I see the *Completion* section underneath the *Basic information* section - Scenario: View options for .MP4 - Given I am viewing an .MP4 file - When I click the *Completion* dropdown - Then I see the options: *Short activity*, *Long activity*, *Reference*, and *Exact time to complete* + Scenario: View options for .MP4 or .MP3 + Given I am viewing an .MP4 or an .MP3 file + When I click the *Duration* dropdown + Then I see the options: *Exact time to complete*, *Short activity*, *Long activity* and *Reference* - Scenario: View options for .PDF or .EPUB - Given I am viewing a .PDF or .EPUB file + Scenario: View options for .PDF, .EPUB or slides + Given I am viewing .PDF, .EPUB or slides When I click the *Completion* dropdown - Then I see the options: *All content viewed*, *Short activity*, *Long activity*, *Reference*, and *Exact time to complete* - - Scenario: View options for .MP3 - Given I am viewing an .MP3 file - When I click the *Completion* dropdown - Then I see the options: *Short activity*, *Long activity*, *Reference*, and *Exact time to complete* + Then I see the options: *All content viewed* and *Complete duration* Scenario: View options for .ZIP Given I am viewing a .ZIP When I click on the *Completion* dropdown - Then I see the options: *Short activity*, *Long activity*, *Reference*, *Exact time to complete* + Then I see the options: *Complete duration* and *Determined by this resource* Scenario: View options for Practice resources Given I am viewing an exercise When I click on the *Completion* dropdown - Then I see the options: *Practice until goal is met*, *Short activity*, *Long activity*, *Reference*, *Exact time to complete* + Then I see the options: *Practice until goal is met* and *Practice quiz* Scenario: Set completion to *Short activity* When I click on the *Completion* dropdown - When I select *Short activity* + And I select *Short activity* Then I see *Short activity* appear in the text input And I see a *Minutes* text input field appear next to *Completion* And I see a slider appear next to *Minutes* @@ -59,7 +52,7 @@ Feature: Edit completion field Scenario: Set completion to *Long activity* When I click on the *Completion* dropdown - When I select *Long activity* + And I select *Long activity* Then I see *Long activity* appear in the text input And I see a *Minutes* text input field appear next to *Completion* And I see a slider appear next to *Minutes* @@ -83,12 +76,9 @@ Feature: Edit completion field Scenario: Set completion to *Reference* When I click on the *Completion* dropdown - When I select *Reference* + And I select *Reference* Then I see *Reference* appear as an input for *Completion* And I see the caption *Progress will not be tracked on reference material unless learners mark it as complete* - And I see an info icon next to the *Completion* field - When I hover over the info icon - Then I see the tooltip *Textbooks, dictionaries, indexes, and other similar resources* Scenario: Set completion to *Exact time to complete* on .MP4 or .MOV Given I am viewing an .MP4 or .MOV @@ -100,13 +90,13 @@ Feature: Edit completion field Scenario: Set completion to *Exact time to complete* for non- .MP4 or .MOV Given I am viewing a resource that is not an .MP4 or .MOV When I click the *Completion* dropdown - When I select *Exact time to complete* + And I select *Exact time to complete* Then I see a *Exact time to complete* appear as an input for *Completion* And I see a *Minutes* text input field appear next to *Completion* And I see it is empty by default When I click the *Minutes* field - When I enter a whole number - When I lose focus on the field + And I enter a whole number + And I lose focus on the field Then I see the number has saved Scenario: Enter whole numbers only to *Minutes* field @@ -117,25 +107,25 @@ Feature: Edit completion field Scenario: Set completion to *Practice until goal is met* Given I am viewing an exercise When I click the *Completion* dropdown - When I click *Practice until goal is met* + And I click *Practice until goal is met* Then I see the *Completion* field is set to *Practice until goal is met* And I see an empty *Goal* text field dropdown appears next to it When I click the *Goal* dropdown Then I see the options: *100% correct*, *M of N*, *10 in a row*, *2 in a row*, *3 in a row*, *5 in a row* When I select *M of N* - Then I see an empty*Correct answers needed* text field, */*, and empty *Recent answers* text field appear + Then I see an empty *Correct answers needed* text field, */*, and empty *Recent answers* text field appear Scenario: See that *Completion* field is required Given the *Completion* field of is empty When I click the *Completion* text field - When I lose focus on the *Completion* text field + And I lose focus on the *Completion* text field Then I see *Completion* is in an error state And I see *Completion is required* When I click *FINISH* Then I see in the topic tree And I see a red error icon on - When I left-click - Then I see the previewer for + When I left-click the + Then I see the previewer for the And I see there is no learning activity label at the top left And I see the *Completion* field has a red error icon And I see the message *Missing completion criteria* in red text diff --git a/integration_testing/features/edit-learning-activity-field.feature b/integration_testing/features/wip-studio-edit-modal/edit-learning-activity-field.feature similarity index 78% rename from integration_testing/features/edit-learning-activity-field.feature rename to integration_testing/features/wip-studio-edit-modal/edit-learning-activity-field.feature index fc126dacc8..360212a796 100755 --- a/integration_testing/features/edit-learning-activity-field.feature +++ b/integration_testing/features/wip-studio-edit-modal/edit-learning-activity-field.feature @@ -1,14 +1,12 @@ Feature: Edit *Learning activity* field Across all file types -# Comment here - Background: Given I am signed into Studio - And I am in an editable channel - When I right click - When I click *Edit details* - Then I see the edit modal for + And I am in an editable channel with all resource types + When I right click a + And I click *Edit details* + Then I see the *Edit details* modal for the And I see the *Learning activity* dropdown in the *Basic information* section Scenario: View learning activity options @@ -52,14 +50,14 @@ Feature: Edit *Learning activity* field Scenario: See that learning activity field is required Given the *Learning activity* field of is empty When I click the *Learning activity* text field - When I lose focus on the *Learning activity* text field - Then I see *Learning activity* is in an error state + And I lose focus on the *Learning activity* text field + Then I see that the *Learning activity* is in an error state And I see *Learning activity is required* When I click *FINISH* - Then I see in the topic tree - And I see a red error icon on - When I left-click - Then I see the previewer for + Then I see the in the topic tree + And I see a red error icon on the + When I left-click the + Then I see the previewer for the And I see there is no learning activity label at the top left And I see the *Learning activity* field has a red error icon - And I see the message *Missing learning activity* in red text + And I see a *Missing learning activity* message in red text diff --git a/integration_testing/features/edit-learnin- level-field.feature b/integration_testing/features/wip-studio-edit-modal/edit-learning-level-field.feature similarity index 87% rename from integration_testing/features/edit-learnin- level-field.feature rename to integration_testing/features/wip-studio-edit-modal/edit-learning-level-field.feature index 7cf471cdbe..7d3c2da940 100755 --- a/integration_testing/features/edit-learnin- level-field.feature +++ b/integration_testing/features/wip-studio-edit-modal/edit-learning-level-field.feature @@ -1,20 +1,18 @@ Feature: Edit *Learning level* field Across all file types -# Comment here - Background: Given I am signed into Studio - And I am in an editable channel + And I am in an editable channel with all resource types When I right click - When I click *Edit details* - Then I see the edit modal for + And I click *Edit details* + Then I see the *Edit details* modal for the And I see the *Level* dropdown in the *Basic information* section Scenario: View learning level options When I click the *Level* dropdown Then I see multi-select checkboxes - And I see the options: *Preschool/Nursery*, *Lower primary*, *Upper primary*, *Lower secondary*, *Upper secondary*, *Tertiary*, *Specialized professional training*, *All levels -- basic skills*, *All levels -- work skills* + And I see the options: *Preschool/Nursery*, *Lower primary*, *Upper primary*, *Lower secondary*, *Upper secondary*, *Tertiary*, *Specialized professional training*, *All levels -- basic skills*, *All levels -- work skills* #TO DO - we need a final list with the available checkboxes Scenario: Select options Given I see the options for *Level* diff --git a/integration_testing/features/edit-multiple-resources-at-the-same-time.feature b/integration_testing/features/wip-studio-edit-modal/edit-multiple-resources-at-the-same-time.feature similarity index 93% rename from integration_testing/features/edit-multiple-resources-at-the-same-time.feature rename to integration_testing/features/wip-studio-edit-modal/edit-multiple-resources-at-the-same-time.feature index cf91aaa6a1..db8657662e 100755 --- a/integration_testing/features/edit-multiple-resources-at-the-same-time.feature +++ b/integration_testing/features/wip-studio-edit-modal/edit-multiple-resources-at-the-same-time.feature @@ -1,14 +1,12 @@ Feature: Edit multiple resources at the same time in the edit modal Users can apply dropdown options to multiple resources at one time -# Comment here - Background: Given I am signed into Studio - And I am in an editable channel + And I am in an editable channel with all resource types When I select resource checkboxes - When I click *Edit* in the toolbar - Then I see all resources in the edit modal + And I click *Edit* in the toolbar + Then I see all resources in the *Edit details* modal Scenario: See which fields are hidden and shown When I select more than one checkbox in the resource panel on the left diff --git a/integration_testing/features/edit-what-you-will-need-field.feature b/integration_testing/features/wip-studio-edit-modal/edit-what-you-will-need-field.feature similarity index 84% rename from integration_testing/features/edit-what-you-will-need-field.feature rename to integration_testing/features/wip-studio-edit-modal/edit-what-you-will-need-field.feature index 91b1e84e7c..f5922a4586 100755 --- a/integration_testing/features/edit-what-you-will-need-field.feature +++ b/integration_testing/features/wip-studio-edit-modal/edit-what-you-will-need-field.feature @@ -1,14 +1,12 @@ Feature: Edit *What you will need* field Across all file types -# Comment here - Background: Given I am signed into Studio - And I am in an editable channel + And I am in an editable channel with all resource types When I right click When I click *Edit details* - Then I see the edit modal for + Then I see the *Edit details* modal for the And I see the *What you will need* dropdown in the *Basic information* section Scenario: View *What you will need* options @@ -50,10 +48,10 @@ Feature: Edit *What you will need* field And the height of the *What you will need* dropdown grows to contain it Scenario: See that *What you will need* field is optional - Given the *What you will need* field of is empty + Given the *What you will need* field of a is empty When I click *FINISH* Then I see in the topic tree And I do not see an error icon - When I left-click - Then I see the previewer for - And I see the *What you will need* field is empty + When I left-click the + Then I see the previewer for the + And I see that the *What you will need* field is empty diff --git a/integration_testing/features/wip-studio-edit-modal/new-layout-in-the-edit-modal.feature b/integration_testing/features/wip-studio-edit-modal/new-layout-in-the-edit-modal.feature new file mode 100755 index 0000000000..45abba073a --- /dev/null +++ b/integration_testing/features/wip-studio-edit-modal/new-layout-in-the-edit-modal.feature @@ -0,0 +1,135 @@ +Feature: New layout in the edit modal + User can see new fields: learning level, learning activity, what you will need, duration, completion, for beginners, accessibility, and category + + Background: + Given I am signed into Studio + And I am in an editable channel + And I have added resources of type .pdf, .epub, .mp3, .mp4, .mov, .zip to the channel + + Scenario: View .PDF/.EPUB layout + When I right click a .PDF or .EPUB resource + Then I see an options menu for that .PDF or .EPUB + When I click *Edit details* + Then I see the *Edit details* modal + And I am at the *Details* tab + And I see a book icon and a label *Read* + And I see the resource thumbnail + And I see a *Preview files* option + And I see the *Basic information* section with the following fields: *Title*, *Description*, *Learning activity*, *Level*, *What you will need*, *Tags*, and *Category* + And I see a *Completion* section under the *Basic information* section + And I see the *Allow learner to mark as complete* checkbox + And I see a *Completion* and a *Duration* drop-downs and a *Minutes* slider + And I see the *Thumbnail* section + And I see the *Audience* section + And I see the *Language* and *Visible to* drop-downs + And I see a *For beginners* checkbox + And I see the *Accessibility* section + And I see the following checkboxes there: *Has alternative text description for images*, *Has high contrast display for low vision*, *Tagged PDF* + And I see the *Source* section + And I see the following fields there: *Author*, *Provider*, *Aggregator*, *License*, *Copyright holder* + + Scenario: View .MP3 layout + When I right click an .MP3 resource + Then I see an options menu for that .MP3 + When I click *Edit details* + Then I see the *Edit details* modal + And I am at the *Details* tab + And I see a headphones icon and a label *Listen* + And I see an audio player + And I see a *Preview files* option + And I see the *Basic information* section with the following fields: *Title*, *Description*, *Learning activity*, *Level*, *What you will need*, *Tags*, and *Category* + And I see a *Completion* section under the *Basic information* section + And I see the *Allow learner to mark as complete* checkbox + And I see a *Duration* drop-down + And I see the *Thumbnail* section + And I see the *Audience* section + And I see the *Language* and *Visible to* drop-downs + And I see a *For beginners* checkbox + And I see the *Source* section + And I see the following fields there: *Author*, *Provider*, *Aggregator*, *License* + And I see the *Captions and subtitles* section + And I see the *Add captions* link + + Scenario: View .MP4 / .MOV layout + When I right click an .MP4 or .MOV resource + Then I see an options menu for that .MP4 or .MOV + When I click *Edit details* + Then I see the *Edit details* modal + And I am at the *Details* tab + And I see a play icon and a label *Watch* + And I see an audio player + And I see a *Preview files* option + And I see the *Basic information* section with the following fields: *Title*, *Description*, *Learning activity*, *Level*, *What you will need*, *Tags*, and *Category* + And I see a *Completion* section under the *Basic information* section + And I see the *Allow learner to mark as complete* checkbox + And I see a *Duration* drop-down + And I see the *Thumbnail* section + And I see the *Audience* section + And I see the *Language* and *Visible to* drop-downs + And I see a *For beginners* checkbox + And I see the *Accessibility* section with the following checkboxes: *Has sign language captions*, *Has audio descriptions* + And I see the *Source* section + And I see the following fields there: *Author*, *Provider*, *Aggregator*, *License*, *Copyright holder* + + Scenario: View *Practice* resource layout + When I right click a *Practice* resource + Then I see an options menu for that *Practice* resource + When I click *Edit details* + Then I see the *Edit details* modal + And I am at the *Details* tab + And I see a writing sheet icon and a label *Practice* + And I see the *Basic information* section with the following fields: *Title*, *Description*, *Learning activity*, *Level*, *What you will need*, *Tags*, and *Category* + And I see the *Assessment options* section + And I see a *Randomize question order for learners* + And I see the *Completion* section + And I see the *Allow learner to mark as complete* checkbox + And I see the following fields: *Completion*, *Goal*, *Correct answers needed*, *Recent answers*, *Duration* and a *Minutes* slider + And I see the *Thumbnail* section + And I see the *Audience* section + And I see the *Language* and *Visible to* drop-downs + And I see a *For beginners* checkbox + And I see the *Accessibility* section with the following checkbox: *Has alternative text description for images* + And I see the *Source* section + And I see the following fields there: *Author*, *Provider*, *Aggregator*, *License*, *Copyright holder* + + Scenario: View .ZIP resource layout + When I right click a *.ZIP* resource + Then I see an options menu for that *.ZIP* resource + When I click *Edit details* + Then I see the *Edit details* modal + And I am at the *Details* tab + And I see a hand icon and a label *Explore* + And I see a thumbnail + And I see a *Preview files* option + And I see the *Basic information* section with the following fields: *Title*, *Description*, *Learning activity*, *Level*, *What you will need*, *Tags*, and *Category* + And I see a *Completion* section under the *Basic information* section + And I see the *Allow learner to mark as complete* checkbox + And I see a *Duration* drop-down and a *Minutes* slider + And I see the *Thumbnail* section + And I see the *Audience* section + And I see the *Language* and *Visible to* drop-downs + And I see a *For beginners* checkbox + And I see the *Accessibility* section with the following checkboxes: *Has alternative text descriptions*, *Has high contrast display for low vision* + And I see the *Source* section + And I see the following fields there: *Author*, *Provider*, *Aggregator*, *License*, *Copyright holder* + + Scenario: View multiple activities layout + When I right click a resource #TO DO: How exactly do we get to the multiple activities edit details? + Then I see an options menu for that resource + When I click *Edit details* + Then I see the *Edit details* modal + And I am at the *Details* tab + And I see a the icons for the activities + And I see a thumbnail + And I see a *Preview files* option + And I see the *Basic information* section with the following fields: *Title*, *Description*, *Learning activity*, *Level*, *What you will need*, *Tags*, and *Category* + And I see a *Completion* section under the *Basic information* section + And I see the *Allow learner to mark as complete* checkbox + And I see a *Duration* drop-down and a *Minutes* slider + And I see the *Thumbnail* section + And I see the *Audience* section + And I see the *Language* and *Visible to* drop-downs + And I see a *For beginners* checkbox + And I see the *Accessibility* section with the following checkboxes: *Has alternative text descriptions*, *Has high contrast display for low vision*, *Tagged PDF* + And I see the *Source* section + And I see the following fields there: *Author*, *Provider*, *Aggregator*, *License*, *Copyright holder* diff --git a/integration_testing/features/new-metadata-defaults-while-uploading-or-creating-new-files.feature b/integration_testing/features/wip-studio-edit-modal/new-metadata-defaults-while-uploading-or-creating-new-files.feature similarity index 91% rename from integration_testing/features/new-metadata-defaults-while-uploading-or-creating-new-files.feature rename to integration_testing/features/wip-studio-edit-modal/new-metadata-defaults-while-uploading-or-creating-new-files.feature index 109c81686e..3dad8a676c 100755 --- a/integration_testing/features/new-metadata-defaults-while-uploading-or-creating-new-files.feature +++ b/integration_testing/features/wip-studio-edit-modal/new-metadata-defaults-while-uploading-or-creating-new-files.feature @@ -1,17 +1,15 @@ Feature: New metadata defaults while uploading or creating new files User uploads files and sees which new metadata fields are and aren't set by default -# Comment here - Background: Given I am signed into Studio And I am in an editable channel - When I click the *ADD* button - When I select *Upload files* + When I click the *Add* button + And I select *Upload files* Then I see the *Upload files* page Scenario: Upload .PDF or .EPUB - When I upload <.PDF or .EPUB> + When I upload a .PDF or an .EPUB file Then I see the edit modal for <.PDF or .EPUB> And I see upload of <.PDF or .EPUB> is in progress And I see *Level* is empty @@ -62,8 +60,8 @@ Feature: New metadata defaults while uploading or creating new files Scenario: Create new Practice resource Given I am in an editable channel - When I click *ADD* - When I click *New exercise* + When I click *Add* + And I click *New exercise* Then I see the edit modal for the exercise And I see *Level* is empty And I see *Learning activity* is set to *Practice* diff --git a/integration_testing/features/wip-edit-accessibility-field.feature b/integration_testing/features/wip-studio-edit-modal/wip-edit-accessibility-field.feature similarity index 100% rename from integration_testing/features/wip-edit-accessibility-field.feature rename to integration_testing/features/wip-studio-edit-modal/wip-edit-accessibility-field.feature diff --git a/integration_testing/features/wip-toggle-make-this-a-quiz-in-assessment-options.feature b/integration_testing/features/wip-studio-edit-modal/wip-toggle-make-this-a-quiz-in-assessment-options.feature similarity index 100% rename from integration_testing/features/wip-toggle-make-this-a-quiz-in-assessment-options.feature rename to integration_testing/features/wip-studio-edit-modal/wip-toggle-make-this-a-quiz-in-assessment-options.feature diff --git a/integration_testing/features/view-new-metadata-in-previewers-across-studio.feature b/integration_testing/features/wip-studio-previewers-cards-channel-details/view-new-metadata-in-previewers-across-studio.feature similarity index 96% rename from integration_testing/features/view-new-metadata-in-previewers-across-studio.feature rename to integration_testing/features/wip-studio-previewers-cards-channel-details/view-new-metadata-in-previewers-across-studio.feature index 1a890b51b9..03f60b2a6c 100755 --- a/integration_testing/features/view-new-metadata-in-previewers-across-studio.feature +++ b/integration_testing/features/wip-studio-previewers-cards-channel-details/view-new-metadata-in-previewers-across-studio.feature @@ -1,8 +1,6 @@ Feature: View new metadata in previewers across Studio How the new metadata is laid out on previewers -# Comment here - Background: Given I am signed into Studio And I am in an editable channel diff --git a/integration_testing/features/view-new-metadata-in-the-channel-details-modal.feature b/integration_testing/features/wip-studio-previewers-cards-channel-details/view-new-metadata-in-the-channel-details-modal.feature similarity index 77% rename from integration_testing/features/view-new-metadata-in-the-channel-details-modal.feature rename to integration_testing/features/wip-studio-previewers-cards-channel-details/view-new-metadata-in-the-channel-details-modal.feature index bb3cb50ac1..524973558b 100755 --- a/integration_testing/features/view-new-metadata-in-the-channel-details-modal.feature +++ b/integration_testing/features/wip-studio-previewers-cards-channel-details/view-new-metadata-in-the-channel-details-modal.feature @@ -1,16 +1,13 @@ Feature: View new metadata in the channel details modal - -# Comment here - Background: Given I am signed into Studio - And I am in an editable channel, - When I click on the info icon next to the label in the app bar - Then I see the channel details modal for + And I am in an editable channel + When I click on the info icon next to the channel label in the app bar + Then I see the channel details modal for the channel Scenario: View total resources - Given there are resources for all learning activity types in + Given there are resources for all learning activity types in a channel And some are marked with *Multiple activities* Then I see the new icons and labels And I see the number of resources for each learning activity diff --git a/integration_testing/features/view-new-metadata-on-cards-and-list-items-in-the-studio-topic-tree-view.feature b/integration_testing/features/wip-studio-previewers-cards-channel-details/view-new-metadata-on-cards-and-list-items-in-the-studio-topic-tree-view.feature similarity index 95% rename from integration_testing/features/view-new-metadata-on-cards-and-list-items-in-the-studio-topic-tree-view.feature rename to integration_testing/features/wip-studio-previewers-cards-channel-details/view-new-metadata-on-cards-and-list-items-in-the-studio-topic-tree-view.feature index 422be8d9cc..db25525014 100755 --- a/integration_testing/features/view-new-metadata-on-cards-and-list-items-in-the-studio-topic-tree-view.feature +++ b/integration_testing/features/wip-studio-previewers-cards-channel-details/view-new-metadata-on-cards-and-list-items-in-the-studio-topic-tree-view.feature @@ -1,10 +1,8 @@ Feature: View new metadata on cards and list items in the Studio topic tree view -# Comment here - Background: Given I am signed into Studio - And I am in an editable channel + And I am in an editable channel with all resource types Scenario: See new metadata for .pdf, .epub, .mp3, .mp4, .mov, .zip Given *View* is set to *Default view*