only see messages sent to me

steveklabnik · steveklabnik · commit d42350f4fd0d · 2010-11-25T17:24:14.000-05:00
diff --git a/features/messages.feature b/features/messages.feature
@@ -1,17 +1,4 @@
 Feature: Messages
-  Scenario: I can't send a message when not logged in
-    Given I'm not logged in
-    And there's a hacker with the username "fela"
-    When I go to the hacker page for "fela"
-    Then I should not see "Send fela a message"
-  Scenario: I can see messages sent to me
-    Given I'm logged in as "steve"
-    And I send a message to "fela" that says "Hello, fela!"
-    And I log out
-    When I log in as "fela"
-    And I go to my messages page
-    Then I should see "Hello, fela!"
-    And I should see "From: steve"
   Scenario: I should have an inbox link
     Given I'm logged in
     Then I should see "Inbox"
diff --git a/spec/acceptance/messages_spec.rb b/spec/acceptance/messages_spec.rb
@@ -2,11 +2,9 @@
 
 feature "Messages" do
 
-  background do
+  scenario "can be sent" do
     Pony.should_receive(:deliver)
-  end
 
-  scenario "can be sent" do
     @hacker = Factory(:hacker)
     log_in @hacker
 
@@ -22,4 +20,35 @@
     should_be_on "/hackers/fela"
     page.should have_content "Message sent."
   end
+
+  
+  scenario "can only be sent when logged in" do
+    @hacker = Factory(:hacker)
+    visit "/logout"
+
+    @fela = Factory(:hacker, :username => "fela")
+
+    visit "/hackers/fela"
+    page.should_not have_content "Send fela a message"
+  end
+
+  scenario "can only see messages sent to me" do
+    Pony.should_receive(:deliver)
+    @steve = Factory(:hacker, :username => "steve")
+    @fela = Factory(:hacker, :username => "fela")
+
+    Factory(:message, 
+            :sender => @steve.username, 
+            :recipient => @fela.username, 
+            :body => "Hello, fela!")
+
+    visit "/logout"
+
+    log_in @fela
+
+    visit "/messages"
+
+    page.should have_content "Hello, fela!"
+    page.should have_content "From: steve"
+  end
 end
diff --git a/spec/factories.rb b/spec/factories.rb
@@ -15,3 +15,6 @@
   u.password_confirmation {|user| user.password }
   u.admin false
 end
+
+Factory.define :message do |m|
+end
