github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-03 19:39:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: use allowlist and blocklist terminology (#10209)

Browse Source 
This is a PR of the renaming whitelist to allowlist and blacklist to the blocklist.
This commit is contained in:
Krzysztof Kotlarek
2020-07-27 10:23:54 +10:00
committed by GitHub
parent 5077cf52fd
commit e0d9232259
130 changed files with 676 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spec/requests/admin/themes_controller_spec.rb
View File

@ -100,17 +100,17 @@ describe Admin::ThemesController do
file_from_fixtures("logo.png")
end
context 'when theme whitelist mode is enabled' do
context 'when theme allowlist mode is enabled' do
before do
GlobalSetting.reset_whitelisted_theme_ids!
global_setting :whitelisted_theme_repos, "https://github.com/discourse/discourse-brand-header"
GlobalSetting.reset_allowed_theme_ids!
global_setting :allowed_theme_repos, "https://github.com/discourse/discourse-brand-header"
end
after do
GlobalSetting.reset_whitelisted_theme_ids!
GlobalSetting.reset_allowed_theme_ids!
end
it "allows whitelisted imports" do
it "allows allowlisted imports" do
RemoteTheme.stubs(:import_theme)
post "/admin/themes/import.json", params: {
remote: ' https://github.com/discourse/discourse-brand-header '
@ -308,14 +308,14 @@ describe Admin::ThemesController do
expect(SiteSetting.default_theme_id).to eq(-1)
end
context 'when theme whitelist mode is enabled' do
context 'when theme allowlist mode is enabled' do
before do
GlobalSetting.reset_whitelisted_theme_ids!
global_setting :whitelisted_theme_repos, " https://magic.com/repo.git, https://x.com/git"
GlobalSetting.reset_allowed_theme_ids!
global_setting :allowed_theme_repos, " https://magic.com/repo.git, https://x.com/git"
end
after do
GlobalSetting.reset_whitelisted_theme_ids!
GlobalSetting.reset_allowed_theme_ids!
end
it 'unconditionally bans theme_fields from updating' do