From 914735767a711d21af520ec3a6b539ca71acd14c Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 4 Aug 2020 08:03:22 +0200 Subject: [PATCH] FIX: re-revert db4f5f99 with updated tests (#88) The tests were using an incorrect value for the site setting (the name of the group instead of the id). `no_ads_for_groups` shows groups names in the UI byt actually stores IDs. --- .../discourse/components/ad-component.js.es6 | 16 ++++------------ test/javascripts/acceptance/adsense-test.js.es6 | 2 +- test/javascripts/acceptance/dfp-test.js.es6 | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/assets/javascripts/discourse/components/ad-component.js.es6 b/assets/javascripts/discourse/components/ad-component.js.es6 index 40b9be2..187f3e2 100644 --- a/assets/javascripts/discourse/components/ad-component.js.es6 +++ b/assets/javascripts/discourse/components/ad-component.js.es6 @@ -51,18 +51,10 @@ export default Ember.Component.extend({ return true; } - let noAdsGroups = this.siteSettings.no_ads_for_groups.split("|"); - - // TODO: Remove when 2.4 becomes the new stable. This is for backwards compatibility. - const groupListUseIDs = this.site.group_list_use_ids; - - let currentGroups = groups; - if (groupListUseIDs) { - currentGroups = currentGroups.map(g => g.id.toString()); - } else { - currentGroups = currentGroups.map(g => g.name.toLowerCase()); - noAdsGroups = noAdsGroups.map(g => g.toLowerCase()); - } + let noAdsGroups = this.siteSettings.no_ads_for_groups + .split("|") + .filter(Boolean); + let currentGroups = groups.map(g => g.id.toString()); return !currentGroups.any(g => noAdsGroups.includes(g)); }, diff --git a/test/javascripts/acceptance/adsense-test.js.es6 b/test/javascripts/acceptance/adsense-test.js.es6 index 118b8d4..3857ddd 100644 --- a/test/javascripts/acceptance/adsense-test.js.es6 +++ b/test/javascripts/acceptance/adsense-test.js.es6 @@ -4,7 +4,7 @@ import groupFixtures from "fixtures/group-fixtures"; acceptance("AdSense", { loggedIn: true, settings: { - no_ads_for_groups: "discourse", + no_ads_for_groups: "47", no_ads_for_categories: "1", adsense_publisher_code: "MYADSENSEID", adsense_through_trust_level: 2, diff --git a/test/javascripts/acceptance/dfp-test.js.es6 b/test/javascripts/acceptance/dfp-test.js.es6 index 26339b3..bf74945 100644 --- a/test/javascripts/acceptance/dfp-test.js.es6 +++ b/test/javascripts/acceptance/dfp-test.js.es6 @@ -4,7 +4,7 @@ import groupFixtures from "fixtures/group-fixtures"; acceptance("DFP Ads", { loggedIn: true, settings: { - no_ads_for_groups: "discourse", + no_ads_for_groups: "47", no_ads_for_categories: "1", dfp_publisher_id: "MYdfpID", dfp_through_trust_level: 2,