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

Refactor changeset index testing to assert against objects, not db queries

Browse source 
This avoids the situation where tests pass despite an empty db.

Refs #2614
This commit is contained in:
Andy Allan 2020-07-22 17:25:10 +02:00
parent b23d6a5445
commit e7dc2f2e55
1 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

44
test/controllers/changesets_controller_test.rb
View file

@ -33,6 +33,8 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
## ##
# This should display the last 20 changesets closed # This should display the last 20 changesets closed
def test_index def test_index
changesets = create_list(:changeset, 30, :num_changes => 1)
get history_path(:format => "html") get history_path(:format => "html")
assert_response :success assert_response :success
assert_template "history" assert_template "history"
@ -43,12 +45,14 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
assert_response :success assert_response :success
assert_template "index" assert_template "index"
check_index_result(Changeset.all) check_index_result(changesets.last(20))
end end
## ##
# This should display the last 20 changesets closed # This should display the last 20 changesets closed
def test_index_xhr def test_index_xhr
changesets = create_list(:changeset, 30, :num_changes => 1)
get history_path(:format => "html"), :xhr => true get history_path(:format => "html"), :xhr => true
assert_response :success assert_response :success
assert_template "history" assert_template "history"
@ -59,12 +63,22 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
assert_response :success assert_response :success
assert_template "index" assert_template "index"
check_index_result(Changeset.all) check_index_result(changesets.last(20))
end end
## ##
# This should display the last 20 changesets closed in a specific area # This should display the last 20 changesets closed in a specific area
def test_index_bbox 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") get history_path(:format => "html", :bbox => "4.5,4.5,5.5,5.5")
assert_response :success assert_response :success
assert_template "history" assert_template "history"
@ -75,7 +89,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
assert_response :success assert_response :success
assert_template "index" 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 end
## ##
@ -111,7 +125,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
assert_response :success assert_response :success
assert_template "index" assert_template "index"
check_index_result(Changeset.none) check_index_result([])
end end
## ##
@ -131,7 +145,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
def test_index_friends def test_index_friends
private_user = create(:user, :data_public => true) private_user = create(:user, :data_public => true)
friendship = create(:friendship, :befriender => private_user) friendship = create(:friendship, :befriender => private_user)
create(:changeset, :user => friendship.befriendee) changeset = create(:changeset, :user => friendship.befriendee, :num_changes => 1)
get friend_changesets_path get friend_changesets_path
assert_response :redirect assert_response :redirect
@ -147,7 +161,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
assert_response :success assert_response :success
assert_template "index" assert_template "index"
check_index_result(Changeset.where(:user => private_user.friends.identifiable)) check_index_result([changeset])
end end
## ##
@ -155,7 +169,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
def test_index_nearby def test_index_nearby
private_user = create(:user, :data_public => false, :home_lat => 51.1, :home_lon => 1.0) 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) user = create(:user, :home_lat => 51.0, :home_lon => 1.0)
create(:changeset, :user => user) changeset = create(:changeset, :user => user, :num_changes => 1)
get nearby_changesets_path get nearby_changesets_path
assert_response :redirect assert_response :redirect
@ -171,23 +185,26 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
assert_response :success assert_response :success
assert_template "index" assert_template "index"
check_index_result(Changeset.where(:user => user.nearby)) check_index_result([changeset])
end end
## ##
# Check that we can't request later pages of the changesets index # Check that we can't request later pages of the changesets index
def test_index_max_id 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_response :success
assert_template "history" assert_template "history"
assert_template :layout => "xhr" assert_template :layout => "xhr"
assert_select "h2", :text => "Changesets", :count => 1 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_response :success
assert_template "index" assert_template "index"
check_index_result(Changeset.where("id <= 4")) check_index_result([changeset])
end end
## ##
@ -275,11 +292,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
## ##
# check the result of a index # check the result of a index
def check_index_result(changesets) 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 "ol.changesets", :count => [changesets.size, 1].min do
assert_select "li", :count => changesets.size assert_select "li", :count => changesets.size