From b2f26eaa60f8af33ca5b9a600b3a58b7f317be13 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Wed, 8 Jun 2016 14:57:13 +1000
Subject: [PATCH] correct test case and add condition

---
 app/assets/javascripts/discourse/widgets/poster-name.js.es6 | 2 +-
 test/javascripts/widgets/poster-name-test.js.es6            | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/poster-name.js.es6 b/app/assets/javascripts/discourse/widgets/poster-name.js.es6
index 643b5e8a842..d9fb725c525 100644
--- a/app/assets/javascripts/discourse/widgets/poster-name.js.es6
+++ b/app/assets/javascripts/discourse/widgets/poster-name.js.es6
@@ -27,7 +27,7 @@ export default createWidget('poster-name', {
   html(attrs) {
     const username = attrs.username;
     const name = attrs.name;
-    const nameFirst = !this.siteSettings.prioritize_username_in_ux && name && name.length > 0;
+    const nameFirst = this.siteSettings.display_name_on_posts && !this.siteSettings.prioritize_username_in_ux && name && name.length > 0;
     const classNames = nameFirst ? ['first','full-name'] : ['first','username'];
 
     if (attrs.staff) { classNames.push('staff'); }
diff --git a/test/javascripts/widgets/poster-name-test.js.es6 b/test/javascripts/widgets/poster-name-test.js.es6
index 5e6782625a2..9c1bde62f46 100644
--- a/test/javascripts/widgets/poster-name-test.js.es6
+++ b/test/javascripts/widgets/poster-name-test.js.es6
@@ -59,9 +59,11 @@ widgetTest('disable display name on posts', {
 widgetTest("doesn't render a name if it's similar to the username", {
   template: '{{mount-widget widget="poster-name" args=args}}',
   setup() {
+    this.siteSettings.prioritize_username_in_ux = true;
+    this.siteSettings.display_name_on_posts = true;
     this.set('args', { username: 'eviltrout', name: 'evil-trout' });
   },
   test(assert) {
-    assert.equal(this.$('.full-name').length, 0);
+    assert.equal(this.$('.second').length, 0);
   }
 });