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

Don't send note comment notifications to deleted users

Browse source
This commit is contained in:
Tom Hughes 2015-10-30 19:11:25 +00:00
parent a082baebd7
commit c9fdd5d3cb
3 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
test/controllers/notes_controller_test.rb
View file

@ -225,7 +225,7 @@ class NotesControllerTest < ActionController::TestCase
assert_equal "Feature", js["type"]
assert_equal notes(:open_note_with_comment).id, js["properties"]["id"]
assert_equal "open", js["properties"]["status"]
assert_equal 3, js["properties"]["comments"].count
assert_equal 5, js["properties"]["comments"].count
assert_equal "commented", js["properties"]["comments"].last["action"]
assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]
assert_nil js["properties"]["comments"].last["user"]
@ -237,7 +237,7 @@ class NotesControllerTest < ActionController::TestCase
assert_equal "Feature", js["type"]
assert_equal notes(:open_note_with_comment).id, js["properties"]["id"]
assert_equal "open", js["properties"]["status"]
assert_equal 3, js["properties"]["comments"].count
assert_equal 5, js["properties"]["comments"].count
assert_equal "commented", js["properties"]["comments"].last["action"]
assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]
assert_nil js["properties"]["comments"].last["user"]
@ -371,7 +371,7 @@ class NotesControllerTest < ActionController::TestCase
assert_equal "Feature", js["type"]
assert_equal notes(:open_note_with_comment).id, js["properties"]["id"]
assert_equal "closed", js["properties"]["status"]
assert_equal 3, js["properties"]["comments"].count
assert_equal 5, js["properties"]["comments"].count
assert_equal "closed", js["properties"]["comments"].last["action"]
assert_equal "This is a close comment", js["properties"]["comments"].last["text"]
assert_equal "test2", js["properties"]["comments"].last["user"]
@ -383,7 +383,7 @@ class NotesControllerTest < ActionController::TestCase
assert_equal "Feature", js["type"]
assert_equal notes(:open_note_with_comment).id, js["properties"]["id"]
assert_equal "closed", js["properties"]["status"]
assert_equal 3, js["properties"]["comments"].count
assert_equal 5, js["properties"]["comments"].count
assert_equal "closed", js["properties"]["comments"].last["action"]
assert_equal "This is a close comment", js["properties"]["comments"].last["text"]
assert_equal "test2", js["properties"]["comments"].last["user"]
@ -562,7 +562,7 @@ class NotesControllerTest < ActionController::TestCase
assert_equal "Feature", js["type"]
assert_equal notes(:open_note_with_comment).id, js["properties"]["id"]
assert_equal "hidden", js["properties"]["status"]
assert_equal 3, js["properties"]["comments"].count
assert_equal 5, js["properties"]["comments"].count
assert_equal "hidden", js["properties"]["comments"].last["action"]
assert_equal "This is a hide comment", js["properties"]["comments"].last["text"]
assert_equal "moderator", js["properties"]["comments"].last["user"]
@ -841,7 +841,7 @@ class NotesControllerTest < ActionController::TestCase
assert_equal "application/rss+xml", @response.content_type
assert_select "rss", :count => 1 do
assert_select "channel", :count => 1 do
assert_select "item", :count => 8
assert_select "item", :count => 10
end
end
@ -850,7 +850,7 @@ class NotesControllerTest < ActionController::TestCase
assert_equal "application/rss+xml", @response.content_type
assert_select "rss", :count => 1 do
assert_select "channel", :count => 1 do
assert_select "item", :count => 3
assert_select "item", :count => 5
end
end
end