Merge branch 'master' of https://github.com/LukeShu/leaguer

2 files changed, 6 insertions, 2 deletions

diff --git a/test/controllers/pms_controller_test.rb b/test/controllers/pms_controller_test.rb
index 18b2449..2a2c1ce 100644
--- a/test/controllers/pms_controller_test.rb
+++ b/test/controllers/pms_controller_test.rb
@@ -18,7 +18,7 @@ class PmsControllerTest < ActionController::TestCase
 
   test "should create pm" do
     assert_difference('Pm.count') do
-      post :create, pm: { author_id: @pm.author_id, message: @pm.message, recipient_id: @pm.recipient_id }
+      post :create, pm: { author_id: @pm.author_id, conversation_id: @pm.conversation_id, message: @pm.message, recipient_id: @pm.recipient_id, subject: @pm.subject }
     end
 
     assert_redirected_to pm_path(assigns(:pm))
@@ -35,7 +35,7 @@ class PmsControllerTest < ActionController::TestCase
   end
 
   test "should update pm" do
-    patch :update, id: @pm, pm: { author_id: @pm.author_id, message: @pm.message, recipient_id: @pm.recipient_id }
+    patch :update, id: @pm, pm: { author_id: @pm.author_id, conversation_id: @pm.conversation_id, message: @pm.message, recipient_id: @pm.recipient_id, subject: @pm.subject }
     assert_redirected_to pm_path(assigns(:pm))
   end
 
diff --git a/test/fixtures/pms.yml b/test/fixtures/pms.yml
index f77e727..ba31b86 100644
--- a/test/fixtures/pms.yml
+++ b/test/fixtures/pms.yml
@@ -4,8 +4,12 @@ one:
   author_id: 
   recipient_id: 
   message: MyText
+  subject: MyText
+  conversation_id: 
 
 two:
   author_id: 
   recipient_id: 
   message: MyText
+  subject: MyText
+  conversation_id: