Skip to content

Commit

Permalink
Slogging through failing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
erictheise committed Dec 4, 2024
1 parent 53118c3 commit 98e3ff4
Show file tree
Hide file tree
Showing 4 changed files with 399 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/views/site/about.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</div>
<div class='row'>
<div class="px-5 py-4 bg-black bg-opacity-75">
<h1 class="text-white fw-light"><%= t ".used_by_html", :name => tag.span("OpenStreetMap", :class => "user-name") %></h1>
<h1 class="text-white fw-light"><%= t ".used_by_html", :name => tag.span("OpenHistoricalMap", :class => "user-name") %></h1>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1922,7 +1922,7 @@ en:
about:
heading_html: "%{copyright}OpenHistoricalMap %{br} contributors"
copyright_symbol_html: "&copy;"
used_by_html: "<span class='user-name'>OpenHistoricalMap</span> collaboratively stores and displays map data throughout the history of the world."
used_by_html: "%{name} collaboratively stores and displays map data throughout the history of the world."
lede_text: |
OpenHistoricalMap is built by a community of mappers and historians that contribute and maintain data
about the history of the world.
Expand Down
6 changes: 3 additions & 3 deletions test/controllers/api/notes_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
def setup
super
# Stub nominatim response for note locations
stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/reverse\?})
stub_request(:get, %r{^https://nominatim\.openhistoricalmap\.org/reverse\?})
.to_return(:status => 404)
end

Expand Down Expand Up @@ -365,13 +365,13 @@ def test_comment_with_notifications_success
email = ActionMailer::Base.deliveries.find { |e| e.to.first == first_user.email }
assert_not_nil email
assert_equal 1, email.to.length
assert_equal "[OpenStreetMap] #{third_user.display_name} has commented on one of your notes", email.subject
assert_equal "[OpenHistoricalMap] #{third_user.display_name} has commented on one of your notes", email.subject
assert_equal first_user.email, email.to.first

email = ActionMailer::Base.deliveries.find { |e| e.to.first == second_user.email }
assert_not_nil email
assert_equal 1, email.to.length
assert_equal "[OpenStreetMap] #{third_user.display_name} has commented on a note you are interested in", email.subject
assert_equal "[OpenHistoricalMap] #{third_user.display_name} has commented on a note you are interested in", email.subject

get api_note_path(note_with_comments_by_users, :format => "json")
assert_response :success
Expand Down
Loading

0 comments on commit 98e3ff4

Please sign in to comment.