X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7d4b48f0f8cc86abb03d747d71f578265951ba07..927cc9f45e6626e2a82403d1263b4a16d601e30b:/test/controllers/changesets_controller_test.rb diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb index 09406e5ff..0b2616525 100644 --- a/test/controllers/changesets_controller_test.rb +++ b/test/controllers/changesets_controller_test.rb @@ -125,8 +125,9 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest # Checks the display of the user changesets listing def test_index_user user = create(:user) - create(:changeset, :user => user) - create(:changeset, :closed, :user => user) + create(:changeset, :user => user, :num_changes => 1) + create(:changeset, :closed, :user => user, :num_changes => 1) + user.reload get history_path(:format => "html", :display_name => user.display_name) assert_response :success @@ -183,7 +184,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest _changeset2 = create(:changeset, :user => create(:user), :num_changes => 1) get friend_changesets_path - assert_response :redirect assert_redirected_to login_path(:referer => friend_changesets_path) session_for(private_user) @@ -209,7 +209,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest _changeset2 = create(:changeset, :user => far_away_user, :num_changes => 1) get nearby_changesets_path - assert_response :redirect assert_redirected_to login_path(:referer => nearby_changesets_path) session_for(private_user) @@ -270,6 +269,12 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest end end + def test_show_closed_changeset + changeset = create(:changeset, :closed) + + sidebar_browse_check :changeset_path, changeset.id, "changesets/show" + end + def test_show_private_changeset user = create(:user) changeset = create(:changeset, :user => create(:user, :data_public => false)) @@ -390,7 +395,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest # Check that we can't request later pages of the changesets feed def test_feed_max_id get history_feed_path(:format => "atom", :max_id => 100) - assert_response :redirect assert_redirected_to :action => :feed end @@ -401,7 +405,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest path = changeset_subscribe_path(changeset) get path - assert_response :redirect assert_redirected_to login_path(:referer => path) session_for(other_user) @@ -422,7 +425,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest assert_difference "changeset.subscribers.count", 1 do post changeset_subscribe_path(changeset) end - assert_response :redirect assert_redirected_to changeset_path(changeset) assert changeset.reload.subscribed?(other_user) end @@ -459,7 +461,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest path = changeset_unsubscribe_path(changeset) get path - assert_response :redirect assert_redirected_to login_path(:referer => path) session_for(other_user) @@ -482,7 +483,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest assert_difference "changeset.subscribers.count", -1 do post changeset_unsubscribe_path(changeset) end - assert_response :redirect assert_redirected_to changeset_path(changeset) assert_not changeset.reload.subscribed?(other_user) end