Simplify browse routes and make routes more consistent

[rails.git] / test / functional / browse_controller_test.rb

diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb
index 63c3d0b04555857926eb46562190d2fdfc3a2e6c..5c48a5dc78e84ce9604b3703ddd9201bfdc1c9d3 100644 (file)
--- a/test/functional/browse_controller_test.rb
+++ b/test/functional/browse_controller_test.rb
@@ -8,74 +8,73 @@ class BrowseControllerTest < ActionController::TestCase
   # test all routes which lead to this controller
   def test_routes
     assert_routing(
   # test all routes which lead to this controller
   def test_routes
     assert_routing(

-      { :path => "/browse/start", :method => :get },
-      { :controller => "browse", :action => "start" }
-    )
-    assert_routing(
-      { :path => "/browse/node/1", :method => :get },
+      { :path => "/node/1", :method => :get },

       { :controller => "browse", :action => "node", :id => "1" }
     )
     assert_routing(
       { :controller => "browse", :action => "node", :id => "1" }
     )
     assert_routing(

-      { :path => "/browse/node/1/history", :method => :get },
+      { :path => "/node/1/history", :method => :get },

       { :controller => "browse", :action => "node_history", :id => "1" }
     )
     assert_routing(
       { :controller => "browse", :action => "node_history", :id => "1" }
     )
     assert_routing(

-      { :path => "/browse/way/1", :method => :get },
+      { :path => "/way/1", :method => :get },

       { :controller => "browse", :action => "way", :id => "1" }
     )
     assert_routing(
       { :controller => "browse", :action => "way", :id => "1" }
     )
     assert_routing(

-      { :path => "/browse/way/1/history", :method => :get },
+      { :path => "/way/1/history", :method => :get },

       { :controller => "browse", :action => "way_history", :id => "1" }
     )
     assert_routing(
       { :controller => "browse", :action => "way_history", :id => "1" }
     )
     assert_routing(

-      { :path => "/browse/relation/1", :method => :get },
+      { :path => "/relation/1", :method => :get },

       { :controller => "browse", :action => "relation", :id => "1" }
     )
     assert_routing(
       { :controller => "browse", :action => "relation", :id => "1" }
     )
     assert_routing(

-      { :path => "/browse/relation/1/history", :method => :get },
+      { :path => "/relation/1/history", :method => :get },

       { :controller => "browse", :action => "relation_history", :id => "1" }
     )
     assert_routing(
       { :controller => "browse", :action => "relation_history", :id => "1" }
     )
     assert_routing(

-      { :path => "/browse/changeset/1", :method => :get },
+      { :path => "/changeset/1", :method => :get },

       { :controller => "browse", :action => "changeset", :id => "1" }
     )
     assert_routing(
       { :controller => "browse", :action => "changeset", :id => "1" }
     )
     assert_routing(

-      { :path => "/browse/note/1", :method => :get },
+      { :path => "/note/1", :method => :get },

       { :controller => "browse", :action => "note", :id => "1" }
     )
       { :controller => "browse", :action => "note", :id => "1" }
     )

+    assert_routing(
+      { :path => "/note/new", :method => :get },
+      { :controller => "browse", :action => "new_note" }
+    )

   end
 
   end
 

-  def test_start
-    xhr :get, :start
-    assert_response :success
-  end
-  

   def test_read_relation
   def test_read_relation

-    browse_check 'relation', relations(:visible_relation).relation_id
+    browse_check 'relation', relations(:visible_relation).relation_id, 'browse/feature'

   end
   end

-  
+

   def test_read_relation_history
   def test_read_relation_history

-    browse_check 'relation_history', relations(:visible_relation).relation_id
+    browse_check 'relation_history', relations(:visible_relation).relation_id, 'browse/history'

   end
   end

-  
+

   def test_read_way
   def test_read_way

-    browse_check 'way', ways(:visible_way).way_id
+    browse_check 'way', ways(:visible_way).way_id, 'browse/feature'

   end
   end

-  
+

   def test_read_way_history
   def test_read_way_history

-    browse_check 'way_history', ways(:visible_way).way_id
+    browse_check 'way_history', ways(:visible_way).way_id, 'browse/history'

   end
   end

-  
+

   def test_read_node
   def test_read_node

-    browse_check 'node', nodes(:visible_node).node_id
+    browse_check 'node', nodes(:visible_node).node_id, 'browse/feature'

   end
   end

-  
+

   def test_read_node_history
   def test_read_node_history

-    browse_check 'node_history', nodes(:visible_node).node_id
+    browse_check 'node_history', nodes(:visible_node).node_id, 'browse/history'

   end
   end

-  
+

   def test_read_changeset
   def test_read_changeset

