Merge remote-tracking branch 'upstream/pull/5656'

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

diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb
index d9afb94a21236216d2abdabdb6105aa7142fdcfc..a1880f0534a03b87650ab4e7fa59d2b40dcb46ed 100644 (file)
--- a/test/controllers/api/changesets_controller_test.rb
+++ b/test/controllers/api/changesets_controller_test.rb
@@ -153,17 +153,19 @@ module Api
       get changeset_show_path(changeset)
       assert_response :success, "cannot get first changeset"
 
-      assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
-      assert_single_changeset changeset
-      assert_select "osm>changeset>discussion", 0
+      assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
+      assert_single_changeset changeset do
+        assert_dom "> discussion", 0
+      end
 
       get changeset_show_path(changeset), :params => { :include_discussion => true }
       assert_response :success, "cannot get first changeset with comments"
 
-      assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
-      assert_single_changeset changeset
-      assert_select "osm>changeset>discussion", 1
-      assert_select "osm>changeset>discussion>comment", 0
+      assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
+      assert_single_changeset changeset do
+        assert_dom "> discussion", 1
+        assert_dom "> discussion > comment", 0
+      end
     end
 
     def test_show_comments
@@ -174,45 +176,56 @@ module Api
       get changeset_show_path(changeset), :params => { :include_discussion => true }
       assert_response :success, "cannot get closed changeset with comments"
 
-      assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
-      assert_single_changeset changeset
-      assert_select "osm>changeset>discussion", 1
-      assert_select "osm>changeset>discussion>comment", 3
-      assert_select "osm>changeset>discussion>comment:nth-child(1)>@id", comment1.id.to_s
-      assert_select "osm>changeset>discussion>comment:nth-child(1)>@visible", "true"
-      assert_select "osm>changeset>discussion>comment:nth-child(2)>@id", comment2.id.to_s
-      assert_select "osm>changeset>discussion>comment:nth-child(2)>@visible", "true"
-      assert_select "osm>changeset>discussion>comment:nth-child(3)>@id", comment3.id.to_s
-      assert_select "osm>changeset>discussion>comment:nth-child(3)>@visible", "true"
+      assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1 do
+        assert_single_changeset changeset do
+          assert_dom "> discussion", 1 do
+            assert_dom "> comment", 3 do |dom_comments|
+              assert_dom dom_comments[0], "> @id", comment1.id.to_s
+              assert_dom dom_comments[0], "> @visible", "true"
+              assert_dom dom_comments[1], "> @id", comment2.id.to_s
+              assert_dom dom_comments[1], "> @visible", "true"
+              assert_dom dom_comments[2], "> @id", comment3.id.to_s
+              assert_dom dom_comments[2], "> @visible", "true"
+            end
+          end
+        end
+      end
 
       # one hidden comment not included because not asked for
       comment2.update(:visible => false)
+      changeset.reload
 
       get changeset_show_path(changeset), :params => { :include_discussion => true }
       assert_response :success, "cannot get closed changeset with comments"
 
-      assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
-      assert_single_changeset changeset
-      assert_select "osm>changeset>discussion", 1
-      assert_select "osm>changeset>discussion>comment", 2
-      assert_select "osm>changeset>discussion>comment:nth-child(1)>@id", comment1.id.to_s
-      assert_select "osm>changeset>discussion>comment:nth-child(1)>@visible", "true"
-      assert_select "osm>changeset>discussion>comment:nth-child(2)>@id", comment3.id.to_s
-      assert_select "osm>changeset>discussion>comment:nth-child(2)>@visible", "true"
+      assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
+      assert_single_changeset changeset do
+        assert_dom "> discussion", 1 do
+          assert_dom "> comment", 2 do |dom_comments|
+            assert_dom dom_comments[0], "> @id", comment1.id.to_s
+            assert_dom dom_comments[0], "> @visible", "true"
+            assert_dom dom_comments[1], "> @id", comment3.id.to_s
+            assert_dom dom_comments[1], "> @visible", "true"
+          end
+        end
+      end
 
       # one hidden comment not included because no permissions
       get changeset_show_path(changeset), :params => { :include_discussion => true, :show_hidden_comments => true }
       assert_response :success, "cannot get closed changeset with comments"
 
-      assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
-      assert_single_changeset changeset
-      assert_select "osm>changeset>discussion", 1
-      assert_select "osm>changeset>discussion>comment", 2
-      assert_select "osm>changeset>discussion>comment:nth-child(1)>@id", comment1.id.to_s
-      assert_select "osm>changeset>discussion>comment:nth-child(1)>@visible", "true"
-      # maybe will show an empty comment element with visible=false in the future
-      assert_select "osm>changeset>discussion>comment:nth-child(2)>@id", comment3.id.to_s
-      assert_select "osm>changeset>discussion>comment:nth-child(2)>@visible", "true"
+      assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
+      assert_single_changeset changeset do
+        assert_dom "> discussion", 1 do
+          assert_dom "> comment", 2 do |dom_comments|
+            assert_dom dom_comments[0], "> @id", comment1.id.to_s
+            assert_dom dom_comments[0], "> @visible", "true"
+            # maybe will show an empty comment element with visible=false in the future
+            assert_dom dom_comments[1], "> @id", comment3.id.to_s
+            assert_dom dom_comments[1], "> @visible", "true"
+          end
+        end
+      end
 
       # one hidden comment shown to moderators
       moderator_user = create(:moderator_user)
