From 2a73ece86ac3fa67472b16a1daaef95224f78b6e Mon Sep 17 00:00:00 2001 From: Peter Cenov Date: Mon, 21 Feb 2022 07:59:33 -0800 Subject: [PATCH 1/3] additional scenarios for the options.ini file --- ...-admin-customizes-kolibri-settings.feature | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100755 integration_testing/features/super-admin/commands/super-admin-customizes-kolibri-settings.feature diff --git a/integration_testing/features/super-admin/commands/super-admin-customizes-kolibri-settings.feature b/integration_testing/features/super-admin/commands/super-admin-customizes-kolibri-settings.feature new file mode 100755 index 00000000000..0403a8485e1 --- /dev/null +++ b/integration_testing/features/super-admin/commands/super-admin-customizes-kolibri-settings.feature @@ -0,0 +1,62 @@ +Feature: Super admin customizes the Kolibri settings with the options.ini file + Super admin needs to be able to customize the Kolibri settings by modifying the options.ini file + + Background: + Given that the Kolibri server is not running + And I have opened the "options.ini" file which is located inside the ".kolibri" folder + And there are the following sections: [Cache], [Database], [Server], [Paths], [Urls], [Deployment], [Python], [Tasks], [Learn] + + Scenario: Change the default HTTP port + When I add "HTTP_PORT = under the [Deployment] section + And I save my changes + And I run the "kolibri start" command in the terminal or command prompt + Then I see that the Kolibri server is running at port + + Scenario: Configure Kolibri to display a specific set of languages + When I add "LANGUAGES = '','' under the [Deployment] section + And I save my changes + And I run the "kolibri start" command in the terminal or command prompt + And I go to the *Sign in* page and click the language selector + Then I see only the specified languages in the language selector modal window + And I can select a language and see the Kolibri UI displayed in the selected language + + Scenario: Change the default Content directory + When I add "CONTENT_DIR = " under the [Paths] section + And I save my changes + And I run the "kolibri manage content movedirectory " command in the terminal or command prompt + Then I can see the content moved in the destination folder + + Scenario: Change the default central content base URL + When I add "CENTRAL_CONTENT_BASE_URL = under the [Urls] section + And I save my changes + And I run the "kolibri start" command in the terminal or command prompt + And I go to Device>Channels + And I click the *Import* button + Then I see the *Select a source* modal + And I see the *Kolibri Studio (online)* option selected + When I click the *Continue* button + Then I see the *Select resources for import* page + And I can see all the available resources + + Scenario: Change the default Data portal syncing base URL + Given my facility is registered to a Project on Kolibri Data Portal + When I add "DATA_PORTAL_SYNCING_BASE_URL = under the [Urls] section + And I save my changes + And I run the "kolibri start" command in the terminal or command prompt + And I go to *Device > Facilities* + And I click the *Sync* button + Then I see the *Select a source* modal + When I select *Kolibri Data Portal* + And I click *Continue* + Then I see the list of facilities + And I see a *Syncing* message under + And I see an indeterminate spinner + And I see there is a new task in *Device > Tasks* + When the is done syncing + Then I see a message under the *Last synced: just now* + + + +Examples: + | port number | language intl_code | content folder | content fallback folder | content base URL | + | 8081 | en | C:\Users\IEUser\.kolibri\content | C:\Users\IEUser\.kolibri\| https://hotfixes.studio.learningequality.org/ | From c709abab334a968cbfb7a0797b752154324a4ded Mon Sep 17 00:00:00 2001 From: Peter Cenov Date: Wed, 23 Feb 2022 07:20:36 -0800 Subject: [PATCH 2/3] added a new scenario for the custom navigation and some corrections --- ...-admin-customizes-kolibri-settings.feature | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/integration_testing/features/super-admin/commands/super-admin-customizes-kolibri-settings.feature b/integration_testing/features/super-admin/commands/super-admin-customizes-kolibri-settings.feature index 0403a8485e1..ebeb0d1b04e 100755 --- a/integration_testing/features/super-admin/commands/super-admin-customizes-kolibri-settings.feature +++ b/integration_testing/features/super-admin/commands/super-admin-customizes-kolibri-settings.feature @@ -7,13 +7,13 @@ Feature: Super admin customizes the Kolibri settings with the options.ini file And there are the following sections: [Cache], [Database], [Server], [Paths], [Urls], [Deployment], [Python], [Tasks], [Learn] Scenario: Change the default HTTP port - When I add "HTTP_PORT = under the [Deployment] section + When I add "HTTP_PORT = " under the [Deployment] section And I save my changes And I run the "kolibri start" command in the terminal or command prompt Then I see that the Kolibri server is running at port Scenario: Configure Kolibri to display a specific set of languages - When I add "LANGUAGES = '','' under the [Deployment] section + When I add "LANGUAGES = '',''" under the [Deployment] section And I save my changes And I run the "kolibri start" command in the terminal or command prompt And I go to the *Sign in* page and click the language selector @@ -27,10 +27,10 @@ Feature: Super admin customizes the Kolibri settings with the options.ini file Then I can see the content moved in the destination folder Scenario: Change the default central content base URL - When I add "CENTRAL_CONTENT_BASE_URL = under the [Urls] section + When I add "CENTRAL_CONTENT_BASE_URL = " under the [Urls] section And I save my changes And I run the "kolibri start" command in the terminal or command prompt - And I go to Device>Channels + And I go to *Device>Channels* And I click the *Import* button Then I see the *Select a source* modal And I see the *Kolibri Studio (online)* option selected @@ -40,7 +40,7 @@ Feature: Super admin customizes the Kolibri settings with the options.ini file Scenario: Change the default Data portal syncing base URL Given my facility is registered to a Project on Kolibri Data Portal - When I add "DATA_PORTAL_SYNCING_BASE_URL = under the [Urls] section + When I add "DATA_PORTAL_SYNCING_BASE_URL = " under the [Urls] section And I save my changes And I run the "kolibri start" command in the terminal or command prompt And I go to *Device > Facilities* @@ -55,6 +55,26 @@ Feature: Super admin customizes the Kolibri settings with the options.ini file When the is done syncing Then I see a message under the *Last synced: just now* + Scenario: Enable custom channel navigation + When I add "ENABLE_CUSTOM_CHANNEL_NAV = True" under the [Learn] section + And I save my changes + And I run the "kolibri start" command in the terminal or command prompt + And I go to *Device>Channels* + And I click the *Import* button + Then I see the *Select a source* modal + And I see the *Kolibri Studio (online)* option selected + When I click the *Continue* button + Then I see the *Select resources for import* page + And I can see all the available resources + When I click *Import with token* + Then I see the *Enter channel token* modal + When I input a token for a channel with custom navigation such as "bovir-dubov" + And I click *Continue* + Then I see the imported channel + When I go to the *Learn>Library* page + And I click on the channel with custom navigation + Then I am at the *Browse channel* modal window + And I can interact with the contents of the channel Examples: From def11c54d4088a03c700e52223a3399dd6d8756d Mon Sep 17 00:00:00 2001 From: Peter Cenov Date: Mon, 28 Feb 2022 06:39:08 -0800 Subject: [PATCH 3/3] corrections and removed super-admin-set-kolibri-port.feature --- ...-admin-customizes-kolibri-settings.feature | 6 ++--- .../super-admin-set-kolibri-port.feature | 23 ------------------- 2 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 integration_testing/features/super-admin/commands/super-admin-set-kolibri-port.feature diff --git a/integration_testing/features/super-admin/commands/super-admin-customizes-kolibri-settings.feature b/integration_testing/features/super-admin/commands/super-admin-customizes-kolibri-settings.feature index ebeb0d1b04e..98d41cc95e7 100755 --- a/integration_testing/features/super-admin/commands/super-admin-customizes-kolibri-settings.feature +++ b/integration_testing/features/super-admin/commands/super-admin-customizes-kolibri-settings.feature @@ -30,7 +30,7 @@ Feature: Super admin customizes the Kolibri settings with the options.ini file When I add "CENTRAL_CONTENT_BASE_URL = " under the [Urls] section And I save my changes And I run the "kolibri start" command in the terminal or command prompt - And I go to *Device>Channels* + And I go to *Device > Channels* And I click the *Import* button Then I see the *Select a source* modal And I see the *Kolibri Studio (online)* option selected @@ -59,7 +59,7 @@ Feature: Super admin customizes the Kolibri settings with the options.ini file When I add "ENABLE_CUSTOM_CHANNEL_NAV = True" under the [Learn] section And I save my changes And I run the "kolibri start" command in the terminal or command prompt - And I go to *Device>Channels* + And I go to *Device > Channels* And I click the *Import* button Then I see the *Select a source* modal And I see the *Kolibri Studio (online)* option selected @@ -71,7 +71,7 @@ Feature: Super admin customizes the Kolibri settings with the options.ini file When I input a token for a channel with custom navigation such as "bovir-dubov" And I click *Continue* Then I see the imported channel - When I go to the *Learn>Library* page + When I go to the *Learn > Library* page And I click on the channel with custom navigation Then I am at the *Browse channel* modal window And I can interact with the contents of the channel diff --git a/integration_testing/features/super-admin/commands/super-admin-set-kolibri-port.feature b/integration_testing/features/super-admin/commands/super-admin-set-kolibri-port.feature deleted file mode 100644 index bd080e1bdfd..00000000000 --- a/integration_testing/features/super-admin/commands/super-admin-set-kolibri-port.feature +++ /dev/null @@ -1,23 +0,0 @@ -Feature: Super admin set the Kolibri server port - Super admin needs to be able to set the Kolibri server port according to their needs - - Background: - Given that the Kolibri server is not running - And I have access to terminal or command prompt - - Scenario: Set the port using the options.ini file - When I edit/create the "options.ini" file inside the "KOLIBRI_HOME" folder - And I write "[Deployment]" on the first line - And I write "HTTP_PORT=" on the next line - And I save my changes - And I run the `kolibri start` command in the terminal or command prompt - Then I see that the Kolibri server is running on port - - Scenario: Set the port with the "KOLIBRI_HTTP_PORT" environment variable - When I set the using the "KOLIBRI_HTTP_PORT" environment variable - And I run the 'kolibri start' command in the terminal or command prompt - Then I see that the Kolibri server is running on port - -Examples: -| port | -| 9999 |