Merge remote-tracking branch 'upstream/pull/3736'
This commit is contained in:
commit
31d27da6bc
2 changed files with 22 additions and 0 deletions
|
@ -33,6 +33,7 @@ window.updateLinks = function (loc, zoom, layers, object) {
|
||||||
delete args.way;
|
delete args.way;
|
||||||
delete args.relation;
|
delete args.relation;
|
||||||
delete args.changeset;
|
delete args.changeset;
|
||||||
|
delete args.note;
|
||||||
|
|
||||||
if (object && editlink) {
|
if (object && editlink) {
|
||||||
args[object.type] = object.id;
|
args[object.type] = object.id;
|
||||||
|
|
21
test/system/index_test.rb
Normal file
21
test/system/index_test.rb
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
require "application_system_test_case"
|
||||||
|
|
||||||
|
class IndexTest < ApplicationSystemTestCase
|
||||||
|
test "node included in edit link" do
|
||||||
|
node = create(:node)
|
||||||
|
visit node_path(node)
|
||||||
|
assert_selector "#editanchor[href*='?node=#{node.id}#']"
|
||||||
|
|
||||||
|
find("#sidebar .btn-close").click
|
||||||
|
assert_no_selector "#editanchor[href*='?node=#{node.id}#']"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "note included in edit link" do
|
||||||
|
note = create(:note_with_comments)
|
||||||
|
visit browse_note_path(note)
|
||||||
|
assert_selector "#editanchor[href*='?note=#{note.id}#']"
|
||||||
|
|
||||||
|
find("#sidebar .btn-close").click
|
||||||
|
assert_no_selector "#editanchor[href*='?note=#{note.id}#']"
|
||||||
|
end
|
||||||
|
end
|
Loading…
Add table
Add a link
Reference in a new issue