@@ -221,16 +234,19 @@ module Api
                                           :headers => auth_header
       assert_response :success, "cannot get closed changeset with comments"
 
-      assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
-      assert_single_changeset changeset
-      assert_select "osm>changeset>discussion", 1
-      assert_select "osm>changeset>discussion>comment", 3
-      assert_select "osm>changeset>discussion>comment:nth-child(1)>@id", comment1.id.to_s
-      assert_select "osm>changeset>discussion>comment:nth-child(1)>@visible", "true"
-      assert_select "osm>changeset>discussion>comment:nth-child(2)>@id", comment2.id.to_s
-      assert_select "osm>changeset>discussion>comment:nth-child(2)>@visible", "false"
-      assert_select "osm>changeset>discussion>comment:nth-child(3)>@id", comment3.id.to_s
-      assert_select "osm>changeset>discussion>comment:nth-child(3)>@visible", "true"
+      assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
+      assert_single_changeset changeset do
+        assert_dom "> discussion", 1 do
+          assert_dom "> comment", 3 do |dom_comments|
+            assert_dom dom_comments[0], "> @id", comment1.id.to_s
+            assert_dom dom_comments[0], "> @visible", "true"
+            assert_dom dom_comments[1], "> @id", comment2.id.to_s
+            assert_dom dom_comments[1], "> @visible", "false"
+            assert_dom dom_comments[2], "> @id", comment3.id.to_s
+            assert_dom dom_comments[2], "> @visible", "true"
+          end
+        end
+      end
     end
 
     def test_show_json
@@ -289,6 +305,7 @@ module Api
 
       # one hidden comment not included because not asked for
       comment1.update(:visible => false)
+      changeset.reload
 
       get changeset_show_path(changeset), :params => { :format => "json", :include_discussion => true }
       assert_response :success, "cannot get closed changeset with comments"
@@ -343,19 +360,8 @@ module Api
 
     def test_show_tag_and_discussion_json
       changeset = create(:changeset, :closed)
-
-      tag1 = ChangesetTag.new
-      tag1.changeset_id = changeset.id
-      tag1.k = "created_by"
-      tag1.v = "JOSM/1.5 (18364)"
-
-      tag2 = ChangesetTag.new
-      tag2.changeset_id = changeset.id
-      tag2.k = "comment"
-      tag2.v = "changeset comment"
-
-      changeset.changeset_tags = [tag1, tag2]
-
+      create(:changeset_tag, :changeset => changeset, :k => "created_by", :v => "JOSM/1.5 (18364)")
+      create(:changeset_tag, :changeset => changeset, :k => "comment", :v => "changeset comment")
       create_list(:changeset_comment, 3, :changeset_id => changeset.id)
 
       get changeset_show_path(changeset), :params => { :format => "json", :include_discussion => true }
@@ -369,8 +375,6 @@ module Api
       assert_single_changeset_json changeset, js
       assert_equal 2, js["changeset"]["tags"].count
       assert_equal 3, js["changeset"]["comments"].count
-      assert_equal 3, js["changeset"]["comments_count"]
-      assert_equal 0, js["changeset"]["changes_count"]
       assert_not_nil js["changeset"]["comments"][0]["uid"]
       assert_not_nil js["changeset"]["comments"][0]["user"]
       assert_not_nil js["changeset"]["comments"][0]["text"]
@@ -2657,16 +2661,20 @@ module Api
 
     ##
     # check that the output consists of one specific changeset
-    def assert_single_changeset(changeset)
-      assert_select "osm>changeset", 1
-      assert_select "osm>changeset>@id", changeset.id.to_s
-      assert_select "osm>changeset>@created_at", changeset.created_at.xmlschema
-      if changeset.open?
-        assert_select "osm>changeset>@open", "true"
-        assert_select "osm>changeset>@closed_at", 0
-      else
-        assert_select "osm>changeset>@open", "false"
-        assert_select "osm>changeset>@closed_at", changeset.closed_at.xmlschema
+    def assert_single_changeset(changeset, &)
+      assert_dom "> changeset", 1 do
+        assert_dom "> @id", changeset.id.to_s
+        assert_dom "> @created_at", changeset.created_at.xmlschema
+        if changeset.open?
+          assert_dom "> @open", "true"
+          assert_dom "> @closed_at", 0
+        else
+          assert_dom "> @open", "false"
+          assert_dom "> @closed_at", changeset.closed_at.xmlschema
+        end
+        assert_dom "> @comments_count", changeset.comments.length.to_s
+        assert_dom "> @changes_count", changeset.num_changes.to_s
+        yield if block_given?
       end
     end
 
@@ -2680,6 +2688,8 @@ module Api
         assert_not js["changeset"]["open"]
         assert_equal changeset.closed_at.xmlschema, js["changeset"]["closed_at"]
       end
+      assert_equal changeset.comments.length, js["changeset"]["comments_count"]
+      assert_equal changeset.num_changes, js["changeset"]["changes_count"]
     end
 
     ##