Move controller tests for new reports into seperate file, and adapt to new form struc...

diff --git a/test/controllers/issues_controller_test.rb b/test/controllers/issues_controller_test.rb
index 3a38ea812ce240af4165592b3c5cc44f99d2057b..a77ef86607d9588d49be80a7af76b37b47d86539 100644 (file)
--- a/test/controllers/issues_controller_test.rb
+++ b/test/controllers/issues_controller_test.rb
@@ -29,133 +29,6 @@ class IssuesControllerTest < ActionController::TestCase
     assert_response :success
   end
 
     assert_response :success
   end
 

-  def test_new_issue_without_login
-    # Test creation of a new issue and a new report without logging in
-    get :new, :params => { :reportable_id => 1, :reportable_type => "User", :reported_user_id => 1 }
-    assert_response :redirect
-    assert_redirected_to login_path(:referer => new_issue_path(:reportable_id => 1, :reportable_type => "User", :reported_user_id => 1))
-  end
-
-  def test_new_issue_after_login
-    # Test creation of a new issue and a new report
-    target_user = create(:user)
-
-    # Login
-    session[:user] = create(:user).id
-
-    assert_equal Issue.count, 0
-
-    # Create an Issue and a report
-    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
-    assert_response :success
-    assert_difference "Issue.count", 1 do
-      details = "Details of a report"
-      post :create,
-           :params => {
-             :report => { :details => details },
-             :report_type => "[OFFENSIVE]",
-             :issue => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
-           }
-    end
-    assert_equal Issue.count, 1
-    assert_response :redirect
-    assert_redirected_to root_path
-  end
-
-  def test_new_report_with_incomplete_details
-    # Test creation of a new issue and a new report
-    target_user = create(:user)
-
-    # Login
-    session[:user] = create(:user).id
-
-    assert_equal Issue.count, 0
-
-    # Create an Issue and a report
-    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
-    assert_response :success
-    assert_difference "Issue.count", 1 do
-      details = "Details of a report"
-      post :create,
-           :params => {
-             :report => { :details => details },
-             :report_type => "[OFFENSIVE]",
-             :issue => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
-           }
-    end
-    assert_equal Issue.count, 1
-    assert_response :redirect
-    assert_redirected_to root_path
-
-    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
-    assert_response :success
-
-    # Report without report_type
-    assert_no_difference "Issue.count" do
-      details = "Details of another report under the same issue"
-      post :create,
-           :params => {
-             :report => { :details => details },
-             :issue => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
-           }
-    end
-    assert_response :redirect
-    assert_equal Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").reports.count, 1
-
-    # Report without details
-    assert_no_difference "Issue.count" do
-      post :create,
-           :params => {
-             :report_type => "[OFFENSIVE]",
-             :issue => { :reportable_id => 1, :reportable_type => "User", :reported_user_id => 2 }
-           }
-    end
-    assert_response :redirect
-    assert_equal Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").reports.count, 1
-  end
-
-  def test_new_report_with_complete_details
-    # Test creation of a new issue and a new report
-    target_user = create(:user)
-
-    # Login
-    session[:user] = create(:user).id
-
-    assert_equal Issue.count, 0
-
-    # Create an Issue and a report
-    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
-    assert_response :success
-    assert_difference "Issue.count", 1 do
-      details = "Details of a report"
-      post :create,
-           :params => {
-             :report => { :details => details },
-             :report_type => "[OFFENSIVE]",
-             :issue => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
-           }
-    end
-    assert_equal Issue.count, 1
-    assert_response :redirect
-    assert_redirected_to root_path
-
-    # Create a report for an existing Issue
-    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
-    assert_response :success
-    assert_no_difference "Issue.count" do
-      details = "Details of another report under the same issue"
-      post :create,
-           :params => {
-             :report => { :details => details },
-             :report_type => "[OFFENSIVE]",
-             :issue => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
-           }
-    end
-    assert_response :redirect
-    report_count = Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").reports.count
-    assert_equal report_count, 2
-  end
-

   def test_change_status_by_normal_user
     target_user = create(:user)
     issue = create(:issue, :reportable => target_user, :reported_user => target_user)
   def test_change_status_by_normal_user
     target_user = create(:user)
     issue = create(:issue, :reportable => target_user, :reported_user => target_user)

