diff --git a/bubble-server/src/test/java/bubble/test/ActivatedBubbleModelTestBase.java b/bubble-server/src/test/java/bubble/test/ActivatedBubbleModelTestBase.java index b15b1dc8..68611e91 100644 --- a/bubble-server/src/test/java/bubble/test/ActivatedBubbleModelTestBase.java +++ b/bubble-server/src/test/java/bubble/test/ActivatedBubbleModelTestBase.java @@ -35,6 +35,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import static bubble.ApiConstants.*; +import static bubble.model.account.Account.ROOT_EMAIL; import static bubble.model.account.Account.ROOT_USERNAME; import static org.cobbzilla.util.daemon.ZillaRuntime.*; import static org.cobbzilla.util.handlebars.HandlebarsUtil.applyReflectively; @@ -122,7 +123,7 @@ public abstract class ActivatedBubbleModelTestBase extends BubbleModelTestBase { // if DB already exists, server has already been activated try { admin = client.put(AUTH_ENDPOINT + EP_ACTIVATE, new ActivationRequest() - .setEmail(ROOT_USERNAME) + .setEmail(ROOT_EMAIL) .setPassword(ROOT_PASSWORD) .setNetworkName(hostname_short()) .addCloudConfig(dns) diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard index 341912e6..d5bcc744 160000 --- a/utils/cobbzilla-wizard +++ b/utils/cobbzilla-wizard @@ -1 +1 @@ -Subproject commit 341912e6b1e97ef1b7e499854818633dc93de052 +Subproject commit d5bcc744604f51fbeb321818c9c2882f515b4edd