From 7825ebe69493fa5ef6f544b02ee461001628428a Mon Sep 17 00:00:00 2001
From: Kristijan Mitrovic <kmitrovic@itekako.com>
Date: Wed, 3 Jun 2020 10:16:39 +0200
Subject: [PATCH] Set username in test in a single place

---
 .../models/tests/live/backup_and_restore.json   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/bubble-server/src/test/resources/models/tests/live/backup_and_restore.json b/bubble-server/src/test/resources/models/tests/live/backup_and_restore.json
index b2eb41e4..dbb97d08 100644
--- a/bubble-server/src/test/resources/models/tests/live/backup_and_restore.json
+++ b/bubble-server/src/test/resources/models/tests/live/backup_and_restore.json
@@ -1,6 +1,7 @@
 [
   {
-    "comment": "login as root on sage node",
+    "comment": "login as root on sage node (adding username to ctx also)",
+    "before": "add_to_ctx { \"username\": \"bubble-user\" }",
     "connection": {
       "name": "sageConnection",
       "baseUri": "https://{{sageFqdn}}:{{serverConfig.nginxPort}}/api"
@@ -41,11 +42,11 @@
     "params": {
       "sageFqdn": "{{sageFqdn}}",
       "rootPassword": "{{sageRootPass}}",
-      "username": "bubble-user",
+      "username": "{{username}}",
       "password": "password1!",
       "userSessionVar": "userSession",
       "network": "bubble-{{rand 5}}",
-      "email": "bubble-user@example.com",
+      "email": "{{username}}@example.com",
       "plan": "bubble",
       "networkVar": "bubbleNetwork",
       "bubbleConnectionVar": "bubbleConnection",
@@ -68,11 +69,11 @@
     "comment": "add verified email to root account on new node",
     "include": "add_approved_contact",
     "params": {
-      "username": "bubble-user",
+      "username": "{{username}}",
       "userSession": "bubbleUserSession",
       "userConnection": "bubbleConnection",
-      "contactInfo": "bubble-user@example.com",
-      "contactLookup": "bubble-user@example.com",
+      "contactInfo": "{{username}}@example.com",
+      "contactLookup": "{{username}}@example.com",
       "authFactor": "not_required",
       "rootSession": "bubbleUserSession",
       "rootConnection": "bubbleConnection"
@@ -117,7 +118,7 @@
     "include": "get_network_keys",
     "params": {
       "network": "{{bubbleNetwork.network}}",
-      "rootEmail": "bubble-user@example.com",
+      "rootEmail": "{{username}}@example.com",
       "networkKeysVar": "networkKeys",
       "networkKeysPassword": "Passw0rd!!"
     }
@@ -178,7 +179,7 @@
       "session": "new",
       "uri": "auth/login",
       "entity": {
-        "name": "bubble-user",
+        "name": "{{username}}",
         "password": "password1!"
       }
     },