Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restore constraints on note id parameter, simplify tests #4746

Merged
merged 2 commits into from
May 2, 2024
Merged

Restore constraints on note id parameter, simplify tests #4746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaacfbb
Restore constraints on note id parameter
AntonKhorev May 1, 2024
f554e14
Use common sidebar_browse_check in notes controller test
AntonKhorev May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/routes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
match :subscribe, :unsubscribe, :on => :member, :via => [:get, :post]
end
get "/changeset/:id/comments/feed" => "changeset_comments#index", :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => "rss" }
resources :notes, :path => "note", :only => [:show, :new]
resources :notes, :path => "note", :id => /\d+/, :only => [:show, :new]

get "/user/:display_name/history" => "changesets#index"
get "/user/:display_name/history/feed" => "changesets#feed", :defaults => { :format => :atom }
Expand Down
54 changes: 8 additions & 46 deletions test/controllers/notes_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def test_empty_page
def test_read_note
open_note = create(:note_with_comments)

browse_check :note_path, open_note.id, "notes/show"
sidebar_browse_check :note_path, open_note.id, "notes/show"
end

def test_read_hidden_note
Expand All @@ -111,20 +111,20 @@ def test_read_hidden_note

session_for(create(:moderator_user))

browse_check :note_path, hidden_note_with_comment.id, "notes/show"
sidebar_browse_check :note_path, hidden_note_with_comment.id, "notes/show"
end

def test_read_note_hidden_comments
note_with_hidden_comment = create(:note_with_comments, :comments_count => 2) do |note|
create(:note_comment, :note => note, :visible => false)
end

browse_check :note_path, note_with_hidden_comment.id, "notes/show"
sidebar_browse_check :note_path, note_with_hidden_comment.id, "notes/show"
assert_select "div.note-comments ul li", :count => 1

session_for(create(:moderator_user))

browse_check :note_path, note_with_hidden_comment.id, "notes/show"
sidebar_browse_check :note_path, note_with_hidden_comment.id, "notes/show"
assert_select "div.note-comments ul li", :count => 2
end

Expand All @@ -134,28 +134,28 @@ def test_read_note_hidden_user_comment
create(:note_comment, :note => note, :author => hidden_user)
end

browse_check :note_path, note_with_hidden_user_comment.id, "notes/show"
sidebar_browse_check :note_path, note_with_hidden_user_comment.id, "notes/show"
assert_select "div.note-comments ul li", :count => 1

session_for(create(:moderator_user))

browse_check :note_path, note_with_hidden_user_comment.id, "notes/show"
sidebar_browse_check :note_path, note_with_hidden_user_comment.id, "notes/show"
assert_select "div.note-comments ul li", :count => 1
end

def test_read_closed_note
user = create(:user)
closed_note = create(:note_with_comments, :closed, :closed_by => user, :comments_count => 2)

browse_check :note_path, closed_note.id, "notes/show"
sidebar_browse_check :note_path, closed_note.id, "notes/show"
assert_select "div.note-comments ul li", :count => 2
assert_select "div.details", /Resolved by #{user.display_name}/

user.soft_destroy!

reset!

browse_check :note_path, closed_note.id, "notes/show"
sidebar_browse_check :note_path, closed_note.id, "notes/show"
assert_select "div.note-comments ul li", :count => 1
assert_select "div.details", /Resolved by deleted/
end
Expand All @@ -165,42 +165,4 @@ def test_new_note
assert_response :success
assert_template "notes/new"
end

private

# This is a convenience method for most of the above checks
# First we check that when we don't have an id, it will correctly return a 404
# then we check that we get the correct 404 when a non-existant id is passed
# then we check that it will get a successful response, when we do pass an id
def browse_check(path, id, template)
path_method = method(path)

assert_raise ActionController::UrlGenerationError do
get path_method.call
end

# assert_raise ActionController::UrlGenerationError do
# get path_method.call(:id => -10) # we won't have an id that's negative
# end

get path_method.call(:id => 0)
assert_response :not_found
assert_template "browse/not_found"
assert_template :layout => "map"

get path_method.call(:id => 0), :xhr => true
assert_response :not_found
assert_template "browse/not_found"
assert_template :layout => "xhr"

get path_method.call(:id => id)
assert_response :success
assert_template template
assert_template :layout => "map"

get path_method.call(:id => id), :xhr => true
assert_response :success
assert_template template
assert_template :layout => "xhr"
end
end