mirror of
https://github.com/discourse/discourse.git
synced 2025-06-04 23:36:11 +08:00
FIX: Store custom emojis as uploads.
* Depending on a hardcoded directory was a flawed design which made it impossible to debug when custom emojis go missing.
This commit is contained in:
@ -16,10 +16,6 @@ describe Admin::EmojisController do
|
||||
end
|
||||
end
|
||||
|
||||
it "is a subclass of AdminController" do
|
||||
expect(Admin::EmojisController < Admin::AdminController).to eq(true)
|
||||
end
|
||||
|
||||
context "when logged in" do
|
||||
let!(:user) { log_in(:admin) }
|
||||
|
||||
@ -33,56 +29,6 @@ describe Admin::EmojisController do
|
||||
expect(json[0]["url"]).to eq(custom_emoji.url)
|
||||
end
|
||||
end
|
||||
|
||||
context ".create" do
|
||||
|
||||
before { Emoji.expects(:custom).returns([custom_emoji]) }
|
||||
|
||||
context "name already exist" do
|
||||
it "throws an error" do
|
||||
message = MessageBus.track_publish do
|
||||
xhr :post, :create, { name: "hello", file: "" }
|
||||
end.first
|
||||
|
||||
expect(response).to be_success
|
||||
expect(message.data["errors"]).to be
|
||||
end
|
||||
end
|
||||
|
||||
context "error while saving emoji" do
|
||||
it "throws an error" do
|
||||
Emoji.expects(:create_for).returns(nil)
|
||||
message = MessageBus.track_publish do
|
||||
xhr :post, :create, { name: "garbage", file: "" }
|
||||
end.first
|
||||
|
||||
expect(response).to be_success
|
||||
expect(message.data["errors"]).to be
|
||||
end
|
||||
end
|
||||
|
||||
it "works" do
|
||||
Emoji.expects(:create_for).returns(custom_emoji2)
|
||||
|
||||
message = MessageBus.track_publish do
|
||||
xhr :post, :create, { name: "hello2", file: ""}
|
||||
end.first
|
||||
|
||||
expect(response).to be_success
|
||||
|
||||
expect(message.data["name"]).to eq(custom_emoji2.name)
|
||||
expect(message.data["url"]).to eq(custom_emoji2.url)
|
||||
end
|
||||
end
|
||||
|
||||
context ".destroy" do
|
||||
it "deletes the custom emoji" do
|
||||
custom_emoji.expects(:remove)
|
||||
Emoji.expects(:custom).returns([custom_emoji])
|
||||
xhr :delete, :destroy, id: "hello"
|
||||
expect(response).to be_success
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
Reference in New Issue
Block a user