From 1d3097245c8654738920cb634cd775a3a6742a6c Mon Sep 17 00:00:00 2001 From: Wojciech Zawistowski Date: Thu, 21 Nov 2013 20:38:56 +0100 Subject: [PATCH] header sitemap integration tests --- .../discourse/helpers/application_helpers.js | 2 +- .../header-category-info.js.handlebars | 4 +- .../discourse/templates/header.js.handlebars | 11 +- .../common/components/badges.css.scss | 2 +- test/javascripts/integration/header_test.js | 261 +++++++++++++++++- 5 files changed, 270 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/discourse/helpers/application_helpers.js b/app/assets/javascripts/discourse/helpers/application_helpers.js index adb570eb27..adb5cc5751 100644 --- a/app/assets/javascripts/discourse/helpers/application_helpers.js +++ b/app/assets/javascripts/discourse/helpers/application_helpers.js @@ -328,6 +328,6 @@ Handlebars.registerHelper('faqLink', function(property, options) { return new Handlebars.SafeString( "" + I18n.t('faq') + "" + "' class='faq-link'>" + I18n.t('faq') + "" ); }); diff --git a/app/assets/javascripts/discourse/templates/components/header-category-info.js.handlebars b/app/assets/javascripts/discourse/templates/components/header-category-info.js.handlebars index 156c4ab010..d21be9154c 100644 --- a/app/assets/javascripts/discourse/templates/components/header-category-info.js.handlebars +++ b/app/assets/javascripts/discourse/templates/components/header-category-info.js.handlebars @@ -2,12 +2,12 @@ {{#if currentUser}} {{#with view.category}} {{#if unreadTopics}} - {{unbound unreadTopics}} + {{unbound unreadTopics}} {{/if}} {{#if newTopics}} {{unbound newTopics}} {{/if}} {{/with}} {{else}} -{{unbound category.topic_count}} +{{unbound category.topic_count}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/header.js.handlebars b/app/assets/javascripts/discourse/templates/header.js.handlebars index cf0bce0052..ed85a469cd 100644 --- a/app/assets/javascripts/discourse/templates/header.js.handlebars +++ b/app/assets/javascripts/discourse/templates/header.js.handlebars @@ -76,7 +76,8 @@ data-dropdown="site-map-dropdown" data-render="renderSiteMap" href="#" - title='{{i18n site_map}}'> + title='{{i18n site_map}}' + id="site-map"> {{/if}} @@ -101,20 +102,20 @@