summaryrefslogtreecommitdiff
path: root/test/functional/v1/messages_controller_test.rb
diff options
context:
space:
mode:
authorazul <azul@leap.se>2014-07-18 12:21:49 +0200
committerazul <azul@leap.se>2014-07-18 12:21:49 +0200
commitbbd41c9bfd2cb88a88d7436dd58a8b46a5d10cf1 (patch)
tree00b39da219151473437c02ce35344117bcd5b2fa /test/functional/v1/messages_controller_test.rb
parentade74d8a9091ae607586d7b287a0579a2ee7af8e (diff)
parent20352249fa5dafe3abb2d4b751b1e5c8c0a59abc (diff)
Merge pull request #180 from azul/feature/messages-api
Feature/messages api
Diffstat (limited to 'test/functional/v1/messages_controller_test.rb')
-rw-r--r--test/functional/v1/messages_controller_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/v1/messages_controller_test.rb b/test/functional/v1/messages_controller_test.rb
index a50fded..6f7ea5d 100644
--- a/test/functional/v1/messages_controller_test.rb
+++ b/test/functional/v1/messages_controller_test.rb
@@ -30,7 +30,7 @@ class V1::MessagesControllerTest < ActionController::TestCase
@message.reload
assert !@message.user_ids_to_show.include?(@user.id)
assert @message.user_ids_have_shown.include?(@user.id)
- assert_json_response true
+ assert_success :marked_as_read
end
test "do not get seen messages" do
@@ -46,7 +46,7 @@ class V1::MessagesControllerTest < ActionController::TestCase
test "mark read responds even with bad inputs" do
login @user
put :update, :id => 'more nonsense'
- assert_json_response false
+ assert_not_found
end
test "fails if not authenticated" do