cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/4996'

Browse source
This commit is contained in:
Tom Hughes 2024-07-16 17:15:47 +01:00
commit 0a98d08885
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/diary_entries/show.html.erb
View file

@ -21,7 +21,7 @@
<% if @entry.subscribers.exists?(current_user.id) %>
<%= link_to t(".unsubscribe"), diary_entry_unsubscribe_path(@entry.user, @entry), :method => :post, :class => "btn btn-sm btn-primary" %>
<% else %>
<%= link_to t(".subscribe"), diary_entry_subscribe_path(@entry.user, @entry.id), :method => :post, :class => "btn btn-sm btn-primary" %>
<%= link_to t(".subscribe"), diary_entry_subscribe_path(@entry.user, @entry), :method => :post, :class => "btn btn-sm btn-primary" %>
<% end %>
</div>
<% end %>

16
test/controllers/api/changeset_comments_controller_test.rb
View file

@ -225,21 +225,21 @@ module Api
comment = create(:changeset_comment)
assert comment.visible
post changeset_comment_hide_path(:id => comment)
post changeset_comment_hide_path(comment)
assert_response :unauthorized
assert comment.reload.visible
auth_header = basic_authorization_header create(:user).email, "test"
# not a moderator
post changeset_comment_hide_path(:id => comment), :headers => auth_header
post changeset_comment_hide_path(comment), :headers => auth_header
assert_response :forbidden
assert comment.reload.visible
auth_header = basic_authorization_header create(:moderator_user).email, "test"
# bad comment id
post changeset_comment_hide_path(:id => 999111), :headers => auth_header
post changeset_comment_hide_path(999111), :headers => auth_header
assert_response :not_found
assert comment.reload.visible
end
@ -252,7 +252,7 @@ module Api
auth_header = basic_authorization_header create(:moderator_user).email, "test"
post changeset_comment_hide_path(:id => comment), :headers => auth_header
post changeset_comment_hide_path(comment), :headers => auth_header
assert_response :success
assert_not comment.reload.visible
end
@ -264,21 +264,21 @@ module Api
comment = create(:changeset_comment, :visible => false)
assert_not comment.visible
post changeset_comment_unhide_path(:id => comment)
post changeset_comment_unhide_path(comment)
assert_response :unauthorized
assert_not comment.reload.visible
auth_header = basic_authorization_header create(:user).email, "test"
# not a moderator
post changeset_comment_unhide_path(:id => comment), :headers => auth_header
post changeset_comment_unhide_path(comment), :headers => auth_header
assert_response :forbidden
assert_not comment.reload.visible
auth_header = basic_authorization_header create(:moderator_user).email, "test"
# bad comment id
post changeset_comment_unhide_path(:id => 999111), :headers => auth_header
post changeset_comment_unhide_path(999111), :headers => auth_header
assert_response :not_found
assert_not comment.reload.visible
end
@ -291,7 +291,7 @@ module Api
auth_header = basic_authorization_header create(:moderator_user).email, "test"
post changeset_comment_unhide_path(:id => comment), :headers => auth_header
post changeset_comment_unhide_path(comment), :headers => auth_header
assert_response :success
assert comment.reload.visible
end

2
test/controllers/api/changesets_controller_test.rb
View file

@ -2592,7 +2592,7 @@ module Api
# bad changeset id
assert_no_difference "changeset.subscribers.count" do
post api_changeset_subscribe_path(:id => 999111), :headers => auth_header
post api_changeset_subscribe_path(999111), :headers => auth_header
end
assert_response :not_found