From a0899d1b0b266abdd61d54bd3867ae9f7f816fcb Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 15 Mar 2017 17:01:41 +0000
Subject: [PATCH] Use redactions factory in redaction controller test.

---
 .../controllers/redactions_controller_test.rb | 30 +++++++++----------
 test/factories/old_node.rb                    | 16 ++++++++++
 2 files changed, 31 insertions(+), 15 deletions(-)
 create mode 100644 test/factories/old_node.rb

diff --git a/test/controllers/redactions_controller_test.rb b/test/controllers/redactions_controller_test.rb
index c5678a5c8..5a72830e4 100644
--- a/test/controllers/redactions_controller_test.rb
+++ b/test/controllers/redactions_controller_test.rb
@@ -94,11 +94,8 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_destroy_moderator_empty
     session[:user] = create(:moderator_user).id
 
-    # remove all elements from the redaction
-    redaction = redactions(:example)
-    redaction.old_nodes.each     { |n| n.update!(:redaction => nil) }
-    redaction.old_ways.each      { |w| w.update!(:redaction => nil) }
-    redaction.old_relations.each { |r| r.update!(:redaction => nil) }
+    # create an empty redaction
+    redaction = create(:redaction)
 
     delete :destroy, :id => redaction.id
     assert_response :redirect
@@ -108,8 +105,9 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_destroy_moderator_non_empty
     session[:user] = create(:moderator_user).id
 
-    # leave elements in the redaction
-    redaction = redactions(:example)
+    # create elements in the redaction
+    redaction = create(:redaction)
+    create(:old_node, :redaction => redaction)
 
     delete :destroy, :id => redaction.id
     assert_response :redirect
@@ -120,27 +118,29 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_delete_non_moderator
     session[:user] = create(:user).id
 
-    delete :destroy, :id => redactions(:example).id
+    delete :destroy, :id => create(:redaction).id
     assert_response :forbidden
   end
 
   def test_edit
-    get :edit, :id => redactions(:example).id
+    redaction = create(:redaction)
+
+    get :edit, :id => redaction.id
     assert_response :redirect
-    assert_redirected_to login_path(:referer => edit_redaction_path(redactions(:example)))
+    assert_redirected_to login_path(:referer => edit_redaction_path(redaction))
   end
 
   def test_edit_moderator
     session[:user] = create(:moderator_user).id
 
-    get :edit, :id => redactions(:example).id
+    get :edit, :id => create(:redaction).id
     assert_response :success
   end
 
   def test_edit_non_moderator
     session[:user] = create(:user).id
 
-    get :edit, :id => redactions(:example).id
+    get :edit, :id => create(:redaction).id
     assert_response :redirect
     assert_redirected_to(redactions_path)
   end
@@ -148,7 +148,7 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_update_moderator
     session[:user] = create(:moderator_user).id
 
-    redaction = redactions(:example)
+    redaction = create(:redaction)
 
     put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." }
     assert_response :redirect
@@ -158,7 +158,7 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_update_moderator_invalid
     session[:user] = create(:moderator_user).id
 
-    redaction = redactions(:example)
+    redaction = create(:redaction)
 
     put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "" }
     assert_response :success
@@ -168,7 +168,7 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_updated_non_moderator
     session[:user] = create(:user).id
 
-    redaction = redactions(:example)
+    redaction = create(:redaction)
 
     put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." }
     assert_response :forbidden
diff --git a/test/factories/old_node.rb b/test/factories/old_node.rb
new file mode 100644
index 000000000..ecf096eca
--- /dev/null
+++ b/test/factories/old_node.rb
@@ -0,0 +1,16 @@
+FactoryGirl.define do
+  factory :old_node do
+    latitude 1 * GeoRecord::SCALE
+    longitude 1 * GeoRecord::SCALE
+
+    # FIXME: needs changeset factory
+    changeset_id 1
+
+    # FIXME: needs node factory
+    node_id 1000
+
+    visible true
+    timestamp Time.now
+    version 1
+  end
+end
-- 
2.39.5