muck-activities 3.0.1 → 3.1.0

data/test/rails_test/public/stylesheets/muck-activities.css

@@ -1,39 +0,0 @@
-/* activity feed */
-#activity-status-control{border:solid 1px #ccc;padding:10px 7px;background-color:#eee;}
-#status-update-field{}
-ul#status-menu{list-style:none;}
-ul#status-menu li{float:left;display:inline;margin:0 5px;}
-#status-update-button input{padding:0;}
-.status-update-dim{}
-.status-update-lit{}
-ul#activity-filter{list-style:none;}
-ul#activity-filter li{border-bottom:solid 1px #ccc;}
-ul#activity-filter li a{text-decoration:none;}
-ul#activity-filter li a:hover;{text-decoration:underline;}
-ul#activity-filter li.current a{color:#5EAC18;}
-.activity{clear:both;display:block;}
-#activity-feed{margin:15px 0 0 0;}
-#activity-feed-content .activity{margin:8px 0 4px 0;}
-#activity-feed-content .activity-time{font-size:1em;font-color:#eee;clear:left;}
-#activity-icon, .actor-icon{width:50px;float:left;margin:0 10px 10px 0;overflow:hidden;}
-#activity-feed-content .actor, #current-status-name{font-weight:bolder;font-size:1.3em;}
-.activity-time, .status-time{color:#777777;font-size:.9em;}
-p#current-status-text, .activity-content p{margin:0;}
-form.activity-delete {position:relative;display:inline;float:right;display:none;}
-form.activity-delete input{padding:0;margin:0;width:15px;height:15px;position:absolute;right:0px;bottom:0px;}
-.activity .activity-hover form.activity-delete{display:block;}
-.welcome_activity{font-size:14px;}
-a.upload-button{background:transparent url('/images/icons/button_background.png') no-repeat scroll left top;text-decoration:none;padding:0px 23px 1px 6px;color:#fff;font-weight:bold;}
-a.upload-button:hover{background:transparent url('/images/icons/button_background.png') no-repeat scroll left bottom;}
-/* comments under activity feed */
-.activity-comment{border:1px solid #ccc;margin:2px 50px 2px 60px;padding:.5em;background-color:#eee;}
-.activity-comment .actor-icon{width:40px;}
-.activity-comment .actor-icon img{width:40px;height:40px;}
-.activity-comment textarea.max{width:80%;height:30px;}
-.activity-comment textarea.min{height:15px;width:50%;}
-.activity-comment p{margin:0;}
-.activity-comment .actor a{font-size:.8em;}
-.activity form.comment-delete {position:relative;display:inline;float:right;}
-.activity form.comment-delete input{padding:0;margin:0;width:15px;height:15px;position:absolute;right:0px;top:0px;}
-.activity form.comment-delete{display:none;}
-.activity .comment-hover form.comment-delete{display:block;}

data/test/rails_test/public/stylesheets/styles.css

@@ -1,98 +0,0 @@
-/* general */
-.center{text-align:center;}
-#popup_wrapper{width:auto;}
-.waiting{margin:3px 0;padding-left:20px;background:transparent url('/images/spinner.gif') no-repeat scroll left bottom;}
-
-/* forms */
-input{margin:0 10px 5px 0;padding:4px;font-size:1.3em;}
-input[type="text"],input[type="password"]{border:1px solid #8f8685;}
-input[type="checkbox"]{border:none;margin-bottom:0px;}
-input[type="radio"]{border:none;}
-textarea{font-size:1.4em;margin:0 10px 0 0;padding:4px;border:1px solid #8f8685;}
-label{font-size:1.5em;font-weight:bold;margin:0 10px 5px 0;padding:0px;display:block;}
-form em{color:#b61e12;font-style:normal;font-size:90%;}
-form hr{border:1px solid #e3e0c3;height:1px;margin:15px 0;}
-fieldset span.var{margin:2px 5px 5px 18px;display:block;}
-fieldset{border:none;margin:0;padding:0;}
-form fieldset{margin:0 0 2px;padding:0px;}
-form fieldset input[type="text"],form fieldset input[type="password"]{width:500px;}
-.common-form{width:500px;margin:40px auto;}
-.wide-form h1, .common-form h1{font-size:1.8em;}
-.wide-form{width:700px;margin:40px auto;}
-.form-item{float:left;}
-.common-content{width:500px;margin:40px auto;font-size:1.2em;color:#555;}
-.button-link {background-color:transparent;border-top-width: 0px;border-left-width: 0px;border-right-width: 0px;border-bottom-width: 0px;}
-
-.checklist{padding:0px;margin:0px 0 0 10px;}
-.checklist input[type="checkbox"]{float:left;clear:left;}
-.checklist label{display:inline;}
-
-/*images*/
-.tiny{width:24px;height:24px;}
-.icon{width:50px;height:50px;}
-.thumb{width:100px;height:100px;}
-.medium{width:300px;height:300px;}
-
-/*icons*/
-ul.icon-list{margin:0;padding:0;list-style:none;}
-ul.icon-list a{display:inline-block;margin:2px 0;padding:2px 0 5px 28px;text-decoration:none;}
-
-/* tips */
-.availability{color:#b61e12;position:absolute;}
-.hidden-tips{display:none;}
-.required-tip{color:#555555;font-size:1.2em;margin:0pt;font-weight:bolder;height:0px;}
-.tip{position:absolute;z-index:2000;border:2px solid #CCCCCC;background-color:#fff;width:400px;}
-#tip-title{font-size:1.1em;background-color:#CCCCCC;text-align:left;padding:2px 0px 5px 8px;font-weight:bold;}
-#tip-main{padding:10px;color:#333333;}
-#tip-main p,#tip-main ul{font-size:1.3em;}
-#tip-main p{margin:3px 0;}
-#tip-header{position:absolute;z-index:101;background-repeat:no-repeat;}
-.tip-content{width:100%;}
-.top-tip{margin:0px 0px 12px 0px;}
-.top-tip #tip-header{background-image:url(/images/arrow_down.gif);height:10px;width:23px;}
-.left-tip{margin-right:12px;}
-.left-tip #tip-header{background-image:url(/images/arrow_right.gif);height:23px;width:11px;top:-2px;left:12px;background-position:right top;width:100%;}
-.bottom-tip{margin:12px 0px 0px 0px;}
-.bottom-tip #tip-header{background-image:url(/images/arrow_up.gif);left:0px;height:10px;width:23px;top:-12px;}
-.right-tip{margin:1px 0px 0px 12px;}
-.right-tip #tip-header{background-image:url(/images/arrow_left.gif);left:-12px;height:23px;width:10px;top:-3px;}
-.bottom-tip #tip-header, .right-tip #tip-header{background-position:left top;}
-
-/*jGrowl*/
-div.jGrowl{padding:10px;z-index:9999;color:#fff;font-size:12px;}
-/** Special IE6 Style Positioning **/
-div.ie6{position:absolute;}
-div.ie6.top-right{right:auto;bottom:auto;left:expression( ( 0 - jGrowl.offsetWidth + ( document.documentElement.clientWidth ? document.documentElement.clientWidth :document.body.clientWidth ) + ( ignoreMe2 = document.documentElement.scrollLeft ? document.documentElement.scrollLeft :document.body.scrollLeft ) ) + 'px' );top:expression( ( 0 + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop :document.body.scrollTop ) ) + 'px' );}
-div.ie6.top-left{left:expression( ( 0 + ( ignoreMe2 = document.documentElement.scrollLeft ? document.documentElement.scrollLeft :document.body.scrollLeft ) ) + 'px' );top:expression( ( 0 + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop :document.body.scrollTop ) ) + 'px' );}
-div.ie6.bottom-right{left:expression( ( 0 - jGrowl.offsetWidth + ( document.documentElement.clientWidth ? document.documentElement.clientWidth :document.body.clientWidth ) + ( ignoreMe2 = document.documentElement.scrollLeft ? document.documentElement.scrollLeft :document.body.scrollLeft ) ) + 'px' );top:expression( ( 0 - jGrowl.offsetHeight + ( document.documentElement.clientHeight ? document.documentElement.clientHeight :document.body.clientHeight ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop :document.body.scrollTop ) ) + 'px' );}
-div.ie6.bottom-left{left:expression( ( 0 + ( ignoreMe2 = document.documentElement.scrollLeft ? document.documentElement.scrollLeft :document.body.scrollLeft ) ) + 'px' );top:expression( ( 0 - jGrowl.offsetHeight + ( document.documentElement.clientHeight ? document.documentElement.clientHeight :document.body.clientHeight ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop :document.body.scrollTop ) ) + 'px' );}
-div.ie6.center{left:expression( ( 0 + ( ignoreMe2 = document.documentElement.scrollLeft ? document.documentElement.scrollLeft :document.body.scrollLeft ) ) + 'px' );top:expression( ( 0 + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop :document.body.scrollTop ) ) + 'px' );width:100%;}
-/** Normal Style Positions **/
-body > div.jGrowl{position:fixed;}
-body > div.jGrowl.top-left{left:0px;top:0px;}
-body > div.jGrowl.top-right{right:0px;top:0px;}
-body > div.jGrowl.bottom-left{left:0px;bottom:0px;}
-body > div.jGrowl.bottom-right{right:0px;bottom:0px;}
-body > div.jGrowl.center{top:0px;width:50%;left:25%;}
-/** Cross Browser Styling **/
-div.center div.jGrowl-notification,div.center div.jGrowl-closer{margin-left:auto;margin-right:auto;}
-div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{background-color:#000;opacity:.85;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=85)";filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=85);zoom:1;width:235px;padding:10px;margin-top:5px;margin-bottom:5px;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:1em;text-align:left;display:none;-moz-border-radius:5px;-webkit-border-radius:5px;}
-div.jGrowl div.jGrowl-notification{min-height:40px;}
-div.jGrowl div.jGrowl-notification div.header{font-weight:bold;font-size:.85em;}
-div.jGrowl div.jGrowl-notification div.close{z-index:99;float:right;font-weight:bold;font-size:1em;cursor:pointer;}
-div.jGrowl div.jGrowl-closer{padding-top:4px;padding-bottom:4px;cursor:pointer;font-size:.9em;font-weight:bold;text-align:center;}
-/** Hide jGrowl when printing **/
-@media print{div.jGrowl{display:none;}
-}
-
-
-/* Errors */
-.help-box{font-size:1.2em;color:#555;}
-.fieldWithErrors input{border:solid 2px #B61E12;}
-#errorExplanation{padding:7px;padding-bottom:12px;margin-bottom:20px;}
-#errorExplanation h2{text-align:left;font-weight:bold;padding:5px 5px 5px 15px;font-size:16px;background-color:#B61E12;color:#fff;}
-#errorExplanation p{color:#333;margin-bottom:0;padding:5px;}
-#errorExplanation ul li{list-style:square;}
-
-/* support */
-.support-information{font-size:9px;color:#333;}

data/test/rails_test/public/stylesheets/themes/blue/styles.css

@@ -1 +0,0 @@
-/*Add styles specific to your theme here*/

data/test/rails_test/public/stylesheets/themes/red/styles.css

@@ -1 +0,0 @@
-/*Add styles specific to your theme here*/

data/test/rails_test/spec/controllers/activities_controller_spec.rb

@@ -1,155 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe Muck::ActivitiesController do
-
-  render_views
-  
-  describe "activities controller - anonymous" do
-    describe "on GET to index" do
-      before do
-        @user = Factory(:user)
-        @activity = Factory(:activity, :template => 'status_update')
-        @user.activities << @activity
-      end
-      describe "on GET to index (js)" do
-        before do
-          get :index, :parent_type => @user.class, :parent_id => @user, :format => 'js', :latest_activity_id => @activity.to_param
-        end
-        it { should respond_with :success }
-      end
-    end
-  end
-  
-  describe "activities controller - logged in" do
-    before do
-      activate_authlogic
-      @user = Factory(:user)
-      login_as @user
-    end
-
-    describe "on GET to index" do
-      before do
-        @activity = Factory(:activity, :template => 'status_update')
-        @user.activities << @activity
-      end
-    
-      describe "on GET to index (js)" do
-        before do
-          get :index, :parent_type => @user.class, :parent_id => @user, :format => 'js', :latest_activity_id => @activity.to_param
-        end
-        it { should respond_with :success }
-      end
-
-      describe "on GET to index (js) no latest activity id" do
-        before do
-          get :index, :parent_type => @user.class, :parent_id => @user, :format => 'js', :latest_activity_id => nil
-        end
-        it { should respond_with :success }
-      end
-    end
-
-    describe "fail on POST to create (json)" do
-      before do
-        post :create, :activity => { :content => 'test activity' }, :parent_type => @user.class.to_s, :parent_id => @user, :format => 'json'
-      end      
-      it { should respond_with :success }
-      it { should_not set_the_flash }
-      it "should return create json errors" do
-        json = ActiveSupport::JSON.decode(@response.body).symbolize_keys!
-        json[:success].should be_false
-        json[:message].should == I18n.t("muck.activities.create_error", :error => assigns(:activity).errors.full_messages.to_sentence)
-      end
-    end
-        
-    describe "on POST to create (json)" do
-      before do
-        @activity_content = 'test content for my new activity'
-        post :create, :activity => { :content => @activity_content, :template => 'status_update' }, :parent_type => @user.class, :parent_id => @user, :format => 'json'
-      end      
-      it { should respond_with :success }
-      it { should_not set_the_flash }
-      it "should return valid create json" do
-        json = ActiveSupport::JSON.decode(@response.body).symbolize_keys!
-        json[:success].should be_true
-        json[:is_status_update].should be_false
-        json[:html].should include(@activity_content)
-        I18n.t("muck.activities.created").should == json[:message]
-      end
-    end
-       
-    describe "on POST to create (js)" do
-      before do
-        post :create, :activity => { :content => 'test activity' }, :parent_type => @user.class, :parent_id => @user, :format => 'js'
-      end      
-      it { should respond_with :success }
-      it { should_not set_the_flash }
-    end
-     
-    describe "on POST to create" do
-      before do
-        post :create, :activity => { :content => 'test activity' }, :parent_type => @user.class, :parent_id => @user
-      end      
-      it { should redirect_to( @user ) }
-    end
-
-    describe "on DELETE to destroy" do
-      before do
-        @activity = Factory(:activity, :source => @user)
-        delete :destroy, :id => @activity.id
-      end
-      it { should respond_with :redirect }
-      it { should set_the_flash.to(I18n.t("muck.activities.item_removed")) }
-    end
-  
-    describe "on DELETE to destroy (js)" do
-      before do
-        @activity = Factory(:activity, :source => @user, :is_status_update => false)
-        delete :destroy, :id => @activity.id, :format => 'js'
-      end
-      it { should respond_with :success }
-      it { should_not set_the_flash }
-    end
-    
-    describe "on DELETE to destroy, status update (js)" do
-      before do
-        @activity = Factory(:activity, :source => @user, :is_status_update => true)
-        delete :destroy, :id => @activity.id, :format => 'js'
-      end
-      it { should respond_with :success }
-      it { should_not set_the_flash }
-    end
-    
-    describe "on DELETE to destroy (json)" do
-      before do
-        @activity = Factory(:activity, :source => @user, :is_status_update => false)
-        delete :destroy, :id => @activity.id, :format => 'json'
-      end
-      it { should respond_with :success }
-      it { should_not set_the_flash }
-      it "should return valid delete json" do
-        json = ActiveSupport::JSON.decode(@response.body).symbolize_keys!
-        json[:success].should be_true
-        json[:is_status_update].should be_false
-        json[:html].should be_blank
-        I18n.t("muck.activities.item_removed").should == json[:message]
-      end
-    end
-    
-    describe "on DELETE to destroy, status update (json)" do
-      before do
-        @activity = Factory(:activity, :source => @user, :is_status_update => true)
-        delete :destroy, :id => @activity.id, :format => 'json'
-      end
-      it { should respond_with :success }
-      it { should_not set_the_flash }
-      it "should return valid delete json" do
-        json = ActiveSupport::JSON.decode(@response.body).symbolize_keys!
-        json[:success].should be_true
-        json[:is_status_update].should be_true
-        json[:html].length.should > 0
-        I18n.t("muck.activities.item_removed").should == json[:message]
-      end
-    end
-  end
-  
-end

data/test/rails_test/spec/controllers/default_controller_spec.rb

@@ -1,27 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe DefaultController do
-  
-  render_views
-  
-  describe "default controller" do
-    before do
-      activate_authlogic
-      @user = Factory(:user)      
-      login_as @user
-    end
-
-    describe "on GET to index" do
-      # The default view calls the helpers.  This isn't a great test but
-      # it will make sure they don't blow up
-      before do
-        @user.activities << Factory(:activity,  :template => 'status_update')
-        @user.activities << Factory(:activity,  :template => 'status_update')
-        get :index
-      end
-      it { should respond_with :success }
-    end
-
-  end
-
-end

data/test/rails_test/spec/helpers/muck_activities_helper_spec.rb

@@ -1,81 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe MuckActivityHelper do
-  
-  before(:each) do
-    @user = Factory(:user)
-    helper.stub!(:current_user).and_return(@user)
-    @activity_with_comments = Factory(:activity)
-    @comment1 = Factory(:comment, :commentable => @activity_with_comments)
-    @comment2 = Factory(:comment, :commentable => @activity_with_comments)
-    @activity_with_comments.reload
-    @status_activity = Factory(:activity, :template => 'status_update')
-    @status_update_activity = Factory(:activity, :template => 'status_update')
-    @user_status_update_activity = Factory(:activity, :template => 'status_update', :source => @user)
-    @other_activity = Factory(:activity, :template => 'status_update')
-    @private_activity = Factory(:activity, :is_public => false, :template => 'status_update')
-    @public_activity = Factory(:activity, :is_public => true, :template => 'status_update')
-    @item_activity = Factory(:activity, :item => @user, :template => 'status_update')
-    @source_activity = Factory(:activity, :source => @user, :template => 'status_update')
-    @other_user_activity = Factory(:activity, :template => 'status_update')
-    @user.activities << @status_activity
-    @user.activities << @status_update_activity
-    @user.activities << @other_activity
-    @user.activities << @private_activity
-    @user.activities << @public_activity
-    @user.activities << @user_status_update_activity
-    @user.reload
-  end
-  describe "activity_comments" do
-    it "should render comments for the give activity" do
-      helper.activity_comments(@activity_with_comments).should include(@comment1.body)
-    end
-  end
-  describe "activity_comment_link" do
-    before do
-      @saved_enable_activity_comments = MuckActivities.configuration.enable_activity_comments
-      MuckActivities.configuration.enable_activity_comments = true
-    end
-    after do
-      MuckActivities.configuration.enable_activity_comments = @saved_enable_activity_comments
-    end
-    it "should render comment link" do
-      helper.activity_comment_link(@activity_with_comments, @comment1).should include(@activity_with_comments.dom_id)
-    end
-  end
-  describe "activity_scripts" do
-    it "should render activity scripts" do
-      helper.activity_scripts.should include()
-    end
-  end
-  describe "cached_activities" do
-    it "should render cached activities" do
-      helper.cached_activities([@status_update_activity]).should_not be_empty
-    end
-  end
-  describe "has_comments_css" do
-    it 'renders css with activites' do
-      helper.has_comments_css(@activity_with_comments).should == 'activity-has-comments'
-    end
-    it 'renders css with out activites' do
-      helper.has_comments_css(@other_activity).should == 'activity-no-comments'
-    end
-  end
-  describe "limited_activity_feed_for" do
-    it "Renders an activity with only activities created by activities_object" do
-      helper.limited_activity_feed_for(@user).should include(@user_status_update_activity.dom_id)
-      helper.limited_activity_feed_for(@user).should_not include(@other_activity.dom_id)
-    end
-  end
-  describe "activity_feed_for" do
-    it "Renders a full activity feed for activities_object" do
-      helper.activity_feed_for(@user).should include(@user_status_update_activity.dom_id)
-      helper.activity_feed_for(@user).should_not include(@other_user_activity.dom_id)
-    end
-  end
-  describe "status_update" do
-    it "should render status update partial" do
-      helper.status_update(@status_update_activity).should include('status-update')
-    end
-  end
-end

data/test/rails_test/spec/models/activity_feed_spec.rb

@@ -1,12 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe ActivityFeed do
-  describe "ActivityFeed" do
-    before do
-      @activity_feed = Factory(:activity_feed)
-    end
-    
-    it { should belong_to :activity }
-    it { should belong_to :ownable }
-  end
-end

data/test/rails_test/spec/models/activity_spec.rb

@@ -1,139 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe Activity do
-
-  before do
-    @activity = Factory(:activity)
-  end
-  
-  it { should validate_presence_of :source }
-  
-  it { should belong_to :item }
-  it { should belong_to :source }
-  it { should have_many :activity_feeds }
-  it { should have_many :comments }
-  
-  it { should scope_newer_than }
-  it { should scope_older_than }
-  it { should scope_by_newest }
-  it { should scope_by_oldest }
-  it { should scope_by_latest }
-  it { should scope_is_public }
-
-  describe "named scopes" do
-    before do
-      @user = Factory(:user)
-      @status_activity = Factory(:activity, :template => 'status')
-      @other_activity = Factory(:activity, :template => 'other')
-      @private_activity = Factory(:activity, :is_public => false)
-      @public_activity = Factory(:activity, :is_public => true)
-      @item_activity = Factory(:activity, :item => @user)
-      @source_activity = Factory(:activity, :source => @user)
-    end
-    describe "after" do
-      #scope :after, lambda { |id| {:conditions => ["activities.id > ?", id] } }
-      it "should only find activites after the given id" do
-        
-      end
-    end
-    describe "status_updates" do
-      before do
-        @status_update = Factory(:activity, :item => @user, :is_status_update => true)
-        @non_status_update = Factory(:activity, :item => @user, :is_status_update => false)
-      end
-      it "should find only status updates" do
-        Activity.status_updates.should include(@status_update)
-        Activity.status_updates.should_not include(@non_status_update)
-      end
-    end
-    describe "filter_by_template" do
-      it "should only find status template" do
-        activities = Activity.filter_by_template('status')
-        activities.should include(@status_activity)
-        activities.should_not include(@other_activity)
-      end
-    end
-    describe "by_item" do
-      it "should find activities by the item they are associated with" do
-        activities = Activity.by_item(@user)
-        activities.should include(@item_activity)
-        activities.should_not include(@public_activity)
-      end
-    end
-    describe "created_by" do
-      it "should find activities by the source they are associated with" do
-        activities = Activity.created_by(@user)
-        activities.should include(@source_activity)
-        activities.should_not include(@public_activity)
-      end
-    end
-  end
-
-  it "should require template or item" do
-    activity = Factory.build(:activity, :template => nil, :item => nil)
-    activity.should_not be_valid
-  end
-
-  it "should get the partial from the template" do
-    template = 'status_update'
-    activity = Factory(:activity, :template => template, :item => nil)
-    activity.partial.should == template
-  end
-
-  it "should get the partial from the item" do
-    user = Factory(:user)
-    activity = Factory(:activity, :item => user, :template => nil)
-    activity.partial.should == user.class.name.underscore
-  end
-
-  it "should be able to edit the activity" do
-    user = Factory(:user)
-    activity = Factory(:activity, :source => user)
-    activity.can_edit?(user).should be_true
-  end
-  
-  it "should not be able to edit the activity" do
-    user = Factory(:user)
-    activity = Factory(:activity)
-    activity.can_edit?(user).should be_false
-  end
-  
-  it "should filter the activities by template" do
-    @template_name = 'test_template'
-    user = Factory(:user)
-    activity = Factory(:activity, :source => user, :template => @template_name)
-    user.activities << activity
-    user.activities.filter_by_template(@template_name).should include(activity)
-  end
-  
-  it "should only find activities created by the source" do
-    user = Factory(:user)
-    activity = Factory(:activity, :source => user, :template => @template_name)
-    user.activities << activity
-    
-    user2 = Factory(:user)
-    activity2 = Factory(:activity, :source => user2, :template => @template_name)
-    user2.activities << activity2
-    
-    user.activities.created_by(user).should include(activity)
-    user.activities.created_by(user).should_not include(activity2)
-  end
-  
-  describe "comments" do
-    before do
-      @user = Factory(:user)
-      @activity = Factory(:activity)
-      @comment = @activity.comments.build(:body => 'a test comment')
-      @comment.user = @user
-      @comment.save!
-    end
-    it "should have comments" do
-      @activity.comments.length.should == 1
-    end
-    it "should have comment cache" do
-      @activity.reload
-      @activity.comment_count.should == 1
-    end
-  end
-  
-end