commontator 4.5.4 → 4.6.0

data/spec/app/controllers/commontator/subscriptions_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'spec_helper'
 
 module Commontator
   describe SubscriptionsController do
@@ -97,3 +97,4 @@ module Commontator
     end
   end
 end
+

data/spec/app/controllers/commontator/threads_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'spec_helper'
 
 module Commontator
   describe ThreadsController do
@@ -125,3 +125,4 @@ module Commontator
     end
   end
 end
+

data/spec/app/helpers/commontator/application_helper_spec.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'spec_helper'
 
 module Commontator
   describe ApplicationHelper do
@@ -7,3 +7,4 @@ module Commontator
     end
   end
 end
+

data/spec/app/mailers/commontator/subscriptions_mailer_spec.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'spec_helper'
 
 module Commontator
   describe SubscriptionsMailer do
@@ -28,3 +28,4 @@ module Commontator
     end
   end
 end
+

data/spec/app/models/commontator/comment_spec.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'spec_helper'
 require 'acts_as_votable'
 
 module Commontator
@@ -48,20 +48,27 @@ module Commontator
     it 'must make proper timestamps' do
       @comment.save!
 
-      editor_name = @user.commontator_config.user_name_proc.call(@user)
-      @comment.created_timestamp.must_equal I18n.t('commontator.comment.status.created_at', :created_at => I18n.l(@comment.created_at,
-                                          :format => :commontator))
-      @comment.updated_timestamp.must_equal ''
+      @comment.created_timestamp.must_equal I18n.t('commontator.comment.status.created_at',
+                                                   :created_at => I18n.l(@comment.created_at,
+                                                                         :format => :commontator))
+      @comment.updated_timestamp.must_equal I18n.t('commontator.comment.status.updated_at',
+                                                   :editor_name => @user.name,
+                                                   :updated_at => I18n.l(@comment.updated_at,
+                                                                         :format => :commontator))
 
+      user2 = DummyUser.create
       @comment.body = 'Something else'
-      @comment.editor = @user
+      @comment.editor = user2
       @comment.save!
 
-      @comment.created_timestamp.must_equal I18n.t('commontator.comment.status.created_at', :created_at => I18n.l(@comment.created_at,
-                                          :format => :commontator))
-      @comment.updated_timestamp.must_equal I18n.t('commontator.comment.status.updated_at', :editor_name => editor_name,
-                     :updated_at => I18n.l(@comment.updated_at,
-                                          :format => :commontator))
+      @comment.created_timestamp.must_equal I18n.t('commontator.comment.status.created_at',
+                                                   :created_at => I18n.l(@comment.created_at,
+                                                                         :format => :commontator))
+      @comment.updated_timestamp.must_equal I18n.t('commontator.comment.status.updated_at',
+                                                   :editor_name => user2.name,
+                                                   :updated_at => I18n.l(@comment.updated_at,
+                                                                         :format => :commontator))
     end
   end
 end
+

data/spec/app/models/commontator/comment_spec.rb~

@@ -0,0 +1,74 @@
+require 'spec_helper'
+require 'acts_as_votable'
+
+module Commontator
+  describe Comment do
+    before do
+      setup_model_spec
+      @comment = Comment.new
+      @comment.thread = @thread
+      @comment.creator = @user
+      @comment.body = 'Something'
+    end
+    
+    it 'must be votable if acts_as_votable is installed' do
+      Comment.must_respond_to(:acts_as_votable)
+      @comment.is_votable?.must_equal true
+      @comment.acts_as_votable_initialized.must_equal true
+    end
+    
+    it 'must know if it has been modified' do
+      @comment.save!
+      
+      @comment.is_modified?.must_equal false
+      
+      @comment.body = 'Something else'
+      @comment.editor = @user
+      @comment.save!
+      
+      @comment.is_modified?.must_equal true
+    end
+    
+    it 'must know if it has been deleted' do
+      user = DummyUser.new
+      
+      @comment.is_deleted?.must_equal false
+      @comment.editor.must_be_nil
+      
+      @comment.delete_by(user)
+      
+      @comment.is_deleted?.must_equal true
+      @comment.editor.must_equal user
+      
+      @comment.undelete_by(user)
+      
+      @comment.is_deleted?.must_equal false
+    end
+
+    it 'must make proper timestamps' do
+      @comment.save!
+
+      @comment.created_timestamp.must_equal I18n.t('commontator.comment.status.created_at',
+                                                   :created_at => I18n.l(@comment.created_at,
+                                                                         :format => :commontator))
+      @comment.updated_timestamp.must_equal I18n.t('commontator.comment.status.updated_at',
+                                                   :editor_name => @user.name,
+                                                   :updated_at => I18n.l(@comment.updated_at,
+                                                                         :format => :commontator))
+
+      user2 =   @user = DummyUser.create
+      @comment.body = 'Something else'
+      @comment.editor = user2
+      @comment.save!
+
+      @comment.created_timestamp.must_equal I18n.t('commontator.comment.status.created_at',
+                                                   :created_at => I18n.l(@comment.created_at,
+                                                                         :format => :commontator))
+      @comment.updated_timestamp.must_equal I18n.t('commontator.comment.status.updated_at',
+                                                   :editor_name => user2.name,
+                                                   :updated_at => I18n.l(@comment.updated_at,
+                                                                         :format => :commontator))
+    end
+  end
+end
+

