From 28c413319f60da47afc2441e97f072338841b560 Mon Sep 17 00:00:00 2001 From: Mateusz Hajder <6783135+mhajder@users.noreply.github.com> Date: Wed, 26 May 2021 13:43:06 +0200 Subject: [PATCH] Change IRC server and channels in tests to more generic --- .../ircmessageparser/cleanIrcMessage.js | 4 ++-- .../js/helpers/ircmessageparser/findLinks.js | 4 ++-- test/client/js/helpers/parse.js | 12 ++++++------ test/models/network.js | 18 +++++++++--------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/test/client/js/helpers/ircmessageparser/cleanIrcMessage.js b/test/client/js/helpers/ircmessageparser/cleanIrcMessage.js index 2636b29f..056c039d 100644 --- a/test/client/js/helpers/ircmessageparser/cleanIrcMessage.js +++ b/test/client/js/helpers/ircmessageparser/cleanIrcMessage.js @@ -55,8 +55,8 @@ describe("cleanIrcMessage", function () { expected: "bold bold", }, { - input: "\x02irc\x0f://\x1dfreenode.net\x0f/\x034,8thelounge", - expected: "irc://freenode.net/thelounge", + input: "\x02irc\x0f://\x1dirc.example.com\x0f/\x034,8thelounge", + expected: "irc://irc.example.com/thelounge", }, { input: "\x02#\x038,9thelounge", diff --git a/test/client/js/helpers/ircmessageparser/findLinks.js b/test/client/js/helpers/ircmessageparser/findLinks.js index 9effda56..d1c9a27f 100644 --- a/test/client/js/helpers/ircmessageparser/findLinks.js +++ b/test/client/js/helpers/ircmessageparser/findLinks.js @@ -8,12 +8,12 @@ const { describe("findLinks", () => { it("should find url", () => { - const input = "irc://freenode.net/thelounge"; + const input = "irc://irc.example.com/thelounge"; const expected = [ { start: 0, end: 28, - link: "irc://freenode.net/thelounge", + link: "irc://irc.example.com/thelounge", }, ]; diff --git a/test/client/js/helpers/parse.js b/test/client/js/helpers/parse.js index f4902abe..79171afa 100644 --- a/test/client/js/helpers/parse.js +++ b/test/client/js/helpers/parse.js @@ -63,10 +63,10 @@ describe("IRC formatted message parser", () => { it("should find urls", async () => { const testCases = [ { - input: "irc://freenode.net/thelounge", + input: "irc://irc.example.com/thelounge", expected: - '' + - "irc://freenode.net/thelounge" + + '' + + "irc://irc.example.com/thelounge" + "", }, { @@ -416,12 +416,12 @@ describe("IRC formatted message parser", () => { it("should go bonkers like mirc", async () => { const testCases = [ { - input: "\x02irc\x0f://\x1dfreenode.net\x0f/\x034,8thelounge", + input: "\x02irc\x0f://\x1dirc.example.com\x0f/\x034,8thelounge", expected: - '' + + '' + 'irc' + "://" + - 'freenode.net' + + 'irc.example.com' + "/" + 'thelounge' + "", diff --git a/test/models/network.js b/test/models/network.js index 6d6d8119..e1273f29 100644 --- a/test/models/network.js +++ b/test/models/network.js @@ -91,7 +91,7 @@ describe("Network", function () { rejectUnauthorized: false, }); expect(network.validate()).to.be.true; - expect(network.host).to.equal("chat.freenode.net"); + expect(network.host).to.equal("irc.example.com"); expect(network.port).to.equal(6697); expect(network.tls).to.be.true; expect(network.rejectUnauthorized).to.be.true; @@ -103,7 +103,7 @@ describe("Network", function () { host: "some.fake.tld", }); expect(network2.validate()).to.be.true; - expect(network2.host).to.equal("chat.freenode.net"); + expect(network2.host).to.equal("irc.example.com"); Helper.config.lockNetwork = false; }); @@ -265,7 +265,7 @@ describe("Network", function () { // Lobby and initial channel expect(network.channels.length).to.equal(2); - const newChan = new Chan({name: "#freenode"}); + const newChan = new Chan({name: "#foo"}); network.addChannel(newChan); expect(network.channels.length).to.equal(3); @@ -278,13 +278,13 @@ describe("Network", function () { const network = new Network({ channels: [chan1, chan2, chan3], - name: "freenode", + name: "foo", }); - const newChan = new Chan({name: "#freenode"}); + const newChan = new Chan({name: "#foo"}); network.addChannel(newChan); - expect(network.channels[0].name).to.equal("freenode"); + expect(network.channels[0].name).to.equal("foo"); expect(network.channels[1]).to.equal(chan1); expect(network.channels[2]).to.equal(newChan); expect(network.channels[3]).to.equal(chan2); @@ -299,7 +299,7 @@ describe("Network", function () { channels: [chan1, chan2], }); - const newChan = new Chan({name: "#freenode"}); + const newChan = new Chan({name: "#foo"}); network.addChannel(newChan); expect(network.channels[1]).to.equal(chan1); @@ -393,7 +393,7 @@ describe("Network", function () { channels: [banlist, chan1, user1], }); - const newChan = new Chan({name: "#freenode"}); + const newChan = new Chan({name: "#foo"}); network.addChannel(newChan); expect(network.channels[1]).to.equal(newChan); @@ -404,7 +404,7 @@ describe("Network", function () { it("should never add something in front of the lobby", function () { const network = new Network({ - name: "freenode", + name: "foo", channels: [], });