From b46dad39ff75fc5ab9c59c4261becb05716ba834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 25 Sep 2020 11:50:57 +0200 Subject: [PATCH] only write config if file does not already exist --- ...reateEnviromentConfiguration.js => config.js} | 16 ++++++++++------ src/Umbraco.Tests.AcceptanceTest/package.json | 4 ++-- src/Umbraco.Tests.AcceptanceTest/postinstall.js | 14 ++++++++++++++ 3 files changed, 26 insertions(+), 8 deletions(-) rename src/Umbraco.Tests.AcceptanceTest/{createEnviromentConfiguration.js => config.js} (63%) create mode 100644 src/Umbraco.Tests.AcceptanceTest/postinstall.js diff --git a/src/Umbraco.Tests.AcceptanceTest/createEnviromentConfiguration.js b/src/Umbraco.Tests.AcceptanceTest/config.js similarity index 63% rename from src/Umbraco.Tests.AcceptanceTest/createEnviromentConfiguration.js rename to src/Umbraco.Tests.AcceptanceTest/config.js index 469408d4b3..44f4f7543a 100644 --- a/src/Umbraco.Tests.AcceptanceTest/createEnviromentConfiguration.js +++ b/src/Umbraco.Tests.AcceptanceTest/config.js @@ -1,17 +1,21 @@ const prompt = require('prompt'); -fs = require('fs'); +const fs = require('fs'); const properties = [ { - name: 'superadmin username/email' + name: 'username' }, { - name: 'superadmin password', + name: 'password', hidden: true } ]; -console.log("Configure your test enviroment:") + +const configPath = './cypress.env.json' + +console.log("Configure your test enviroment") +console.log("Enter CMS superadmin credentials:") prompt.start(); @@ -23,10 +27,10 @@ var fileContent = `{ "password": "${result.password}" }`; - fs.writeFile('cypress.env.json', fileContent, function (error) { + fs.writeFile(configPath, fileContent, function (error) { if (error) return console.error(error); console.log('Configuration saved'); - }); + }); }); function onError(error) { diff --git a/src/Umbraco.Tests.AcceptanceTest/package.json b/src/Umbraco.Tests.AcceptanceTest/package.json index 12db29b68a..e845681f18 100644 --- a/src/Umbraco.Tests.AcceptanceTest/package.json +++ b/src/Umbraco.Tests.AcceptanceTest/package.json @@ -1,7 +1,7 @@ { "scripts": { - "postinstall": "node createEnviromentConfiguration.js", - "config": "node createEnviromentConfiguration.js", + "postinstall": "node postinstall.js", + "config": "node config.js", "test": "npx cypress run", "ui": "npx cypress open" }, diff --git a/src/Umbraco.Tests.AcceptanceTest/postinstall.js b/src/Umbraco.Tests.AcceptanceTest/postinstall.js new file mode 100644 index 0000000000..ba2246b592 --- /dev/null +++ b/src/Umbraco.Tests.AcceptanceTest/postinstall.js @@ -0,0 +1,14 @@ +const fs = require('fs'); + +const configPath = './cypress.env.json'; + +try { + if (fs.existsSync(configPath)) { + //file exists + console.log("Skips configuration as file already exists, run 'npm run config' to change your configuration."); + } else { + require('./createEnviromentConfiguration.js'); + } +} catch(err) { + console.error(err) +}