summaryrefslogtreecommitdiff
path: root/users/test
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2013-12-30 15:23:52 -0800
committerjessib <jessib@riseup.net>2013-12-30 15:23:52 -0800
commit396165d867f2009be1b1071d3c001009adf628ee (patch)
tree8afb8d7be89d93d1fccf9d872bff5b8105d32fdc /users/test
parentc3fadeb8da6eb4400a3ceb2fecee83173eceeaf2 (diff)
parent16b28882aa7659fb89e1661ed8af0c0db72642c8 (diff)
Merge branch 'feature/messages_api' into feature/messages_cron
Diffstat (limited to 'users/test')
-rw-r--r--users/test/functional/v1/messages_controller_test.rb33
1 files changed, 22 insertions, 11 deletions
diff --git a/users/test/functional/v1/messages_controller_test.rb b/users/test/functional/v1/messages_controller_test.rb
index 7bffa8f..d7ada82 100644
--- a/users/test/functional/v1/messages_controller_test.rb
+++ b/users/test/functional/v1/messages_controller_test.rb
@@ -1,20 +1,23 @@
require 'test_helper'
class V1::MessagesControllerTest < ActionController::TestCase
-
+
#TODO ensure authentication for all tests here
setup do
- @user = FactoryGirl.build(:user)
- @user.save
@message = Message.new(:text => 'a test message')
@message.save
- @user_message = UserMessage.new(:message_id => @message.id, :user_id => @user.id)
- @user_message.save
+ @user = FactoryGirl.build(:user)
+ @user.message_ids_to_see << @message.id
+ @user.save
+
+ # @user_message = UserMessage.new(:message_id => @message.id, :user_id => @user.id)
+ # @user_message.save
+
end
teardown do
- @user_message.destroy
+ # @user_message.destroy
@user.destroy
@message.destroy
end
@@ -26,16 +29,24 @@ class V1::MessagesControllerTest < ActionController::TestCase
end
test "mark message read for user" do
- assert !@user_message.seen
+ #assert !@user_message.seen
+ assert @user.message_ids_to_see.include?(@message.id)
+ assert !@user.message_ids_seen.include?(@message.id)
+
put :mark_read, :user_id => @user.id, :message_id => @message.id
- @user_message.reload
- assert @user_message.seen
+ #@user_message.reload
+ #assert @user_message.seen
+ @user.reload
+ assert !@user.message_ids_to_see.include?(@message.id)
+ assert @user.message_ids_seen.include?(@message.id)
assert_json_response true
end
test "do not get seen messages" do
- @user_message.seen = true
- @user_message.save
+ # @user_message.seen = true
+ # @user_message.save
+ put :mark_read, :user_id => @user.id, :message_id => @message.id
+ @user.reload
get :user_messages, :user_id => @user.id
assert !(response.body.include? @message.text)
assert !(response.body.include? @message.id)