spec/: fix tests to match previous changes

Signed-off-by: Ferass El Hafidi <[email protected]>

Author: Ferass El Hafidi

spec/integ/matrix-to-irc.spec.js

@@ -298,7 +298,7 @@ describe("Matrix-to-IRC message bridging", function() {
                 expect(client.nick).toEqual(testUser.nick);
                 expect(client.addr).toEqual(roomMapping.server);
                 expect(channel).toEqual(roomMapping.channel);
-                expect(text).toEqual(`<${repliesUser.nick}> "This is the real message" <- Reply Text`);
+                expect(text).toEqual(`${repliesUser.nick}: "This is the real message" <- Reply Text`);
             }
         );
         const formatted_body = constructHTMLReply(
@@ -389,7 +389,7 @@ describe("Matrix-to-IRC message bridging", function() {
                 expect(client.nick).toEqual(testUser.nick);
                 expect(client.addr).toEqual(roomMapping.server);
                 expect(channel).toEqual(roomMapping.channel);
-                expect(text).toEqual(`<${repliesUser.nick}> "This..." <- Reply Text`);
+                expect(text).toEqual(`${repliesUser.nick}: "This..." <- Reply Text`);
             }
         );
         const formatted_body = constructHTMLReply(
@@ -499,7 +499,7 @@ describe("Matrix-to-IRC message bridging", function() {
                 expect(client.nick).toEqual(testUser.nick);
                 expect(client.addr).toEqual(roomMapping.server);
                 expect(channel).toEqual(roomMapping.channel);
-                expect(text).toEqual('<M-friend> "Message #2" <- Message #3');
+                expect(text).toEqual('M-friend: "Message #2" <- Message #3');
             }
         );
 
@@ -650,7 +650,7 @@ describe("Matrix-to-IRC message bridging", function() {
         });
     });
 
-    it("should bridge mutliline code blocks as IRC action with URL", function(done) {
+    it("should bridge mutliline code blocks as a URL", function(done) {
         let tBody =
             "```javascript\n" +
             "    expect(text.indexOf(\"javascript\")).not.toEqual(-1);\n" +
@@ -667,8 +667,7 @@ describe("Matrix-to-IRC message bridging", function() {
                 expect(client.addr).toEqual(roomMapping.server);
                 expect(channel).toEqual(roomMapping.channel);
                 // don't be too brittle when checking this, but I expect to see the
-                // code type and the mxc fragment.
-                expect(text.indexOf('javascript')).not.toEqual(-1);
+                // mxc fragment.
                 expect(text.indexOf('deadbeefcafe')).not.toEqual(-1);
                 done();
             });
@@ -713,7 +712,7 @@ describe("Matrix-to-IRC message bridging", function() {
         });
     });
 
-    it("should bridge matrix images as IRC action with a URL", function(done) {
+    it("should bridge matrix images as a URL", function(done) {
         const tBody = "the_image.jpg";
         const tMxcSegment = "/somecontentid";
         const tHsUrl = "https://some.home.server.goeshere/";
@@ -723,8 +722,7 @@ describe("Matrix-to-IRC message bridging", function() {
             expect(client.addr).toEqual(roomMapping.server);
             expect(channel).toEqual(roomMapping.channel);
             // don't be too brittle when checking this, but I expect to see the
-            // filename (body) and the http url.
-            expect(text.indexOf(tBody)).not.toEqual(-1);
+            // http url.
             expect(text.indexOf(tHsUrl)).not.toEqual(-1);
             expect(text.indexOf(tMxcSegment)).not.toEqual(-1);
             done();
@@ -742,7 +740,7 @@ describe("Matrix-to-IRC message bridging", function() {
         });
     });
 
-    it("should bridge matrix files as IRC action with a URL", function(done) {
+    it("should bridge matrix files as a URL", function(done) {
         const tBody = "a_file.apk";
         const tMxcSegment = "/somecontentid";
         const tHsUrl = "https://some.home.server.goeshere/";
@@ -752,8 +750,7 @@ describe("Matrix-to-IRC message bridging", function() {
             expect(client.addr).toEqual(roomMapping.server);
             expect(channel).toEqual(roomMapping.channel);
             // don't be too brittle when checking this, but I expect to see the
-            // filename (body) and the http url.
-            expect(text.indexOf(tBody)).not.toEqual(-1);
+            // http url.
             expect(text.indexOf(tHsUrl)).not.toEqual(-1);
             expect(text.indexOf(tMxcSegment)).not.toEqual(-1);
             done();
@@ -1097,8 +1094,7 @@ describe("Matrix-to-IRC message bridging with media URL and drop time", function
             expect(client.addr).toEqual(roomMapping.server);
             expect(channel).toEqual(roomMapping.channel);
             // don't be too brittle when checking this, but I expect to see the
-            // filename (body) and the http url.
-            expect(text.indexOf(tBody)).not.toEqual(-1, "File name not present");
+            // http url.
             expect(text.indexOf(tHsUrl)).toEqual(-1, "HS URL present instead of media URL");
             expect(text.indexOf(tMediaUrl)).not.toEqual(-1, "No media URL");
             expect(text.indexOf(tMxcSegment)).not.toEqual(-1, "No Mxc segment");

spec/unit/BridgedClient.spec.js

@@ -31,8 +31,8 @@ describe("BridgedClient", function() {
             expect(BridgedClient.getValidNick("f+/\u3052oobar", false, STATE_DISC)).toBe("foobar");
         });
         it("will ensure nicks start with a letter or special character", function() {
-            expect(BridgedClient.getValidNick("-foobar", false, STATE_DISC)).toBe("M-foobar");
-            expect(BridgedClient.getValidNick("12345", false, STATE_DISC)).toBe("M12345");
+            expect(BridgedClient.getValidNick("-foobar", false, STATE_DISC)).toBe("`-foobar");
+            expect(BridgedClient.getValidNick("12345", false, STATE_DISC)).toBe("`12345");
         });
         it("will throw if the nick is invalid", function() {
             expect(() => BridgedClient.getValidNick("f+/\u3052oobar", true, STATE_DISC)).toThrowError();