From 8403ae9933cee9f4f9697af5085d841dfabd2850 Mon Sep 17 00:00:00 2001 From: Dipak Acharya Date: Fri, 25 Jun 2021 12:27:11 +0545 Subject: [PATCH] [Tests-Only] do not restore settings value in ui tests --- .drone.star | 1 - settings/nightwatch.conf.js | 7 +---- .../stepDefinitions/settingsContext.js | 31 ------------------- 3 files changed, 1 insertion(+), 38 deletions(-) diff --git a/.drone.star b/.drone.star index 6882892c6..17dcb6d13 100644 --- a/.drone.star +++ b/.drone.star @@ -673,7 +673,6 @@ def settingsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4): "NODE_TLS_REJECT_UNAUTHORIZED": 0, "WEB_PATH": "/srv/app/web", "FEATURE_PATH": "/drone/src/settings/ui/tests/acceptance/features", - "OCIS_SETTINGS_STORE": "/srv/app/tmp/ocis/settings", }, "commands": [ ". /drone/src/.drone.env", diff --git a/settings/nightwatch.conf.js b/settings/nightwatch.conf.js index 6fd57ff4b..8f5140925 100644 --- a/settings/nightwatch.conf.js +++ b/settings/nightwatch.conf.js @@ -1,15 +1,10 @@ const path = require('path') const WEB_PATH = process.env.WEB_PATH const TEST_INFRA_DIRECTORY = process.env.TEST_INFRA_DIRECTORY -const OCIS_SETTINGS_STORE = process.env.OCIS_SETTINGS_STORE || '/var/tmp/ocis/settings' const config = require(path.join(WEB_PATH, 'nightwatch.conf.js')) config.page_objects_path = [TEST_INFRA_DIRECTORY + '/acceptance/pageObjects', 'ui/tests/acceptance/pageobjects'] config.custom_commands_path = TEST_INFRA_DIRECTORY + '/acceptance/customCommands' -config.test_settings.default.globals = { ...config.test_settings.default.globals, settings_store: OCIS_SETTINGS_STORE } - -module.exports = { - ...config -} +module.exports = config diff --git a/settings/ui/tests/acceptance/stepDefinitions/settingsContext.js b/settings/ui/tests/acceptance/stepDefinitions/settingsContext.js index 2f995694a..ae184683a 100644 --- a/settings/ui/tests/acceptance/stepDefinitions/settingsContext.js +++ b/settings/ui/tests/acceptance/stepDefinitions/settingsContext.js @@ -42,34 +42,3 @@ Then('the files header should be displayed in language {string}', async function const expected = languageHelper.getFilesHeaderMenuForLanguage(language) assert.deepStrictEqual(items, expected, 'the menu list were not same') }) - -After(async function () { - let directory = path.join(client.globals.settings_store, 'assignments') - try { - fs.readdirSync(directory).map(element => { - if (!initialLanguageAssignments.includes(element)) { - fs.unlinkSync(path.join(client.globals.settings_store, 'assignments', element)) - } - }) - } catch (err) { - console.log('Error while reading the settings values from file system... ') - } - - directory = path.join(client.globals.settings_store, 'values') - try { - fs.emptyDirSync(directory) - } catch (err) { - console.log('Error while cleaning the settings values from file system... ') - } -}) - -Before(async function() { - const directory = path.join(client.globals.settings_store, 'assignments') - try { - fs.readdirSync(directory).map(element => { - initialLanguageAssignments.push(element) - }) - } catch (err) { - console.log('Error while reading the settings values from file system... ') - } -}) \ No newline at end of file