diff --git a/integration_testing/features/access-kolibri-studio/create-account.feature b/integration_testing/features/access-kolibri-studio/create-account.feature index 7b52e97df5..78c6c085db 100755 --- a/integration_testing/features/access-kolibri-studio/create-account.feature +++ b/integration_testing/features/access-kolibri-studio/create-account.feature @@ -1,30 +1,33 @@ -Feature: Create account on Studio +Feature: Create an account on Studio Background: - Given I am signed in to Studio - And I am on Studio home page - And I do not have an account registered with my + Given I am not signed in to Studio + And I am at Studio's sign-in page + And I haven't previously registered with my email - Scenario: Create account + Scenario: Create an account and sign in with the created account + When I click the *Create an account* button + Then I see the *Create an account* form + And I see the *Basic information* section containing the following fields: First name, Last name, Email, Password and Confirm password + And I see the *How do you plan on using Kolibri Studio (check all that apply)*, *Where do you plan to use Kolibri Studio? (check all that apply)*, *How did you hear about us?* and *I have read and agree to terms of service and the privacy policy* sections + And I see the *View Privacy Policy* and *View Terms of Service* links When I input all the required fields And I click the *Finish* button Then I see the *Activation link sent* page - And I see the email in my Inbox - When I click the activation link - And I go to Studio home page - Then I am able to sign in + And I see *Thank you for creating an account! To complete the process, please check your email for the activation link we sent you.* + When I open the received email and click the activation link + Then I see the *Account successfully created* page + When I click the *Continue to sign-in page* button + Then I am at the sign-in page + When I fill in my email and password + And I click the *Sign in* button + Then I am able to sign in successfully - Scenario: See error notification + Scenario: See an error notification if not all required information is provided When I fail to provide all the required information Then I see the *Please fix the errors below* alert under the main heading And I see the *Field is required* error notification for each missing information When I correct the error(s) And I click the *Finish* button Then I see the *Activation link sent* page - And I see the email in my Inbox - When I click the activation link - And I go to Studio home page - Then I am able to sign in - - Examples: - | email | + And I see *Thank you for creating an account! To complete the process, please check your email for the activation link we sent you.* diff --git a/integration_testing/features/access-kolibri-studio/sign-in.feature b/integration_testing/features/access-kolibri-studio/sign-in.feature new file mode 100755 index 0000000000..1678e03bac --- /dev/null +++ b/integration_testing/features/access-kolibri-studio/sign-in.feature @@ -0,0 +1,24 @@ +Feature: Sign in to Studio + + Background: + Given I am not signed in to Studio + And I am at Studio's sign-in page + And I have already registered with my email + + Scenario: Sign in to Studio + When I fill in my email + And I fill in my password + And I click the *Sign in* button + Then I am signed in + And I am at *My channels* page + + Scenario: See error notification for incorrect email or password + When I fill in an incorrect email or password + And I click the *Sign in* button + Then I see the following validation message above the form: *Email or password is incorrect* + + Scenario: See validation messages for the required fields + When I leave one or both of the *Email* and *Password* fields empty + And I click the *Sign in* button + Then I see the fields colored in red + And I see a *Field is required* message under each empty field diff --git a/integration_testing/features/access-kolibri-studio/url-updates.feature b/integration_testing/features/access-kolibri-studio/url-updates.feature deleted file mode 100755 index 6e379d509a..0000000000 --- a/integration_testing/features/access-kolibri-studio/url-updates.feature +++ /dev/null @@ -1,25 +0,0 @@ -Feature: URL update when the user switches between channel list -User can see changes at the URL when they switch between channel list - - Background: - Given I am signed in to Studio - - Scenario: URL update at the *My Channels* nav - When I click *My Channels* nav - Then I see that the URL changes - - Scenario: URL update at the *Starred* nav - When I click *Starred* nav - Then I see that the URL changes - - Scenario: URL update at the *View-Only* nav - When I click *View-Only* nav - Then I see that the URL changes - - Scenario: URL update at the *Content Library* nav - When I click *Content Library* nav - Then I see that the URL changes - - Scenario: URL update at the *Collections* nav - When I click *Collections* nav - Then I see that the URL changes diff --git a/integration_testing/features/manage-account/change-language.feature b/integration_testing/features/common/change-language.feature similarity index 59% rename from integration_testing/features/manage-account/change-language.feature rename to integration_testing/features/common/change-language.feature index e5eb75523a..f642029fde 100755 --- a/integration_testing/features/manage-account/change-language.feature +++ b/integration_testing/features/common/change-language.feature @@ -8,6 +8,16 @@ Feature: Change language Then the language interface changes to the selected language And the selected language is no longer clickable + Scenario: Change language when you are exploring without an account + Given I am not signed-in to Studio + And I have clicked the *Explore without an account link* + When I click on the user profile icon + And I click *Change language* + Then I see a *Change language* modal window displayed with several languages to choose from + When I click on a language which is not currently selected + And I click the *Confirm* button + Then the interface language changes to the selected language + Scenario: Change language as a signed-in user Given I am signed-in to Studio And I click the user profile icon diff --git a/integration_testing/features/manage-account/open-sidebar-and-user-menus.feature b/integration_testing/features/common/open-sidebar-and-user-menus.feature similarity index 100% rename from integration_testing/features/manage-account/open-sidebar-and-user-menus.feature rename to integration_testing/features/common/open-sidebar-and-user-menus.feature diff --git a/integration_testing/features/manage-channels/create-a-collection.feature b/integration_testing/features/manage-collections/create-a-collection.feature similarity index 100% rename from integration_testing/features/manage-channels/create-a-collection.feature rename to integration_testing/features/manage-collections/create-a-collection.feature diff --git a/integration_testing/features/manage-channels/delete-a-collection.feature b/integration_testing/features/manage-collections/delete-a-collection.feature similarity index 100% rename from integration_testing/features/manage-channels/delete-a-collection.feature rename to integration_testing/features/manage-collections/delete-a-collection.feature diff --git a/integration_testing/features/manage-channels/edit-a-collection.feature b/integration_testing/features/manage-collections/edit-a-collection.feature similarity index 100% rename from integration_testing/features/manage-channels/edit-a-collection.feature rename to integration_testing/features/manage-collections/edit-a-collection.feature diff --git a/integration_testing/features/manage-resources/clipboard/expand-and-collapse-clipboard-folders.feature b/integration_testing/features/manage-resources/clipboard/expand-and-collapse-clipboard-folders.feature new file mode 100755 index 0000000000..3dfa83ff2c --- /dev/null +++ b/integration_testing/features/manage-resources/clipboard/expand-and-collapse-clipboard-folders.feature @@ -0,0 +1,15 @@ +Feature: Expand and collapse folders in the clipboard + + Background: + Given I am signed in to Studio + And I am on the channel editor view + + Scenario: Expand and collapse folders in the clipboard + When I click on clipboard button on the bottom-right of the screen + Then the clipboard opens up + When I expand a folder on the clipboard via the downward arrow button + Then I see the items within the folder appear + And I see the downward arrow button changes to an upward arrow button + When I collapse a folder on the clipboard via the upward arrow button + Then I see the items within that folder disappear + And I see the upward arrow button changes to an upward arrow button diff --git a/integration_testing/features/manage-resources/go-to-resource-original-location.feature b/integration_testing/features/manage-resources/clipboard/go-to-resource-original-location.feature similarity index 100% rename from integration_testing/features/manage-resources/go-to-resource-original-location.feature rename to integration_testing/features/manage-resources/clipboard/go-to-resource-original-location.feature diff --git a/integration_testing/features/manage-resources/preview-resource-in-clipboard.feature b/integration_testing/features/manage-resources/clipboard/preview-resource-in-clipboard.feature similarity index 100% rename from integration_testing/features/manage-resources/preview-resource-in-clipboard.feature rename to integration_testing/features/manage-resources/clipboard/preview-resource-in-clipboard.feature diff --git a/integration_testing/features/manage-resources/remove-from-clipboard-via-right-click.feature b/integration_testing/features/manage-resources/clipboard/remove-from-clipboard-via-right-click.feature similarity index 100% rename from integration_testing/features/manage-resources/remove-from-clipboard-via-right-click.feature rename to integration_testing/features/manage-resources/clipboard/remove-from-clipboard-via-right-click.feature diff --git a/integration_testing/features/manage-resources/remove-from-clipboard-via-selection-bar.feature b/integration_testing/features/manage-resources/clipboard/remove-from-clipboard-via-selection-bar.feature similarity index 100% rename from integration_testing/features/manage-resources/remove-from-clipboard-via-selection-bar.feature rename to integration_testing/features/manage-resources/clipboard/remove-from-clipboard-via-selection-bar.feature diff --git a/integration_testing/features/manage-resources/remove-multiple-resources-from-the-clipboard.feature b/integration_testing/features/manage-resources/clipboard/remove-multiple-resources-from-the-clipboard.feature similarity index 100% rename from integration_testing/features/manage-resources/remove-multiple-resources-from-the-clipboard.feature rename to integration_testing/features/manage-resources/clipboard/remove-multiple-resources-from-the-clipboard.feature diff --git a/integration_testing/features/manage-resources/undo-removal-of-clipboard-resources.feature b/integration_testing/features/manage-resources/clipboard/undo-removal-of-clipboard-resources.feature similarity index 100% rename from integration_testing/features/manage-resources/undo-removal-of-clipboard-resources.feature rename to integration_testing/features/manage-resources/clipboard/undo-removal-of-clipboard-resources.feature diff --git a/integration_testing/features/manage-resources/cancel-copy.feature b/integration_testing/features/manage-resources/copy-resources/cancel-copy.feature similarity index 100% rename from integration_testing/features/manage-resources/cancel-copy.feature rename to integration_testing/features/manage-resources/copy-resources/cancel-copy.feature diff --git a/integration_testing/features/manage-resources/cancel-sync.feature b/integration_testing/features/manage-resources/copy-resources/cancel-sync.feature similarity index 100% rename from integration_testing/features/manage-resources/cancel-sync.feature rename to integration_testing/features/manage-resources/copy-resources/cancel-sync.feature diff --git a/integration_testing/features/manage-resources/copy-resource-via-right-click.feature b/integration_testing/features/manage-resources/copy-resources/copy-resource-via-right-click.feature similarity index 100% rename from integration_testing/features/manage-resources/copy-resource-via-right-click.feature rename to integration_testing/features/manage-resources/copy-resources/copy-resource-via-right-click.feature diff --git a/integration_testing/features/manage-resources/copy-resource-via-selection-bar.feature b/integration_testing/features/manage-resources/copy-resources/copy-resource-via-selection-bar.feature similarity index 100% rename from integration_testing/features/manage-resources/copy-resource-via-selection-bar.feature rename to integration_testing/features/manage-resources/copy-resources/copy-resource-via-selection-bar.feature diff --git a/integration_testing/features/manage-resources/copy-to-clipboard.feature b/integration_testing/features/manage-resources/copy-resources/copy-to-clipboard.feature similarity index 100% rename from integration_testing/features/manage-resources/copy-to-clipboard.feature rename to integration_testing/features/manage-resources/copy-resources/copy-to-clipboard.feature diff --git a/integration_testing/features/manage-resources/expand-and-collapse-clipboard-topics.feature b/integration_testing/features/manage-resources/expand-and-collapse-clipboard-topics.feature deleted file mode 100755 index d2907f563c..0000000000 --- a/integration_testing/features/manage-resources/expand-and-collapse-clipboard-topics.feature +++ /dev/null @@ -1,15 +0,0 @@ -Feature: Expand and collapse topics in the clipboard - - Background: - Given I am signed in to Studio - And I am on the channel editor view - - Scenario: Expand and collapse topics in the clipboard - When I click on clipboard button on the bottom-right of the screen - Then the clipboard opens up - When I expand a topic on the clipboard via the downward carot button - Then I see the items within the topic appear - And I see the downward carot button changes to an upward carot button - When I collapse a topic on the clipboard via the upward carot button - Then I see the items within that topic disappear - And I see the upward carot button changes to an upward carot button diff --git a/integration_testing/features/manage-resources/import-content-from-another-channel.feature b/integration_testing/features/manage-resources/import/import-content-from-another-channel.feature similarity index 100% rename from integration_testing/features/manage-resources/import-content-from-another-channel.feature rename to integration_testing/features/manage-resources/import/import-content-from-another-channel.feature diff --git a/integration_testing/features/manage-resources/import-from-search-results-at-my-channels-channel-2.feature b/integration_testing/features/manage-resources/import/import-from-search-results-at-my-channels-channel-2.feature similarity index 100% rename from integration_testing/features/manage-resources/import-from-search-results-at-my-channels-channel-2.feature rename to integration_testing/features/manage-resources/import/import-from-search-results-at-my-channels-channel-2.feature diff --git a/integration_testing/features/manage-resources/import-from-search-results-at-my-channels-channel.feature b/integration_testing/features/manage-resources/import/import-from-search-results-at-my-channels-channel.feature similarity index 100% rename from integration_testing/features/manage-resources/import-from-search-results-at-my-channels-channel.feature rename to integration_testing/features/manage-resources/import/import-from-search-results-at-my-channels-channel.feature diff --git a/integration_testing/features/manage-resources/create-a-topic.feature b/integration_testing/features/manage-resources/manage-folders/create-a-folder.feature similarity index 67% rename from integration_testing/features/manage-resources/create-a-topic.feature rename to integration_testing/features/manage-resources/manage-folders/create-a-folder.feature index 0f3939d738..18394b56c8 100755 --- a/integration_testing/features/manage-resources/create-a-topic.feature +++ b/integration_testing/features/manage-resources/manage-folders/create-a-folder.feature @@ -1,16 +1,16 @@ -Feature: Create a topic +Feature: Create a folder Background: Given I am signed in to Studio And I am on the channel editor page - Scenario: Create a topic + Scenario: Create a folder When I click the *Add* button in the top right corner - And I click the *New topic* option - Then I see the *New topic* modal + And I click the *New folder* option + Then I see the *New folder* modal When I fill in the required field *Title* And I fill in any of the other fields such as *Description*, *Tags* and *Language* And I add a thumbnail image And I click the *Finish* button Then I am on the channel editor page - And I can see the newly created topic + And I can see the newly created folder diff --git a/integration_testing/features/manage-resources/manage-folders/set-up-empty-folder-tree.feature b/integration_testing/features/manage-resources/manage-folders/set-up-empty-folder-tree.feature new file mode 100755 index 0000000000..769d76ecda --- /dev/null +++ b/integration_testing/features/manage-resources/manage-folders/set-up-empty-folder-tree.feature @@ -0,0 +1,28 @@ +Feature: Set up empty folder tree + + Background: + Given I am signed in to Studio + And I am on the channel editor page for an empty channel + + Scenario: Create an empty folder tree + When I click the *Add* button in the top right corner + And I click the *New folder* option + Then I see the *New folder* modal + When I fill in the required fields + And I click the *Add new folder* button + Then I can fill in the required fields for a new folder #repeat this process for as many empty folders you need + When I click the *Finish* button + Then I am on the channel editor page + And I can see the empty folders + + Scenario: Create sub-folders + Given I have created an empty folder tree + When I click *⋮* (Options) button for a folder + And I click the *New folder* option + Then I see the *New folder* modal + When I fill in the required fields + And I click the *Add new folder* button + Then I can fill in the required fields for a new folder #repeat this process for as many empty folders you need + When I click the *Finish* button + Then I am on the channel editor page + And I can click on the folder to see the created sub-folders diff --git a/integration_testing/features/manage-resources/drag-drop-out-of-clipboard.feature b/integration_testing/features/manage-resources/move-resources/drag-drop-out-of-clipboard.feature similarity index 100% rename from integration_testing/features/manage-resources/drag-drop-out-of-clipboard.feature rename to integration_testing/features/manage-resources/move-resources/drag-drop-out-of-clipboard.feature diff --git a/integration_testing/features/manage-resources/drag-drop-to-clipboard.feature b/integration_testing/features/manage-resources/move-resources/drag-drop-to-clipboard.feature similarity index 100% rename from integration_testing/features/manage-resources/drag-drop-to-clipboard.feature rename to integration_testing/features/manage-resources/move-resources/drag-drop-to-clipboard.feature diff --git a/integration_testing/features/manage-resources/jump-to-new-location.feature b/integration_testing/features/manage-resources/move-resources/jump-to-new-location.feature similarity index 100% rename from integration_testing/features/manage-resources/jump-to-new-location.feature rename to integration_testing/features/manage-resources/move-resources/jump-to-new-location.feature diff --git a/integration_testing/features/manage-resources/move-resources-from-clipboard.feature b/integration_testing/features/manage-resources/move-resources/move-resources-from-clipboard.feature similarity index 100% rename from integration_testing/features/manage-resources/move-resources-from-clipboard.feature rename to integration_testing/features/manage-resources/move-resources/move-resources-from-clipboard.feature diff --git a/integration_testing/features/manage-resources/move-resources.feature b/integration_testing/features/manage-resources/move-resources/move-resources.feature similarity index 100% rename from integration_testing/features/manage-resources/move-resources.feature rename to integration_testing/features/manage-resources/move-resources/move-resources.feature diff --git a/integration_testing/features/manage-resources/move-to-clipboard-via-right-click.feature b/integration_testing/features/manage-resources/move-resources/move-to-clipboard-via-right-click.feature similarity index 100% rename from integration_testing/features/manage-resources/move-to-clipboard-via-right-click.feature rename to integration_testing/features/manage-resources/move-resources/move-to-clipboard-via-right-click.feature diff --git a/integration_testing/features/manage-resources/set-up-empty-topic-tree.feature b/integration_testing/features/manage-resources/set-up-empty-topic-tree.feature deleted file mode 100755 index 062b8d2a4a..0000000000 --- a/integration_testing/features/manage-resources/set-up-empty-topic-tree.feature +++ /dev/null @@ -1,28 +0,0 @@ -Feature: Set up empty topic tree - - Background: - Given I am signed in to Studio - And I am on the channel editor page for an empty channel - - Scenario: Create an empty topic tree - When I click the *Add* button in the top right corner - And I click the *New topic* option - Then I see the *New topic* modal - When I fill in the required fields - And I click the *Add new topic* button - Then I can fill in the required fields for a new topic #repeat this process for as many empty topics you need - When I click the *Finish* button - Then I am on the channel editor page - And I can see the empty topics - - Scenario: Create sub-topics - Given I have created an empty topic tree - When I click *⋮* (Options) button for a topic - And I click the *New topic* option - Then I see the *New topic* modal - When I fill in the required fields - And I click the *Add new topic* button - Then I can fill in the required fields for a new topic #repeat this process for as many empty topics you need - When I click the *Finish* button - Then I am on the channel editor page - And I can click on the topic to see the created sub-topics