data/spec/app/models/commontator/subscription_spec.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'spec_helper'
 
 module Commontator
   describe Subscription do
@@ -7,22 +7,32 @@ module Commontator
       @subscription = Subscription.new
       @subscription.thread = @thread
       @subscription.subscriber = @user
+      @subscription.save!
     end
     
     it 'must count unread comments' do
-      @subscription.unread.must_equal 0
+      @subscription.unread_comments.count.must_equal 0
       
-      @subscription.add_unread
+      comment = Comment.new
+      comment.thread = @thread
+      comment.creator = @user
+      comment.body = 'Something'
+      comment.save!
       
-      @subscription.unread.must_equal 1
+      @subscription.reload.unread_comments.count.must_equal 1
       
-      @subscription.add_unread
+      comment = Comment.new
+      comment.thread = @thread
+      comment.creator = @user
+      comment.body = 'Something else'
+      comment.save!
       
-      @subscription.unread.must_equal 2
+      @subscription.reload.unread_comments.count.must_equal 2
       
-      @subscription.mark_as_read
+      @subscription.touch
       
-      @subscription.unread.must_equal 0
+      @subscription.reload.unread_comments.count.must_equal 0
     end
   end
 end
+

data/spec/app/models/commontator/thread_spec.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'spec_helper'
 
 module Commontator
   describe Thread do
@@ -8,8 +8,8 @@ module Commontator
 
     it 'must have a config' do
       @thread.config.must_be_instance_of CommontableConfig
-      @thread.commontable = nil
-      @thread.config.must_equal Commontator
+      @thread.update_attribute(:commontable_id, nil)
+      Thread.find(@thread.id).config.must_equal Commontator
     end
     
     it 'must order all comments' do
@@ -65,42 +65,23 @@ module Commontator
       @thread.is_closed?.must_equal false
     end
     
-    it 'must know if an user is subscribed' do
+    it 'must mark comments as read' do
       @thread.subscribe(@user)
-      user2 = DummyUser.create
-      
-      @thread.subscribe(user2)
-      
-      @thread.is_subscribed?(@user).must_equal true
-      @thread.is_subscribed?(user2).must_equal true
-      @thread.is_subscribed?(DummyUser.create).must_equal false
-      
-      @thread.unsubscribe(@user)
-      
-      @thread.is_subscribed?(@user).must_equal false
-      @thread.is_subscribed?(user2).must_equal true
-      @thread.is_subscribed?(DummyUser.create).must_equal false
-    end
-    
-    it 'must add unread comments and mark comments as read' do
-      @thread.subscribe(@user)
-      user2 = DummyUser.create
-      @thread.subscribe(user2)
-      
-      @thread.subscription_for(@user).unread.must_equal 0
-      @thread.subscription_for(user2).unread.must_equal 0
-      
-      @thread.add_unread_except_for(@user)
-      @thread.add_unread_except_for(user2)
-      @thread.add_unread_except_for(@user)
+
+      subscription = @thread.subscription_for(@user)
+      subscription.unread_comments.count.must_equal 0
+
+      comment = Comment.new
+      comment.thread = @thread
+      comment.creator = @user
+      comment.body = 'Something'
+      comment.save!
       
-      @thread.subscription_for(@user).unread.must_equal 1
-      @thread.subscription_for(user2).unread.must_equal 2
+      subscription.reload.unread_comments.count.must_equal 1
       
-      @thread.mark_as_read_for(user2)
+      @thread.mark_as_read_for(@user)
       
-      @thread.subscription_for(@user).unread.must_equal 1
-      @thread.subscription_for(user2).unread.must_equal 0
+      subscription.reload.unread_comments.count.must_equal 0
     end
     
     it 'must be able to clear comments' do