diff --git a/test/controllers/reports_controller_test.rb b/test/controllers/reports_controller_test.rb
new file mode 100644 (file)
index 0000000..8dc1023
--- /dev/null
+++ b/test/controllers/reports_controller_test.rb
@@ -0,0 +1,135 @@
+require "test_helper"
+
+class ReportsControllerTest < ActionController::TestCase
+  def test_new_report_without_login
+    target_user = create(:user)
+    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User" }
+    assert_response :redirect
+    assert_redirected_to login_path(:referer => new_report_path(:reportable_id => target_user.id, :reportable_type => "User"))
+  end
+
+  def test_new_report_after_login
+    target_user = create(:user)
+
+    session[:user] = create(:user).id
+
+    assert_equal Issue.count, 0
+
+    # Create an Issue and a report
+    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User" }
+    assert_response :success
+    assert_difference "Issue.count", 1 do
+      details = "Details of a report"
+      post :create,
+           :params => {
+             :report => {
+               :details => details,
+               :issue => { :reportable_id => target_user.id, :reportable_type => "User" }
+             }
+           }
+    end
+    assert_equal Issue.count, 1
+    assert_response :redirect
+    assert_redirected_to root_path
+  end
+
+  def test_new_report_with_incomplete_details
+    # Test creation of a new issue and a new report
+    target_user = create(:user)
+
+    # Login
+    session[:user] = create(:user).id
+
+    assert_equal Issue.count, 0
+
+    # Create an Issue and a report
+    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User" }
+    assert_response :success
+    assert_difference "Issue.count", 1 do
+      details = "Details of a report"
+      post :create,
+           :params => {
+             :report => {
+               :details => details,
+               :issue => { :reportable_id => target_user.id, :reportable_type => "User" }
+             }
+           }
+    end
+    assert_equal Issue.count, 1
+    assert_response :redirect
+    assert_redirected_to root_path
+
+    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User" }
+    assert_response :success
+
+    # Report without report_type
+    assert_no_difference "Issue.count" do
+      details = "Details of another report under the same issue"
+      post :create,
+           :params => {
+             :report => {
+               :details => details,
+               :issue => { :reportable_id => target_user.id, :reportable_type => "User" }
+             }
+           }
+    end
+    assert_response :redirect
+    assert_equal Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").reports.count, 1
+
+    # Report without details
+    assert_no_difference "Issue.count" do
+      post :create,
+           :params => {
+             :report => {
+               :issue => { :reportable_id => 1, :reportable_type => "User" }
+             }
+           }
+    end
+    assert_response :redirect
+    assert_equal Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").reports.count, 1
+  end
+
+  def test_new_report_with_complete_details
+    # Test creation of a new issue and a new report
+    target_user = create(:user)
+
+    # Login
+    session[:user] = create(:user).id
+
+    assert_equal Issue.count, 0
+
+    # Create an Issue and a report
+    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User" }
+    assert_response :success
+    assert_difference "Issue.count", 1 do
+      details = "Details of a report"
+      post :create,
+           :params => {
+             :report => {
+               :details => details,
+               :issue => { :reportable_id => target_user.id, :reportable_type => "User" }
+             }
+           }
+    end
+    assert_equal Issue.count, 1
+    assert_response :redirect
+    assert_redirected_to root_path
+
+    # Create a report for an existing Issue
+    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User" }
+    assert_response :success
+    assert_no_difference "Issue.count" do
+      details = "Details of another report under the same issue"
+      post :create,
+           :params => {
+             :report => {
+               :details => details,
+               :issue => { :reportable_id => target_user.id, :reportable_type => "User" }
+             }
+           }
+    end
+    assert_response :redirect
+    report_count = Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").reports.count
+    assert_equal report_count, 2
+  end
+end