Fix new rubocop warnings

[rails.git] / test / controllers / changesets_controller_test.rb

diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb
index a4f29359b6fa39c419f698a6d0373120db232a4f..79fd7a571e5f7b919d85b796d5baa879588c2663 100644 (file)
--- a/test/controllers/changesets_controller_test.rb
+++ b/test/controllers/changesets_controller_test.rb
@@ -40,6 +40,9 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     assert_template "history"
     assert_template :layout => "map"
     assert_select "h2", :text => "Changesets", :count => 1
     assert_template "history"
     assert_template :layout => "map"
     assert_select "h2", :text => "Changesets", :count => 1

+    assert_select "link[rel='alternate'][type='application/atom+xml']", :count => 1 do
+      assert_select "[href=?]", "http://www.example.com/history/feed"
+    end

 
     get history_path(:format => "html", :list => "1"), :xhr => true
     assert_response :success
 
     get history_path(:format => "html", :list => "1"), :xhr => true
     assert_response :success


@@ -58,6 +61,9 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     assert_template "history"
     assert_template :layout => "xhr"
     assert_select "h2", :text => "Changesets", :count => 1
     assert_template "history"
     assert_template :layout => "xhr"
     assert_select "h2", :text => "Changesets", :count => 1

+    assert_select "link[rel='alternate'][type='application/atom+xml']", :count => 1 do
+      assert_select "[href=?]", "http://www.example.com/history/feed"
+    end

 
     get history_path(:format => "html", :list => "1"), :xhr => true
     assert_response :success
 
     get history_path(:format => "html", :list => "1"), :xhr => true
     assert_response :success


@@ -84,6 +90,9 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     assert_template "history"
     assert_template :layout => "map"
     assert_select "h2", :text => "Changesets", :count => 1
     assert_template "history"
     assert_template :layout => "map"
     assert_select "h2", :text => "Changesets", :count => 1

+    assert_select "link[rel='alternate'][type='application/atom+xml']", :count => 1 do
+      assert_select "[href=?]", "http://www.example.com/history/feed?bbox=4.5%2C4.5%2C5.5%2C5.5"
+    end

 
     get history_path(:format => "html", :bbox => "4.5,4.5,5.5,5.5", :list => "1"), :xhr => true
     assert_response :success
 
     get history_path(:format => "html", :bbox => "4.5,4.5,5.5,5.5", :list => "1"), :xhr => true
     assert_response :success


@@ -102,6 +111,11 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     get history_path(:format => "html", :display_name => user.display_name)
     assert_response :success
     assert_template "history"
     get history_path(:format => "html", :display_name => user.display_name)
     assert_response :success
     assert_template "history"

+    assert_template :layout => "map"
+    assert_select "h2", :text => "Changesets by #{user.display_name}", :count => 1
+    assert_select "link[rel='alternate'][type='application/atom+xml']", :count => 1 do
+      assert_select "[href=?]", "http://www.example.com/user/#{ERB::Util.url_encode(user.display_name)}/history/feed"
+    end

 
     get history_path(:format => "html", :display_name => user.display_name, :list => "1"), :xhr => true
     assert_response :success
 
     get history_path(:format => "html", :display_name => user.display_name, :list => "1"), :xhr => true
     assert_response :success


@@ -146,10 +160,11 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     private_user = create(:user, :data_public => true)
     friendship = create(:friendship, :befriender => private_user)
     changeset = create(:changeset, :user => friendship.befriendee, :num_changes => 1)
     private_user = create(:user, :data_public => true)
     friendship = create(:friendship, :befriender => private_user)
     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
 
     get friend_changesets_path
     assert_response :redirect

-    assert_redirected_to :controller => :users, :action => :login, :referer => friend_changesets_path
+    assert_redirected_to login_path(:referer => friend_changesets_path)

 
     session_for(private_user)
 
 
     session_for(private_user)
 


@@ -169,11 +184,13 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
   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)
   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)

+    far_away_user = create(:user, :home_lat => 51.0, :home_lon => 130)

     changeset = create(:changeset, :user => user, :num_changes => 1)
     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
 
     get nearby_changesets_path
     assert_response :redirect

-    assert_redirected_to :controller => :users, :action => :login, :referer => nearby_changesets_path
+    assert_redirected_to login_path(:referer => nearby_changesets_path)

 
     session_for(private_user)
 
 
     session_for(private_user)
 


@@ -304,7 +321,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
   ##
   # check the result of a feed
   def check_feed_result(changesets)
   ##
   # check the result of a feed
   def check_feed_result(changesets)

-    assert changesets.size <= 20
+    assert_operator changesets.size, :<=, 20

 
     assert_select "feed", :count => [changesets.size, 1].min do
       assert_select "> title", :count => 1, :text => /^Changesets/
 
     assert_select "feed", :count => [changesets.size, 1].min do
       assert_select "> title", :count => 1, :text => /^Changesets/


@@ -312,6 +329,14 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
 
       changesets.each do |changeset|
         assert_select "> entry > id", changeset_url(:id => changeset.id)
 
       changesets.each do |changeset|
         assert_select "> entry > id", changeset_url(:id => changeset.id)

+
+        assert_select "> entry > content > xhtml|div > xhtml|table" do
+          assert_select "> xhtml|tr > xhtml|td > xhtml|table" do
+            changeset.tags.each do |key, _|
+              assert_select "> xhtml|tr > xhtml|td", :text => /^#{key} = /
+            end
+          end
+        end

       end
     end
   end
       end
     end
   end