@@ -109,19 +90,23 @@ module Commontator
       comment.creator = @user
       comment.body = 'Something'
       comment.save!
-      
+ 
+      @thread.close(@user)
+
       @thread.commontable.must_equal @commontable
       @thread.comments.must_include comment
-      @thread.is_closed?.must_equal false
+      @thread.is_closed?.must_equal true
+      @thread.closer.must_equal @user
+
+      @commontable = DummyModel.find(@commontable.id)
       @commontable.thread.must_equal @thread
-      
-      @thread.clear(@user)
+
+      @thread.clear
       
       @thread.commontable.must_be_nil
       @thread.comments.must_include comment
-      @thread.is_closed?.must_equal true
-      @thread.closer.must_equal @user
-      @commontable.reload
+
+      @commontable = DummyModel.find(@commontable.id)
       @commontable.thread.wont_be_nil
       @commontable.thread.wont_equal @thread
       @commontable.thread.comments.wont_include comment
@@ -133,3 +118,4 @@ module Commontator
     end
   end
 end
+

data/spec/dummy/README.md

@@ -1,3 +1,4 @@
 ## Dummy
 
 A dummy application used to test the Commontator engine.
+

data/spec/dummy/Rakefile

@@ -4,3 +4,4 @@
 require File.expand_path('../config/application', __FILE__)
 
 Dummy::Application.load_tasks
+

data/spec/dummy/app/assets/javascripts/application.js

@@ -13,3 +13,4 @@
 //= require jquery
 //= require jquery_ujs
 //= require_tree .
+

data/spec/dummy/app/assets/stylesheets/application.css

@@ -11,3 +11,4 @@
  *= require_self
  *= require_tree .
  */
+

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,4 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 end
+

data/spec/dummy/app/controllers/dummy_models_controller.rb

@@ -27,3 +27,4 @@ class DummyModelsController < ActionController::Base
     @dummy_model = DummyModel.find(params[:id])
   end
 end
+

data/spec/dummy/app/helpers/application_helper.rb

@@ -13,3 +13,4 @@ module ApplicationHelper
     @@user = nil
   end
 end
+

data/spec/dummy/app/models/dummy_model.rb

@@ -1,3 +1,4 @@
 class DummyModel < ActiveRecord::Base
   acts_as_commontable
 end
+

data/spec/dummy/app/models/dummy_user.rb

@@ -2,8 +2,13 @@ class DummyUser < ActiveRecord::Base
   acts_as_commontator
   
   attr_accessor :is_admin, :can_edit, :can_read
-  
+
   def email
-    'user@example.com'
+    "dummy_user#{id}@example.com"
+  end
+
+  def name
+    "Dummy User ##{id}"
   end
 end
+

data/spec/dummy/app/models/dummy_user.rb~

@@ -0,0 +1,16 @@
+class DummyUser < ActiveRecord::Base
+  acts_as_commontator
+  
+  attr_accessor :is_admin, :can_edit, :can_read
+
+  def email
+    "dummy_user#{id}@example.com"
+  end
+
+  def name
+    "Dummy User ##{id}"
+  end
+
+
+end
+

data/spec/dummy/app/views/dummy_model/show.html.erb

@@ -1 +1,2 @@
 <%= commontator_thread(@dummy_model) %>
+

data/spec/dummy/app/views/layouts/application.html.erb

@@ -12,3 +12,4 @@
 
 </body>
 </html>
+

data/spec/dummy/config.ru

@@ -2,3 +2,4 @@
 
 require ::File.expand_path('../config/environment',  __FILE__)
 run Rails.application
+

data/spec/dummy/config/boot.rb

@@ -3,3 +3,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
 $LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
+

data/spec/dummy/config/database.yml

@@ -23,3 +23,4 @@ production:
   database: db/production.sqlite3
   pool: 5
   timeout: 5000
+

data/spec/dummy/config/environment.rb

@@ -3,3 +3,4 @@ require File.expand_path('../application', __FILE__)
 
 # Initialize the Rails application.
 Dummy::Application.initialize!
+

data/spec/dummy/config/environments/development.rb

@@ -27,3 +27,4 @@ Dummy::Application.configure do
   # number of complex assets.
   config.assets.debug = true
 end
+

data/spec/dummy/config/environments/production.rb

@@ -78,3 +78,4 @@ Dummy::Application.configure do
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 end
+

data/spec/dummy/config/environments/test.rb

@@ -34,3 +34,4 @@ Dummy::Application.configure do
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 end
+