Skip to content
Snippets Groups Projects
Commit 2dd5c959 authored by LucasC's avatar LucasC Committed by Simon Urli
Browse files

XWIKI-22269: Update the structure of the User display macro 

* Updated velocity macro integration tests
parent ed3bb088
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/MacrosTest.java
+ 15
− 15
View file @ 2dd5c959
...@@ -287,36 +287,36 @@ void displayUser() throws Exception ...@@ -287,36 +287,36 @@ void displayUser() throws Exception
StringWriter out = new StringWriter(); StringWriter out = new StringWriter();
this.velocityManager.evaluate(out, "displayUser", new StringReader(script)); this.velocityManager.evaluate(out, "displayUser", new StringReader(script));
assertEquals("<div class=\"user\" data-reference=\"xwiki:XWiki.XWikiGuest\">" assertEquals("<div class=\"user\" data-reference=\"xwiki:XWiki.XWikiGuest\">"
+ "<img class=\"user-avatar\" src=\"/xwiki/bin/skin/skins/flamingo/icons/xwiki/noavatar.png\" " + "<a class=\"user-name\" href=\"/xwiki/bin/view/XWiki/XWikiGuest\">"
+ "alt=\"XWikiGuest\" />" + "<img class=\"user-avatar\" src=\"/xwiki/bin/skin/skins/flamingo/icons/xwiki/noavatar.png\" alt=\"\" />"
+ "<a class=\"user-name\" href=\"/xwiki/bin/view/XWiki/XWikiGuest\">XWikiGuest</a>" + "XWikiGuest</a>"
+ "</div>", out.toString().trim()); + "</div>", out.toString().trim());
script = "#displayUser($NULL)"; script = "#displayUser($NULL)";
out = new StringWriter(); out = new StringWriter();
this.velocityManager.evaluate(out, "displayUser", new StringReader(script)); this.velocityManager.evaluate(out, "displayUser", new StringReader(script));
assertEquals("<div class=\"user\" data-reference=\"xwiki:XWiki.XWikiGuest\">" assertEquals("<div class=\"user\" data-reference=\"xwiki:XWiki.XWikiGuest\">"
+ "<img class=\"user-avatar\" src=\"/xwiki/bin/skin/skins/flamingo/icons/xwiki/noavatar.png\" " + "<a class=\"user-name\" href=\"/xwiki/bin/view/XWiki/XWikiGuest\">"
+ "alt=\"XWikiGuest\" />" + "<img class=\"user-avatar\" src=\"/xwiki/bin/skin/skins/flamingo/icons/xwiki/noavatar.png\" alt=\"\" />"
+ "<a class=\"user-name\" href=\"/xwiki/bin/view/XWiki/XWikiGuest\">XWikiGuest</a>" + "XWikiGuest</a>"
+ "</div>", out.toString().trim()); + "</div>", out.toString().trim());
script = "#displayUser(\"\")"; script = "#displayUser(\"\")";
out = new StringWriter(); out = new StringWriter();
this.velocityManager.evaluate(out, "displayUser", new StringReader(script)); this.velocityManager.evaluate(out, "displayUser", new StringReader(script));
assertEquals("<div class=\"user\" data-reference=\"xwiki:XWiki.XWikiGuest\">" assertEquals("<div class=\"user\" data-reference=\"xwiki:XWiki.XWikiGuest\">"
+ "<img class=\"user-avatar\" src=\"/xwiki/bin/skin/skins/flamingo/icons/xwiki/noavatar.png\" " + "<a class=\"user-name\" href=\"/xwiki/bin/view/XWiki/XWikiGuest\">"
+ "alt=\"XWikiGuest\" />" + "<img class=\"user-avatar\" src=\"/xwiki/bin/skin/skins/flamingo/icons/xwiki/noavatar.png\" alt=\"\" />"
+ "<a class=\"user-name\" href=\"/xwiki/bin/view/XWiki/XWikiGuest\">XWikiGuest</a>" + "XWikiGuest</a>"
+ "</div>", out.toString().trim()); + "</div>", out.toString().trim());
script = "#displayUser(\"XWiki.Foo\")"; script = "#displayUser(\"XWiki.Foo\")";
out = new StringWriter(); out = new StringWriter();
this.velocityManager.evaluate(out, "displayUser", new StringReader(script)); this.velocityManager.evaluate(out, "displayUser", new StringReader(script));
assertEquals("<div class=\"user\" data-reference=\"xwiki:XWiki.Foo\">" assertEquals("<div class=\"user\" data-reference=\"xwiki:XWiki.Foo\">"
+ "<img class=\"user-avatar\" src=\"/xwiki/bin/skin/skins/flamingo/icons/xwiki/noavatar.png\" " + "<a class=\"user-name\" href=\"/xwiki/bin/view/XWiki/Foo\">"
+ "alt=\"Foo\" />" + "<img class=\"user-avatar\" src=\"/xwiki/bin/skin/skins/flamingo/icons/xwiki/noavatar.png\" alt=\"\" />"
+ "<a class=\"user-name\" href=\"/xwiki/bin/view/XWiki/Foo\">Foo</a>" + "Foo</a>"
+ "</div>", out.toString().trim()); + "</div>", out.toString().trim());
DocumentReference userFoo = new DocumentReference("xwiki", "XWiki", "Foo"); DocumentReference userFoo = new DocumentReference("xwiki", "XWiki", "Foo");
...@@ -326,9 +326,9 @@ void displayUser() throws Exception ...@@ -326,9 +326,9 @@ void displayUser() throws Exception
out = new StringWriter(); out = new StringWriter();
this.velocityManager.evaluate(out, "displayUser", new StringReader(script)); this.velocityManager.evaluate(out, "displayUser", new StringReader(script));
assertEquals("<div class=\"user\" data-reference=\"xwiki:XWiki.Foo\">" assertEquals("<div class=\"user\" data-reference=\"xwiki:XWiki.Foo\">"
+ "<img class=\"user-avatar\" src=\"/xwiki/bin/skin/skins/flamingo/icons/xwiki/noavatar.png\" " + "<a class=\"user-name\" href=\"/xwiki/bin/view/XWiki/Foo\">"
+ "alt=\"Foo\" />" + "<img class=\"user-avatar\" src=\"/xwiki/bin/skin/skins/flamingo/icons/xwiki/noavatar.png\" alt=\"\" />"
+ "<a class=\"user-name\" href=\"/xwiki/bin/view/XWiki/Foo\">Foo</a>" + "Foo</a>"
+ "</div>", out.toString().trim()); + "</div>", out.toString().trim());
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment