Update old_ways_controller tests to use factories.

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

diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb
index c5f1eef5c93bc1d1327707e296e91757596588dd..12262b22403bd73dba6882ec169637e0f08ab40f 100644 (file)
--- a/test/controllers/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -62,11 +62,11 @@ class BrowseControllerTest < ActionController::TestCase
   end
 
   def test_read_node
   end
 
   def test_read_node

-    browse_check "node", nodes(:visible_node).node_id, "browse/feature"
+    browse_check "node", create(:node).id, "browse/feature"

   end
 
   def test_read_node_history
   end
 
   def test_read_node_history

-    browse_check "node_history", nodes(:visible_node).node_id, "browse/history"
+    browse_check "node_history", create(:node, :with_history).id, "browse/history"

   end
 
   def test_read_changeset
   end
 
   def test_read_changeset


@@ -75,15 +75,16 @@ class BrowseControllerTest < ActionController::TestCase
   end
 
   def test_read_changeset_hidden_comments
   end
 
   def test_read_changeset_hidden_comments

-    create_list(:changeset_comment, 3)
-    create(:changeset_comment, :visible => false)
+    changeset = create(:changeset)
+    create_list(:changeset_comment, 3, :changeset => changeset)
+    create(:changeset_comment, :visible => false, :changeset => changeset)

 
 

-    browse_check "changeset", changesets(:normal_user_closed_change).id, "browse/changeset"
+    browse_check "changeset", changeset.id, "browse/changeset"

     assert_select "div.changeset-comments ul li", :count => 3
 
     assert_select "div.changeset-comments ul li", :count => 3
 

-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id

 
 

-    browse_check "changeset", changesets(:normal_user_closed_change).id, "browse/changeset"
+    browse_check "changeset", changeset.id, "browse/changeset"

     assert_select "div.changeset-comments ul li", :count => 4
   end
 
     assert_select "div.changeset-comments ul li", :count => 4
   end
 


@@ -106,7 +107,7 @@ class BrowseControllerTest < ActionController::TestCase
     assert_template "browse/not_found"
     assert_template :layout => "xhr"
 
     assert_template "browse/not_found"
     assert_template :layout => "xhr"
 

-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id

 
     browse_check "note", hidden_note_with_comment.id, "browse/note"
   end
 
     browse_check "note", hidden_note_with_comment.id, "browse/note"
   end


@@ -119,7 +120,7 @@ class BrowseControllerTest < ActionController::TestCase
     browse_check "note", note_with_hidden_comment.id, "browse/note"
     assert_select "div.note-comments ul li", :count => 1
 
     browse_check "note", note_with_hidden_comment.id, "browse/note"
     assert_select "div.note-comments ul li", :count => 1
 

-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id

 
     browse_check "note", note_with_hidden_comment.id, "browse/note"
     assert_select "div.note-comments ul li", :count => 2
 
     browse_check "note", note_with_hidden_comment.id, "browse/note"
     assert_select "div.note-comments ul li", :count => 2


@@ -134,7 +135,11 @@ class BrowseControllerTest < ActionController::TestCase
   # then please make it more easily (and robustly) testable!
   ##
   def test_redacted_node
   # then please make it more easily (and robustly) testable!
   ##
   def test_redacted_node

-    get :node, :id => current_nodes(:redacted_node).id
+    node = create(:node, :with_history, :deleted, :version => 2)
+    node_v1 = node.old_nodes.find_by(:version => 1)
+    node_v1.redact!(create(:redaction))
+
+    get :node, :id => node.id

     assert_response :success
     assert_template "feature"
 
     assert_response :success
     assert_template "feature"
 


@@ -146,7 +151,11 @@ class BrowseControllerTest < ActionController::TestCase
   end
 
   def test_redacted_node_history
   end
 
   def test_redacted_node_history

-    get :node_history, :id => nodes(:redacted_node_redacted_version).node_id
+    node = create(:node, :with_history, :deleted, :version => 2)
+    node_v1 = node.old_nodes.find_by(:version => 1)
+    node_v1.redact!(create(:redaction))
+
+    get :node_history, :id => node.id

     assert_response :success
     assert_template "browse/history"
 
     assert_response :success
     assert_template "browse/history"