Merge branch 'feature/follow-buttons' into develop

2 files changed, 37 insertions, 0 deletions

diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb
index bc7cfce64..1d38b3055 100644
--- a/spec/controllers/track_controller_spec.rb
+++ b/spec/controllers/track_controller_spec.rb
@@ -16,6 +16,8 @@ describe TrackController, "when making a new track on a request" do
         @user = mock_model(User)
         User.stub!(:find).and_return(@user)
         @user.stub!(:locale).and_return("en")
+        @user.stub!(:receive_email_alerts).and_return(true)
+        @user.stub!(:url_name).and_return("bob")
     end
 
     it "should require login when making new track" do
diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb
index 0d7b19e1e..7a6c9ac0d 100644
--- a/spec/controllers/user_controller_spec.rb
+++ b/spec/controllers/user_controller_spec.rb
@@ -630,6 +630,41 @@ describe UserController, "when showing JSON version for API" do
 
 end
 
+describe UserController, "when viewing the wall" do
+    integrate_views
+
+    before(:each) do
+        rebuild_xapian_index
+    end
 
+    it "should show users stuff on their wall, most recent first" do
+        user = users(:silly_name_user)
+        ire = info_request_events(:useless_incoming_message_event)
+        ire.created_at = DateTime.new(2001,1,1)
+        session[:user_id] = user.id
+        get :wall, :url_name => user.url_name
+        assigns[:feed_results][0].should_not == ire
 
+        ire.created_at = Time.now
+        ire.save!
+        get :wall, :url_name => user.url_name
+        assigns[:feed_results][0].should == ire
+    end
 
+    it "should show other users' activities on their walls" do
+        user = users(:silly_name_user)
+        ire = info_request_events(:useless_incoming_message_event)
+        get :wall, :url_name => user.url_name
+        assigns[:feed_results][0].should_not == ire
+    end
+
+    it "should allow users to turn their own email alerts on and off" do
+        user = users(:silly_name_user)
+        session[:user_id] = user.id
+        user.receive_email_alerts.should == true
+        get :set_receive_email_alerts, :receive_email_alerts => 'false', :came_from => "/"
+        user.reload
+        user.receive_email_alerts.should_not == true
+    end
+
+end