Fix the namespace for message body (#48)

codingteam · Jul 8, 2019 · d37e5c8 · d37e5c8
1 parent b009ec8
commit d37e5c8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/Emulsion.Tests/Xmpp/SharpXmppHelper.fs b/Emulsion.Tests/Xmpp/SharpXmppHelper.fs
@@ -1,11 +1,19 @@
 module Emulsion.Tests.Xmpp.SharpXmppHelper
 
+open System.Xml.Linq
+
 open Xunit
 
 open Emulsion
 open Emulsion.Tests.Xmpp
 open Emulsion.Xmpp
 
+[<Fact>]
+let ``Message body has a proper namespace``() =
+    let message = SharpXmppHelper.message "cthulhu@test" "text"
+    let body = Seq.exactlyOne(message.Descendants())
+    Assert.Equal(XNamespace.Get "jabber:client", body.Name.Namespace)
+
 [<Fact>]
 let ``parseMessage should extract message text and author``() =
     let text = "text test"

diff --git a/Emulsion/Xmpp/SharpXmppHelper.fs b/Emulsion/Xmpp/SharpXmppHelper.fs
@@ -9,25 +9,22 @@ open SharpXMPP.XMPP.Client.Elements
 
 open Emulsion
 
-module Namespaces =
-    let StorageBookmarks = XNamespace.Get("storage:bookmarks")
-
 module Elements =
-    let Body = XName.Get "body"
+    let Body = XName.Get("body", Namespaces.JabberClient)
     let Delay = XName.Get("delay", "urn:xmpp:delay")
     let From = XName.Get "from"
     let Jid = XName.Get "jid"
+    let Nick = XName.Get("nick", Namespaces.StorageBookmarks)
     let Stamp = XName.Get "stamp"
-    let Type = XName.Get "type"
     let To = XName.Get "to"
+    let Type = XName.Get "type"
 
-open Namespaces
 open Elements
 
 let private bookmark (roomJid: string) (nickname: string): BookmarkedConference =
     let room = BookmarkedConference()
     room.SetAttributeValue(Jid, roomJid)
-    let nickElement = XElement(StorageBookmarks + "nick", Value = nickname)
+    let nickElement = XElement(Nick, Value = nickname)
     room.Add(nickElement)
     room