mirror of
https://github.com/discourse/discourse-adplugin.git
synced 2025-03-09 13:19:11 +00:00
554f03f3da
# Description
This PR adds the ability to apply **group** and **category** restrictions to a **house ad**.
# What is included
- In order to get the group and category selectors to work within `admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js` I needed to modernize the file.
- I dropped the `bufferedProperty` implementation in favor of a vanilla ember approach
- I added `category_ids` and `group_ids` to our house ads model
- I added tests for group / category restrictions
- I added a preview button to display the house ad
- `/site.json` would return a object called `house_creatives` and a list of key value pairs that matched the ad name with the html, like so:
```js
{ AD_KEY: ad.html }
```
I need access to the category ids on the client to conditionally render the house ads so the new format will be:
```js
{ AD_KEY: { html: ad.html, category_ids: ad.category_ids } }
```
# Screenshots
<img width="658" alt="Screenshot 2024-04-08 at 2 39 22 PM" src="https://github.com/discourse/discourse-adplugin/assets/50783505/b44b386d-65a1-4a2a-a487-d735b13357dd">
# Preview Video
https://github.com/discourse/discourse-adplugin/assets/50783505/6d0d8253-afef-4e15-b6fc-c6f696efd169
137 lines
3.6 KiB
Ruby
137 lines
3.6 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
RSpec.describe SiteController do
|
|
fab!(:group)
|
|
fab!(:private_category) { Fabricate(:private_category, group: group) }
|
|
|
|
fab!(:user)
|
|
fab!(:group_2) { Fabricate(:group) }
|
|
fab!(:user_with_group) { Fabricate(:user, group_ids: [group.id]) }
|
|
|
|
let!(:anon_ad) do
|
|
AdPlugin::HouseAd.create(
|
|
name: "anon-ad",
|
|
html: "<div>ANON</div>",
|
|
visible_to_logged_in_users: false,
|
|
visible_to_anons: true,
|
|
group_ids: [],
|
|
category_ids: [],
|
|
)
|
|
end
|
|
|
|
let!(:logged_in_ad) do
|
|
AdPlugin::HouseAd.create(
|
|
name: "logged-in-ad",
|
|
html: "<div>LOGGED IN</div>",
|
|
visible_to_logged_in_users: true,
|
|
visible_to_anons: false,
|
|
group_ids: [],
|
|
category_ids: [],
|
|
)
|
|
end
|
|
|
|
let!(:logged_in_ad_with_category) do
|
|
AdPlugin::HouseAd.create(
|
|
name: "logged-in-ad-with-category",
|
|
html: "<div>LOGGED IN WITH CATEGORY</div>",
|
|
visible_to_logged_in_users: true,
|
|
visible_to_anons: false,
|
|
group_ids: [group.id],
|
|
category_ids: [private_category.id],
|
|
)
|
|
end
|
|
|
|
let!(:logged_in_ad_with_group_2) do
|
|
AdPlugin::HouseAd.create(
|
|
name: "logged-in-ad-with-group",
|
|
html: "<div>LOGGED IN WITH GROUP</div>",
|
|
visible_to_logged_in_users: true,
|
|
visible_to_anons: false,
|
|
group_ids: [group_2.id],
|
|
category_ids: [],
|
|
)
|
|
end
|
|
|
|
let!(:everyone_ad) do
|
|
AdPlugin::HouseAd.create(
|
|
name: "everyone-ad",
|
|
html: "<div>EVERYONE</div>",
|
|
visible_to_logged_in_users: true,
|
|
visible_to_anons: true,
|
|
group_ids: [],
|
|
category_ids: [],
|
|
)
|
|
end
|
|
|
|
let!(:everyone_group_ad) do
|
|
AdPlugin::HouseAd.create(
|
|
name: "everyone-group-ad",
|
|
html: "<div>EVERYONE</div>",
|
|
visible_to_logged_in_users: true,
|
|
visible_to_anons: false,
|
|
group_ids: [Group::AUTO_GROUPS[:everyone]],
|
|
category_ids: [],
|
|
)
|
|
end
|
|
|
|
before do
|
|
AdPlugin::HouseAdSetting.update(
|
|
"topic_list_top",
|
|
"logged-in-ad|anon-ad|everyone-ad|logged-in-ad-with-category|logged-in-ad-with-group|everyone-group-ad",
|
|
)
|
|
end
|
|
|
|
describe "#site" do
|
|
context "when logged in" do
|
|
it "only includes ads that are visible to logged in users" do
|
|
sign_in(user)
|
|
get "/site.json"
|
|
# excluded logged_in_ad_with_group_2 and logged_in_ad_with_category
|
|
expect(response.parsed_body["house_creatives"]["creatives"].keys).to contain_exactly(
|
|
"logged-in-ad",
|
|
"everyone-group-ad",
|
|
"everyone-ad",
|
|
)
|
|
end
|
|
|
|
it "includes ads that are within the logged in user's category permissions" do
|
|
sign_in(user_with_group)
|
|
get "/site.json"
|
|
expect(response.parsed_body["house_creatives"]["creatives"].keys).to contain_exactly(
|
|
"logged-in-ad",
|
|
"everyone-group-ad",
|
|
"logged-in-ad-with-category",
|
|
"everyone-ad",
|
|
)
|
|
end
|
|
end
|
|
|
|
context "when anonymous" do
|
|
it "only includes ads that are visible to anonymous users" do
|
|
get "/site.json"
|
|
# excludes everyone_group_ad
|
|
expect(response.parsed_body["house_creatives"]["creatives"].keys).to contain_exactly(
|
|
"anon-ad",
|
|
"everyone-ad",
|
|
)
|
|
end
|
|
|
|
it "invalidates cache when an ad is updated" do
|
|
get "/site.json"
|
|
expect(response.parsed_body["house_creatives"]["creatives"].keys).to contain_exactly(
|
|
"anon-ad",
|
|
"everyone-ad",
|
|
)
|
|
|
|
anon_ad.visible_to_anons = false
|
|
anon_ad.save
|
|
|
|
get "/site.json"
|
|
expect(response.parsed_body["house_creatives"]["creatives"].keys).to contain_exactly(
|
|
"everyone-ad",
|
|
)
|
|
end
|
|
end
|
|
end
|
|
end
|