@@ -54,7 +54,7 @@ end # USER ROOMS Factory.define :user_in_a_room, :parent => :logged_in_user do |f| f.after_create do |u| - u.rooms << Factory(:room) + u.enter_room!(Factory(:room)) end end test/factories.rb @@ -19,12 +19,6 @@ class UserTest < ActiveSupport::TestCase assert @user.logged_in? end - should "create a login message when checking in" do - assert @user.messages.empty? - @user.check_in! - assert_equal 'login', @user.messages.last.kind - end - should "be saved when checking in" do @user.expects(:save!) @user.check_in! @@ -34,12 +28,6 @@ class UserTest < ActiveSupport::TestCase @user.login! assert @user.logged_in? end - - should "create a login message when logging in" do - assert @user.messages.empty? - @user.login! - assert_equal 'login', @user.messages.last.kind - end end context "A logged-in user" do @@ -64,22 +52,10 @@ class UserTest < ActiveSupport::TestCase assert !@user.logged_in? end - should "create a stale_logout message when doing a stale logout" do - assert @user.messages.empty? - @user.stale_logout! - assert_equal 'stale_logout', @user.messages.last.kind - end - should "be set to logged-out when doing a logout" do @user.logout! assert !@user.logged_in? end - - should "create a logout message when doing a stale logout" do - assert @user.messages.empty? - @user.stale_logout! - assert_equal 'stale_logout', @user.messages.last.kind - end end context "Two stale users and an active user" do @@ -103,6 +79,7 @@ class UserTest < ActiveSupport::TestCase context "A user in a room" do setup do @user = Factory(:user_in_a_room) + @room = @user.rooms.last end should "leave the rooms when logging out" do @@ -114,6 +91,25 @@ class UserTest < ActiveSupport::TestCase @user.stale_logout! assert_equal [], @user.rooms end + + should "create an enter message when entering the room" do + assert_equal "enter", @room.messages.last.kind + end + + should "create a leave message when leaving the room" do + @user.leave_room!(@room) + assert_equal "leave", @room.messages.last.kind + end + + should "create a logout message when logging out" do + @user.logout! + assert_equal "logout", @room.messages.last.kind + end + + should "create a stale_logout message when having a 'stale' log out" do + @user.stale_logout! + assert_equal "stale_logout", @room.messages.last.kind + end end end test/unit/user_test.rb b6cce9fca775429faeb9f2486b157dd8e8a9910f Brandon Arbini brandon@sevenwire.com http://github.com/sevenwire/flak/commit/013d7d3ac09b4b62c4cc3fcf9fd275b6ac0bc79c 013d7d3ac09b4b62c4cc3fcf9fd275b6ac0bc79c 2009-11-09T16:33:35-08:00 2009-11-09T16:33:35-08:00 Fixing and writing more tests. 3312c9913506dc0e229091a780ff02187e8d13bd Brandon Arbini brandon@sevenwire.com