Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/2725'
Browse files Browse the repository at this point in the history
  • Loading branch information
@tomhughes
tomhughes committed Jul 22, 2020
2 parents d4130bc + 47d1176 commit a792b74
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 38 deletions.
44 changes: 22 additions & 22 deletions test/controllers/api/ways_controller_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,31 +64,31 @@ def test_show
##
# check the "full" mode
def test_full
Way.all.each do |way|
get way_full_path(way)

# full call should say "gone" for non-visible ways...
unless way.visible
assert_response :gone
next
end

# otherwise it should say success
assert_response :success

# Check the way is correctly returned
assert_select "osm way[id='#{way.id}'][version='#{way.version}'][visible='#{way.visible}']", 1

# check that each node in the way appears once in the output as a
# reference and as the node element.
way.nodes.each do |n|
count = (way.nodes - (way.nodes - [n])).length
assert_select "osm way nd[ref='#{n.id}']", count
assert_select "osm node[id='#{n.id}'][version='#{n.version}'][lat='#{format('%.7f', n.lat)}'][lon='#{format('%.7f', n.lon)}']", 1
end
way = create(:way_with_nodes, :nodes_count => 3)

get way_full_path(way)

assert_response :success

# Check the way is correctly returned
assert_select "osm way[id='#{way.id}'][version='1'][visible='true']", 1

# check that each node in the way appears once in the output as a
# reference and as the node element.
way.nodes.each do |n|
assert_select "osm way nd[ref='#{n.id}']", 1
assert_select "osm node[id='#{n.id}'][version='1'][lat='#{format('%.7f', n.lat)}'][lon='#{format('%.7f', n.lon)}']", 1
end
end

def test_full_deleted
way = create(:way, :deleted)

get way_full_path(way)

assert_response :gone
end

##
# test fetching multiple ways
def test_index
Expand Down
47 changes: 31 additions & 16 deletions test/controllers/changesets_controller_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ def test_routes
##
# This should display the last 20 changesets closed
def test_index
changesets = create_list(:changeset, 30, :num_changes => 1)

get history_path(:format => "html")
assert_response :success
assert_template "history"
Expand All @@ -43,12 +45,14 @@ def test_index
assert_response :success
assert_template "index"

check_index_result(Changeset.all)
check_index_result(changesets.last(20))
end

##
# This should display the last 20 changesets closed
def test_index_xhr
changesets = create_list(:changeset, 30, :num_changes => 1)

get history_path(:format => "html"), :xhr => true
assert_response :success
assert_template "history"
Expand All @@ -59,12 +63,22 @@ def test_index_xhr
assert_response :success
assert_template "index"

check_index_result(Changeset.all)
check_index_result(changesets.last(20))
end

##
# This should display the last 20 changesets closed in a specific area
def test_index_bbox
changesets = create_list(:changeset, 10, :num_changes => 1, :min_lat => 50000000, :max_lat => 50000001, :min_lon => 50000000, :max_lon => 50000001)
other_changesets = create_list(:changeset, 10, :num_changes => 1, :min_lat => 0, :max_lat => 1, :min_lon => 0, :max_lon => 1)

# First check they all show up without a bbox parameter
get history_path(:format => "html", :list => "1"), :xhr => true
assert_response :success
assert_template "index"
check_index_result(changesets + other_changesets)

# Then check with bbox parameter
get history_path(:format => "html", :bbox => "4.5,4.5,5.5,5.5")
assert_response :success
assert_template "history"
Expand All @@ -75,7 +89,7 @@ def test_index_bbox
assert_response :success
assert_template "index"

check_index_result(Changeset.where("min_lon < 55000000 and max_lon > 45000000 and min_lat < 55000000 and max_lat > 45000000"))
check_index_result(changesets)
end

##
Expand Down Expand Up @@ -111,7 +125,7 @@ def test_index_private_user
assert_response :success
assert_template "index"

check_index_result(Changeset.none)
check_index_result([])
end

##
Expand All @@ -131,7 +145,8 @@ def test_index_user_not_found
def test_index_friends
private_user = create(:user, :data_public => true)
friendship = create(:friendship, :befriender => private_user)
create(:changeset, :user => friendship.befriendee)
changeset = create(:changeset, :user => friendship.befriendee, :num_changes => 1)
_changeset2 = create(:changeset, :user => create(:user), :num_changes => 1)

get friend_changesets_path
assert_response :redirect
Expand All @@ -147,15 +162,17 @@ def test_index_friends
assert_response :success
assert_template "index"

check_index_result(Changeset.where(:user => private_user.friends.identifiable))
check_index_result([changeset])
end

##
# Checks the display of the nearby user changesets listing
def test_index_nearby
private_user = create(:user, :data_public => false, :home_lat => 51.1, :home_lon => 1.0)
user = create(:user, :home_lat => 51.0, :home_lon => 1.0)
create(:changeset, :user => user)
far_away_user = create(:user, :home_lat => 51.0, :home_lon => 130)
changeset = create(:changeset, :user => user, :num_changes => 1)
_changeset2 = create(:changeset, :user => far_away_user, :num_changes => 1)

get nearby_changesets_path
assert_response :redirect
Expand All @@ -171,23 +188,26 @@ def test_index_nearby
assert_response :success
assert_template "index"

check_index_result(Changeset.where(:user => user.nearby))
check_index_result([changeset])
end

##
# Check that we can't request later pages of the changesets index
def test_index_max_id
get history_path(:format => "html", :max_id => 4), :xhr => true
changeset = create(:changeset, :num_changes => 1)
_changeset2 = create(:changeset, :num_changes => 1)

get history_path(:format => "html", :max_id => changeset.id), :xhr => true
assert_response :success
assert_template "history"
assert_template :layout => "xhr"
assert_select "h2", :text => "Changesets", :count => 1

get history_path(:format => "html", :list => "1", :max_id => 4), :xhr => true
get history_path(:format => "html", :list => "1", :max_id => changeset.id), :xhr => true
assert_response :success
assert_template "index"

check_index_result(Changeset.where("id <= 4"))
check_index_result([changeset])
end

##
Expand Down Expand Up @@ -275,11 +295,6 @@ def test_feed_max_id
##
# check the result of a index
def check_index_result(changesets)
changesets = changesets.where("num_changes > 0")
.order(:created_at => :desc)
.limit(20)
assert changesets.size <= 20

assert_select "ol.changesets", :count => [changesets.size, 1].min do
assert_select "li", :count => changesets.size

Expand Down

0 comments on commit a792b74

Please sign in to comment.