Make registration more consistent

src/d2m/converters/user-to-mxid.test.js

@@ -45,14 +45,6 @@ test("user2name: works on special user", t => {
 	t.equal(userToSimName(data.user.clyde_ai), "clyde_ai")
 })
 
-test("user2name: includes ID if requested in config", t => {
-	const {reg} = require("../../matrix/read-registration")
-	reg.ooye.include_user_id_in_mxid = true
-	t.equal(userToSimName({username: "Harry Styles!", discriminator: "0001", id: "123456"}), "123456_harry_styles")
-   t.equal(userToSimName({username: "f***", discriminator: "0001", id: "123456"}), "123456_f")
-	reg.ooye.include_user_id_in_mxid = false
-})
-
 test("webhook author: can generate sim names", t => {
 	t.equal(webhookAuthorToSimName({
 		username: "Cadence, Maid of Creation, Eye of Clarity, Empress of Hope ☆",
@@ -60,3 +52,10 @@ test("webhook author: can generate sim names", t => {
 		id: "123"
 	}), "webhook_cadence_maid_of_creation_eye_of_clarity_empress_of_hope")
 })
+
+test("user2name: includes ID if requested in config", t => {
+	const {reg} = require("../../matrix/read-registration")
+	reg.ooye.include_user_id_in_mxid = true
+	t.equal(userToSimName({username: "Harry Styles!", discriminator: "0001", id: "123456"}), "123456_harry_styles")
+	t.equal(userToSimName({username: "f***", discriminator: "0001", id: "123456"}), "123456_f")
+})

test/test.js

@@ -30,6 +30,7 @@ reg.ooye.bridge_origin = "https://bridge.example.org"
 reg.ooye.time_zone = "Pacific/Auckland"
 reg.ooye.max_file_size = 5000000
 reg.ooye.web_password = "password123"
+reg.ooye.include_user_id_in_mxid = false
 
 const sync = new HeatSync({watchFS: false})