Merge remote-tracking branch 'glitch/main' HEAD main

1 files changed, 27 insertions, 0 deletions

diff --git a/app/javascript/mastodon/components/__tests__/__snapshots__/display_name-test.jsx.snap b/app/javascript/mastodon/components/__tests__/__snapshots__/display_name-test.jsx.snap
new file mode 100644
index 000000000..9c37580d7
--- /dev/null
+++ b/app/javascript/mastodon/components/__tests__/__snapshots__/display_name-test.jsx.snap
@@ -0,0 +1,27 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<DisplayName /> renders display name + account name 1`] = `
+<span
+  className="display-name"
+  onMouseEnter={[Function]}
+  onMouseLeave={[Function]}
+>
+  <bdi>
+    <strong
+      className="display-name__html"
+      dangerouslySetInnerHTML={
+        {
+          "__html": "<p>Foo</p>",
+        }
+      }
+    />
+  </bdi>
+   
+  <span
+    className="display-name__account"
+  >
+    @
+    bar@baz
+  </span>
+</span>
+`;