codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-02-17 04:01:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: similar topics api shouldn't return error if params are below minimum lengths

Browse source
This commit is contained in:
Neil Lalonde 2015-08-31 10:54:45 -04:00
parent 5f7b31c278
commit 43c62d413c
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/similar_topics_controller.rb
View file

@ -19,10 +19,11 @@ class SimilarTopicsController < ApplicationController
params.require(:title)
params.require(:raw)
title, raw = params[:title], params[:raw]
[:title, :raw].each { |key| check_length_of(key, params[key]) }
invalid_length = [:title, :raw].any? { |key| check_invalid_length(key, params[key]) }
# Only suggest similar topics if the site has a minimum amount of topics present.
return render json: [] unless Topic.count_exceeds_minimum?
# Only suggest similar topics if the site has a minimum amount of topics present
# and params are long enough.
return render json: [] if invalid_length || !Topic.count_exceeds_minimum?
topics = Topic.similar_to(title, raw, current_user).to_a
topics.map! {|t| SimilarTopic.new(t) }
@ -31,9 +32,9 @@ class SimilarTopicsController < ApplicationController
protected
def check_length_of(key, attr)
def check_invalid_length(key, attr)
str = (key == :raw) ? "body" : key.to_s
raise Discourse::InvalidParameters.new(key) if attr.length < SiteSetting.send("min_#{str}_similar_length")
attr.length < SiteSetting.send("min_#{str}_similar_length")
end
end

14
spec/controllers/similar_topics_controller_spec.rb
View file

@ -14,14 +14,20 @@ describe SimilarTopicsController do
expect { xhr :get, :index, title: title }.to raise_error(ActionController::ParameterMissing)
end
it "raises an error if the title length is below the minimum" do
it "returns no results if the title length is below the minimum" do
Topic.expects(:similar_to).never
SiteSetting.stubs(:min_title_similar_length).returns(100)
expect { xhr :get, :index, title: title, raw: raw }.to raise_error(Discourse::InvalidParameters)
xhr :get, :index, title: title, raw: raw
json = ::JSON.parse(response.body)
expect(json["similar_topics"].size).to eq(0)
end
it "raises an error if the body length is below the minimum" do
it "returns no results if the body length is below the minimum" do
Topic.expects(:similar_to).never
SiteSetting.stubs(:min_body_similar_length).returns(100)
expect { xhr :get, :index, title: title, raw: raw }.to raise_error(Discourse::InvalidParameters)
xhr :get, :index, title: title, raw: raw
json = ::JSON.parse(response.body)
expect(json["similar_topics"].size).to eq(0)
end
describe "minimum_topics_similar" do