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

Get note text only from textarea within left sidebar

Browse source
This commit is contained in:
Anton Khorev 2024-12-19 05:22:54 +03:00
parent 0931f47483
commit 25e4a80760
2 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/index/note.js
View file

@ -61,7 +61,7 @@ OSM.Note = function (map) {
};
if (name !== "subscribe" && name !== "unsubscribe" && name !== "reopen") {
ajaxSettings.data = { text: $("textarea").val() };
ajaxSettings.data = { text: content.find("textarea").val() };
}
content.find("button[name]").prop("disabled", true);

24
test/system/resolve_note_test.rb
View file

@ -9,6 +9,7 @@ class ResolveNoteTest < ApplicationSystemTestCase
within_sidebar do
assert_button "Resolve"
assert_no_button "Comment & Resolve"
assert_no_button "Reactivate"
click_on "Resolve"
@ -17,6 +18,28 @@ class ResolveNoteTest < ApplicationSystemTestCase
end
end
test "can resolve an open note with a comment" do
note = create(:note_with_comments)
user = create(:user)
sign_in_as(user)
visit note_path(note)
within_sidebar do
assert_button "Resolve"
assert_no_button "Comment & Resolve"
assert_no_button "Reactivate"
fill_in "text", :with => "Note resolve text"
assert_button "Comment & Resolve"
click_on "Comment & Resolve"
assert_content "Resolved note ##{note.id}"
assert_content "Note resolve text"
end
end
test "can reactivate a closed note" do
note = create(:note_with_comments, :closed)
user = create(:user)
@ -25,6 +48,7 @@ class ResolveNoteTest < ApplicationSystemTestCase
within_sidebar do
assert_no_button "Resolve"
assert_no_button "Comment & Resolve"
assert_button "Reactivate"
click_on "Reactivate"