IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1215 from Elegios/composer_use_category_id

Browse Source 
Make the composer and TopicCreator use category id instead of category name
This commit is contained in:
Robin Ward
2013-09-06 11:55:27 -07:00
parent b62caf80fb febac442d9
commit 763859d439
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/components/post_creator_spec.rb
View File

@@ -17,7 +17,7 @@ describe PostCreator do
let(:image_sizes) { {'http://an.image.host/image.jpg' => {"width" => 111, "height" => 222}} }
let(:creator) { PostCreator.new(user, basic_topic_params) }
let(:creator_with_category) { PostCreator.new(user, basic_topic_params.merge(category: category.name )) }
let(:creator_with_category) { PostCreator.new(user, basic_topic_params.merge(category: category.id )) }
let(:creator_with_meta_data) { PostCreator.new(user, basic_topic_params.merge(meta_data: {hello: "world"} )) }
let(:creator_with_image_sizes) { PostCreator.new(user, basic_topic_params.merge(image_sizes: image_sizes)) }
@@ -75,7 +75,7 @@ describe PostCreator do
reply = nil
messages = MessageBus.track_publish do
created_post = PostCreator.new(admin, basic_topic_params.merge(category: cat.name)).create
created_post = PostCreator.new(admin, basic_topic_params.merge(category: cat.id)).create
reply = PostCreator.new(admin, raw: "this is my test reply 123 testing", topic_id: created_post.topic_id).create
end

4
spec/models/category_featured_topic_spec.rb
View File

@@ -8,7 +8,7 @@ describe CategoryFeaturedTopic do
context 'feature_topics_for' do
let(:user) { Fabricate(:user) }
let(:category) { Fabricate(:category) }
let!(:category_post) { PostCreator.create(user, raw: "I put this post in the category", title: "categorize THIS", category: category.name) }
let!(:category_post) { PostCreator.create(user, raw: "I put this post in the category", title: "categorize THIS", category: category.id) }
it "should feature topics for a secure category" do
@@ -26,7 +26,7 @@ describe CategoryFeaturedTopic do
end
it 'should not include invisible topics' do
invisible_post = PostCreator.create(user, raw: "Don't look at this post because it's awful.", title: "not visible to anyone", category: category.name)
invisible_post = PostCreator.create(user, raw: "Don't look at this post because it's awful.", title: "not visible to anyone", category: category.id)
invisible_post.topic.update_status('visible', false, Fabricate(:admin))
CategoryFeaturedTopic.feature_topics_for(category)
CategoryFeaturedTopic.count.should == 1