github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-29 02:24:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Strip remote url before import. (#6762)

Browse Source
This commit is contained in:
Bianca Nenciu 2018-12-17 16:27:49 +02:00 committed by Régis Hanol
parent 22cea9ce90
commit 1023003eba
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/remote_theme.rb
View File

@ -39,7 +39,7 @@ class RemoteTheme < ActiveRecord::Base
end end
def self.import_theme(url, user = Discourse.system_user, private_key: nil, branch: nil) def self.import_theme(url, user = Discourse.system_user, private_key: nil, branch: nil)
importer = ThemeStore::GitImporter.new(url, private_key: private_key, branch: branch) importer = ThemeStore::GitImporter.new(url.strip, private_key: private_key, branch: branch)
importer.import! importer.import!
theme_info = JSON.parse(importer["about.json"]) theme_info = JSON.parse(importer["about.json"])

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

@ -76,6 +76,14 @@ describe Admin::ThemesController do
expect(theme.theme_fields.first.upload.original_filename).to eq(upload.original_filename) expect(theme.theme_fields.first.upload.original_filename).to eq(upload.original_filename)
end end
it 'can import a theme from Git' do
post "/admin/themes/import.json", params: {
remote: ' https://github.com/discourse/discourse-brand-header '
}
expect(response.status).to eq(201)
end
it 'imports a theme' do it 'imports a theme' do
post "/admin/themes/import.json", params: { theme: theme_file } post "/admin/themes/import.json", params: { theme: theme_file }
expect(response.status).to eq(201) expect(response.status).to eq(201)