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

[rails.git] / test / system / changeset_elements_test.rb

diff --git a/test/system/changeset_elements_test.rb b/test/system/changeset_elements_test.rb
index 22c06593347e5ed9e417b1395e0f3fce166fb5fa..9e65f5be274cd389321cefd1c1d48d9e72dfffa5 100644 (file)
--- a/test/system/changeset_elements_test.rb
+++ b/test/system/changeset_elements_test.rb
@@ -13,11 +13,39 @@ class ChangesetElementsTest < ApplicationSystemTestCase
     visit changeset_path(changeset)
 
     within_sidebar do
     visit changeset_path(changeset)
 
     within_sidebar do

-      assert_one_missing_link way_paths
+      next_page_way_path = assert_one_missing_link way_paths
+      assert_no_link "Ways (1-20 of 21)"

       assert_link "Ways (21-21 of 21)"
 
       assert_one_missing_link node_paths
       assert_link "Ways (21-21 of 21)"
 
       assert_one_missing_link node_paths

+      assert_no_link "Nodes (1-20 of 21)"

       assert_link "Nodes (21-21 of 21)"
       assert_link "Nodes (21-21 of 21)"

+
+      fill_in "text", :with => "Comment text we don't want to lose"
+
+      click_on "Ways (21-21 of 21)"
+
+      assert_one_present_link way_paths, next_page_way_path
+      assert_link "Ways (1-20 of 21)"
+      assert_no_link "Ways (21-21 of 21)"
+
+      next_page_node_path = assert_one_missing_link node_paths
+      assert_no_link "Nodes (1-20 of 21)"
+      assert_link "Nodes (21-21 of 21)"
+
+      assert_field "text", :with => "Comment text we don't want to lose"
+
+      click_on "Nodes (21-21 of 21)"
+
+      assert_one_present_link way_paths, next_page_way_path
+      assert_link "Ways (1-20 of 21)"
+      assert_no_link "Ways (21-21 of 21)"
+
+      assert_one_present_link node_paths, next_page_node_path
+      assert_link "Nodes (1-20 of 21)"
+      assert_no_link "Nodes (21-21 of 21)"
+
+      assert_field "text", :with => "Comment text we don't want to lose"

     end
   end
 
     end
   end
 


@@ -38,4 +66,10 @@ class ChangesetElementsTest < ApplicationSystemTestCase
     assert_not_nil missing_href, "expected one link missing but all are present"
     missing_href
   end
     assert_not_nil missing_href, "expected one link missing but all are present"
     missing_href
   end

+
+  def assert_one_present_link(hrefs, present_href)
+    hrefs.each do |href|
+      assert_link :href => href, :count => (href == present_href ? 1 : 0)
+    end
+  end

 end
 end