-    browse_check 'changeset', changesets(:normal_user_first_change).id
+    browse_check 'changeset', changesets(:normal_user_first_change).id, 'browse/changeset'
+  end
+
+  def test_read_note
+    browse_check 'note', notes(:open_note).id, 'browse/note'

   end
 
   ##
   end
 
   ##


@@ -83,59 +82,60 @@ class BrowseControllerTest < ActionController::TestCase
   #
   # note that these are presently highly reliant on the structure of the
   # page for the selection tests, which doesn't work out particularly
   #
   # note that these are presently highly reliant on the structure of the
   # page for the selection tests, which doesn't work out particularly

-  # well if that structure changes. so... if you change the page layout 
+  # well if that structure changes. so... if you change the page layout

   # then please make it more easily (and robustly) testable!
   ##
   def test_redacted_node_history
     get :node_history, :id => nodes(:redacted_node_redacted_version).node_id
     assert_response :success
   # then please make it more easily (and robustly) testable!
   ##
   def test_redacted_node_history
     get :node_history, :id => nodes(:redacted_node_redacted_version).node_id
     assert_response :success

-    assert_template 'node_history'
-    
+    assert_template 'browse/history'
+

     # there are 2 revisions of the redacted node, but only one
     # there are 2 revisions of the redacted node, but only one

-    # should be showing up here.
-    assert_select "body div[id=content] table[class=browse_details]", 1
-    assert_select "body div[id=content] table[class=browse_details][id=1]", 0
+    # should be showing details here.
+    assert_select ".browse-section", 2
+    assert_select ".browse-section.browse-redacted", 1
+    assert_select ".browse-section.browse-node", 1

   end
   end

-  
+

   def test_redacted_way_history
     get :way_history, :id => ways(:way_with_redacted_versions_v1).way_id
     assert_response :success
   def test_redacted_way_history
     get :way_history, :id => ways(:way_with_redacted_versions_v1).way_id
     assert_response :success

-    assert_template 'way_history'
-    
+    assert_template 'browse/history'
+

     # there are 4 revisions of the redacted way, but only 2
     # there are 4 revisions of the redacted way, but only 2

-    # should be showing up here.
-    assert_select "body div[id=content] table[class=browse_details]", 2
-    # redacted revisions are 2 & 3
-    assert_select "body div[id=content] table[class=browse_details][id=2]", 0
-    assert_select "body div[id=content] table[class=browse_details][id=3]", 0
+    # should be showing details here.
+    assert_select ".browse-section", 4
+    assert_select ".browse-section.browse-redacted", 2
+    assert_select ".browse-section.browse-way", 2

   end
   end

-  
+

   def test_redacted_relation_history
     get :relation_history, :id => relations(:relation_with_redacted_versions_v1).relation_id
     assert_response :success
   def test_redacted_relation_history
     get :relation_history, :id => relations(:relation_with_redacted_versions_v1).relation_id
     assert_response :success

-    assert_template 'relation_history'
-    
+    assert_template 'browse/history'
+

     # there are 4 revisions of the redacted relation, but only 2
     # there are 4 revisions of the redacted relation, but only 2

-    # should be showing up here.
-    assert_select "body div[id=content] table[class=browse_details]", 2
-    # redacted revisions are 2 & 3
-    assert_select "body div[id=content] table[class=browse_details][id=2]", 0
-    assert_select "body div[id=content] table[class=browse_details][id=3]", 0
+    # should be showing details here.
+    assert_select ".browse-section", 4
+    assert_select ".browse-section.browse-redacted", 2
+    assert_select ".browse-section.browse-relation", 2

   end
   end

-  
+
+private
+

   # This is a convenience method for most of the above checks
   # First we check that when we don't have an id, it will correctly return a 404
   # then we check that we get the correct 404 when a non-existant id is passed
   # then we check that it will get a successful response, when we do pass an id
   # This is a convenience method for most of the above checks
   # First we check that when we don't have an id, it will correctly return a 404
   # then we check that we get the correct 404 when a non-existant id is passed
   # then we check that it will get a successful response, when we do pass an id

-  def browse_check(type, id) 
-    assert_raise ActionController::RoutingError do
+  def browse_check(type, id, template)
+    assert_raise ActionController::UrlGenerationError do

       get type
     end
       get type
     end

-    assert_raise ActionController::RoutingError do
+    assert_raise ActionController::UrlGenerationError do

       get type, {:id => -10} # we won't have an id that's negative
     end
     get type, {:id => id}
     assert_response :success
       get type, {:id => -10} # we won't have an id that's negative
     end
     get type, {:id => id}
     assert_response :success

-    assert_template type
+    assert_template template

   end
 end
   end
 end