commontator 4.11.1 → 5.0.0

data/config/locales/ru.yml

@@ -1,30 +1,30 @@
-ru: 
-  activerecord: 
-    attributes: 
-      commontator/comment: 
+ru:
+  activerecord:
+    attributes:
+      commontator/comment:
         body: Комментарий
         creator: Создал
         editor: Редактировал
         thread: Обсуждение
-      commontator/subscription: 
+      commontator/subscription:
         subscriber: Подписчик
         thread: Обсуждение
-      commontator/thread: 
+      commontator/thread:
         commontable: Комментируем
-    models: 
-      commontator/comment: 
+    models:
+      commontator/comment:
         one: комментарий
         other: комментарии
-      commontator/subscription: 
+      commontator/subscription:
         one: подписка
         other: подписки
-      commontator/thread: 
+      commontator/thread:
         one: обсуждение
         other: обсуждения
-  commontator: 
+  commontator:
     anonymous: Аноним
-    comment: 
-      actions: 
+    comment:
+      actions:
         cancel: Отменить
         confirm_delete: "Вы уверены, что хотите удалить комментарий?"
         create: "Оставить Комментарий"
@@ -33,33 +33,32 @@ ru:
         new: "Новый Комментарий"
         undelete: Восстановить
         update: "Изменить Комментарий"
-      errors: 
+      errors:
         already_deleted: "Этот комментарий был удален."
         create: "Комментарий нельзя оставить потому что"
         double_posted: "этот комментарий уже есть."
         not_deleted: "Этот комментарий не удален."
         update: "Этот комментарий нельзя изменить потому что"
-      status: 
+      status:
         created_at: "Создан %{created_at}."
         deleted_by: "Комментарий был удален %{deleter_name}."
         updated_at: "Редактировал %{editor_name}, %{updated_at}."
-    email: 
-      comment_created: 
+    email:
+      comment_created:
         body: "%{creator_name} комментировал %{commontable_name}:"
         subject: "%{creator_name} оставил комментарий к %{commontable_name}"
       thread_link_html: "<a href=\"%{comment_url}\">Нажмите здесь</a> чтобы посмотреть все комментарии к %{commontable_name}."
-      undisclosed_recipients: "Не указан получатель"
     require_login: "Вы должны залогиниться прежде чем оставить комментарий."
-    subscription: 
-      actions: 
+    subscription:
+      actions:
         confirm_unsubscribe: "Вы уверены, что хотите отписать от обсуждения?"
         subscribe: Подписаться
         unsubscribe: Отписаться
-      errors: 
+      errors:
         already_subscribed: "Вы уже подписаны на это обсуждение."
         not_subscribed: "Вы не подписаны на это обсуждение."
-    thread: 
-      actions: 
+    thread:
+      actions:
         show_all: "Показать все комментарии"
         filter: "Фильтровать комментарии"
         close: "Закрыть обсуждение"
@@ -70,10 +69,10 @@ ru:
       errors:
         already_closed: "Это обсуждение было закрыто."
         not_closed: "Это обсуждение не закрыто."
-      status: 
+      status:
         cannot_post: "Новый комментарии нельзя разместить в данный момент."
         closed: "Комментарии (Закрыты %{closer_name})"
         open: Комментарии
-  time: 
-    formats: 
+  time:
+    formats:
       commontator: "%b %d %Y в %I:%M%p %Z"

data/config/locales/zh.yml

@@ -1,30 +1,30 @@
-zh: 
-  activerecord: 
-    attributes: 
-      commontator/comment: 
+zh:
+  activerecord:
+    attributes:
+      commontator/comment:
         body: "留言"
         creator: "留言者"
         editor: "編輯"
         thread: "討論"
-      commontator/subscription: 
+      commontator/subscription:
         subscriber: "訂閱者"
         thread: "討論"
-      commontator/thread: 
+      commontator/thread:
         commontable: "可以留言"
-    models: 
-      commontator/comment: 
+    models:
+      commontator/comment:
         one: "留言"
         other: "留言"
-      commontator/subscription: 
+      commontator/subscription:
         one: "訂閱"
         other: "訂閱"
-      commontator/thread: 
+      commontator/thread:
         one: "討論"
         other: "討論"
-  commontator: 
+  commontator:
     anonymous: "匿名"
-    comment: 
-      actions: 
+    comment:
+      actions:
         cancel: "取消"
         confirm_delete: "確定要刪除這筆留言嗎？"
         create: "發佈"
@@ -33,33 +33,32 @@ zh:
         new: "新留言"
         undelete: "未刪除"
         update: "修改留言"
-      errors: 
+      errors:
         already_deleted: "此留言已經被刪除了"
         create: "此留言無法發佈因為:"
         double_posted: "已經有一筆相同的留言。"
         not_deleted: "此留言未被刪除"
         update: "此留言無法被修改因為:"
-      status: 
+      status:
         created_at: "於%{created_at}發佈"
         deleted_by: "被%{deleter_name}刪除"
         updated_at: "最在於%{updated_at}被%{editor_name}修改"
-    email: 
-      comment_created: 
+    email:
+      comment_created:
         body: "%{creator_name}留言於%{commontable_name}"
         subject: "%{creator_name}於%{commontable_name}發佈了一則留言"
       thread_link_html: "<a href=\"%{comment_url}\">點此處</a>看%{commontable_name}的所有留言"
-      undisclosed_recipients: "收件者"
     require_login: "你需要先登入"
-    subscription: 
-      actions: 
+    subscription:
+      actions:
         confirm_unsubscribe: "你確定要去取消訂閱此則討論嗎？"
         subscribe: "訂閱"
         unsubscribe: "取消訂閱"
-      errors: 
+      errors:
         already_subscribed: "你已經訂閱過了"
         not_subscribed: "你沒有訂閱過"
-    thread: 
-      actions: 
+    thread:
+      actions:
         show_all: "列出所有留言"
         filter: "過濾留言"
         close: "關閉討論"
@@ -67,13 +66,13 @@ zh:
         reopen: "回復討論"
         show: "打開留言"
         hide: "关闭留言"
-      errors: 
+      errors:
         already_closed: "此討論已經被關閉"
         not_closed: "此討論尚未被關閉"
-      status: 
+      status:
         cannot_post: "現在還不能發佈"
         closed: "留言已經被%{closer_name}關閉"
         open: 留言
-  time: 
-    formats: 
+  time:
+    formats:
       commontator: "%b %d %Y 於 %I:%M%p %Z"

data/config/routes.rb

@@ -1,6 +1,6 @@
 Commontator::Engine.routes.draw do
-  resources :threads, :only => [:show] do
-    resources :comments, :except => [:index, :destroy], :shallow => true do
+  resources :threads, only: [:show] do
+    resources :comments, except: [:index, :destroy], shallow: true do
       member do
         put 'delete'
         put 'undelete'
@@ -17,8 +17,8 @@ Commontator::Engine.routes.draw do
       put 'close'
       put 'reopen'
       
-      put 'subscribe', :to => 'subscriptions#subscribe'
-      put 'unsubscribe', :to => 'subscriptions#unsubscribe'
+      put 'subscribe', to: 'subscriptions#subscribe'
+      put 'unsubscribe', to: 'subscriptions#unsubscribe'
     end
   end
 end

data/db/migrate/0_install_commontator.rb

@@ -1,38 +1,38 @@
-class InstallCommontator < ActiveRecord::Migration
+class InstallCommontator < ActiveRecord::Migration[5.0]
   def change
     create_table :commontator_comments do |t|
       t.string   :creator_type
       t.integer  :creator_id
       t.string   :editor_type
       t.integer  :editor_id
-      t.integer  :thread_id, :null => false
-      t.text     :body, :null => false
+      t.integer  :thread_id, null: false
+      t.text     :body, null: false
       t.datetime :deleted_at
 
-      t.integer :cached_votes_up, :default => 0
-      t.integer :cached_votes_down, :default => 0
+      t.integer :cached_votes_up, default: 0
+      t.integer :cached_votes_down, default: 0
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :commontator_comments, [:creator_id, :creator_type, :thread_id],
-              :name => 'index_commontator_comments_on_c_id_and_c_type_and_t_id'
+              name: 'index_commontator_comments_on_c_id_and_c_type_and_t_id'
     add_index :commontator_comments, [:thread_id, :created_at]
 
     add_index  :commontator_comments, :cached_votes_up
     add_index  :commontator_comments, :cached_votes_down
-    
+
     create_table :commontator_subscriptions do |t|
-      t.string   :subscriber_type, :null => false
-      t.integer  :subscriber_id, :null => false
-      t.integer  :thread_id, :null => false
+      t.string   :subscriber_type, null: false
+      t.integer  :subscriber_id, null: false
+      t.integer  :thread_id, null: false
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :commontator_subscriptions, [:subscriber_id, :subscriber_type, :thread_id],
-              :unique => true,
-              :name => 'index_commontator_subscriptions_on_s_id_and_s_type_and_t_id'
+              unique: true,
+              name: 'index_commontator_subscriptions_on_s_id_and_s_type_and_t_id'
     add_index :commontator_subscriptions, :thread_id
 
     create_table :commontator_threads do |t|
@@ -42,11 +42,11 @@ class InstallCommontator < ActiveRecord::Migration
       t.string   :closer_type
       t.integer  :closer_id
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :commontator_threads, [:commontable_id, :commontable_type],
-              :unique => true,
-              :name => 'index_commontator_threads_on_c_id_and_c_type'
+              unique: true,
+              name: 'index_commontator_threads_on_c_id_and_c_type'
   end
 end

data/lib/commontator.rb

@@ -128,8 +128,8 @@ module Commontator
     commontator_config(user).user_avatar_proc.call(user, view)
   end
 
-  def self.commontator_mentions(user, search_phrase)
-    commontator_config(user).user_mentions_proc.call(user, search_phrase)
+  def self.commontator_mentions(user, thread, search_phrase)
+    commontator_config(user).user_mentions_proc.call(user, thread, search_phrase)
   end
 
   def self.commontable_name(commontable)

data/lib/commontator/acts_as_commontable.rb

@@ -7,7 +7,7 @@ module Commontator
       base.is_commontable = false
       base.extend(ClassMethods)
     end
-    
+
     module ClassMethods
       def acts_as_commontable(options = {})
         class_eval do
@@ -15,24 +15,26 @@ module Commontator
           self.commontable_config = Commontator::CommontableConfig.new(options)
           self.is_commontable = true
 
-          has_one :thread, :as => :commontable,
-                           :class_name => 'Commontator::Thread'
+          has_one :thread, as: :commontable,
+                           class_name: 'Commontator::Thread'
 
           validates_presence_of :thread
 
-          def thread_with_commontator
-            @thread ||= thread_without_commontator
-            return @thread unless @thread.nil?
+          prepend ThreadWithCommontator
+        end
+      end
 
-            @thread = build_thread
-            @thread.save if persisted?
-            @thread
-          end
+      module ThreadWithCommontator
+        def thread
+          @thread ||= super
+          return @thread unless @thread.nil?
 
-          alias_method_chain :thread, :commontator
+          @thread = build_thread
+          @thread.save if persisted?
+          @thread
         end
       end
-      
+
       alias_method :acts_as_commentable, :acts_as_commontable
     end
   end

data/lib/commontator/acts_as_commontator.rb

@@ -15,11 +15,11 @@ module Commontator
           self.commontator_config = Commontator::CommontatorConfig.new(options)
           self.is_commontator = true
 
-          has_many :comments,      :as => :creator,
-                                   :class_name => 'Commontator::Comment'
-          has_many :subscriptions, :as => :subscriber,
-                                   :class_name => 'Commontator::Subscription',
-                                   :dependent => :destroy
+          has_many :comments,      as: :creator,
+                                   class_name: 'Commontator::Comment'
+          has_many :subscriptions, as: :subscriber,
+                                   class_name: 'Commontator::Subscription',
+                                   dependent: :destroy
         end
       end
       

data/lib/commontator/shared_helper.rb

@@ -4,9 +4,9 @@ module Commontator
       user = Commontator.current_user_proc.call(self)
       thread = commontable.thread
       
-      render(:partial => 'commontator/shared/thread',
-             :locals => { :thread => thread,
-                          :user => user }).html_safe
+      render(partial: 'commontator/shared/thread',
+             locals: { thread: thread,
+                          user: user }).html_safe
     end
 
     def commontator_gravatar_image_tag(user, border = 1, options = {})
@@ -17,9 +17,9 @@ module Commontator
       hash = Digest::MD5.hexdigest(email)
       url = "http#{base}.gravatar.com/avatar/#{hash}?#{options.to_query}"
       
-      image_tag(url, { :alt => name,
-                       :title => name,
-                       :border => border })
+      image_tag(url, { alt: name,
+                       title: name,
+                       border: border })
     end
   end
 end

data/lib/commontator/version.rb

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "4.11.1"
+  VERSION = "5.0.0"
 end

data/lib/tasks/commontator_tasks.rake

@@ -10,7 +10,7 @@ namespace :commontator do
         if File.exists?(File.expand_path(File.basename(file), 'config/initializers'))
           print "NOTE: Initializer #{File.basename(file)} from commontator has been skipped. Initializer with the same name already exists.\n"
         else
-          cp file, 'config/initializers', :verbose => false
+          cp file, 'config/initializers', verbose: false
           print "Copied initializer #{File.basename(file)} from commontator\n"
         end
       end
@@ -23,7 +23,7 @@ namespace :commontator do
       desc "Copy #{name} from commontator to application"
       task name.to_sym do
         namespace = path.start_with?('app') ? '/commontator' : ''
-        cp_r File.expand_path("../../../#{path}#{namespace}", __FILE__), path, :verbose => false
+        cp_r File.expand_path("../../../#{path}#{namespace}", __FILE__), path, verbose: false
         print "Copied #{name} from commontator\n"
       end
     end

data/spec/controllers/commontator/comments_controller_spec.rb

@@ -16,11 +16,11 @@ module Commontator
     end
 
     it "won't get new unless authorized" do
-      get :new, :thread_id => @thread.id
+      get :new, params: { thread_id: @thread.id }
       expect(response).to have_http_status(:forbidden)
 
       sign_in @user
-      get :new, :thread_id => @thread.id
+      get :new, params: { thread_id: @thread.id }
       expect(response).to have_http_status(:forbidden)
     end
 
@@ -28,19 +28,19 @@ module Commontator
       sign_in @user
 
       @user.can_read = true
-      get :new, :thread_id => @thread.id
+      get :new, params: { thread_id: @thread.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
 
       @user.can_read = false
       @user.can_edit = true
-      get :new, :thread_id => @thread.id
+      get :new, params: { thread_id: @thread.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
 
       @user.can_edit = false
       @user.is_admin = true
-      get :new, :thread_id => @thread.id
+      get :new, params: { thread_id: @thread.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
     end
@@ -49,18 +49,18 @@ module Commontator
       attributes = Hash.new
       attributes[:body] = 'Something else'
 
-      post :create, :thread_id => @thread.id, :comment => attributes
+      post :create, params: { thread_id: @thread.id, comment: attributes }
       expect(response).to have_http_status(:forbidden)
 
       sign_in @user
-      post :create, :thread_id => @thread.id, :comment => attributes
+      post :create, params: { thread_id: @thread.id, comment: attributes }
       expect(response).to have_http_status(:forbidden)
 
       @user.can_read = true
       @user.can_edit = true
       @user.is_admin = true
       expect(@thread.close).to eq true
-      post :create, :thread_id => @thread.id, :comment => attributes
+      post :create, params: { thread_id: @thread.id, comment: attributes }
       expect(response).to have_http_status(:forbidden)
     end
 
@@ -70,7 +70,7 @@ module Commontator
 
       attributes[:body] = 'Something else'
       @user.can_read = true
-      post :create, :thread_id => @thread.id, :comment => attributes
+      post :create, params: { thread_id: @thread.id, comment: attributes }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
       expect(assigns(:comment).body).to eq 'Something else'
@@ -81,7 +81,7 @@ module Commontator
       attributes[:body] = 'Another thing'
       @user.can_read = false
       @user.can_edit = true
-      post :create, :thread_id => @thread.id, :comment => attributes
+      post :create, params: { thread_id: @thread.id, comment: attributes }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
       expect(assigns(:comment).body).to eq 'Another thing'
@@ -92,7 +92,7 @@ module Commontator
       attributes[:body] = 'And this too'
       @user.can_edit = false
       @user.is_admin = true
-      post :create, :thread_id => @thread.id, :comment => attributes
+      post :create, params: { thread_id: @thread.id, comment: attributes }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
       expect(assigns(:comment).body).to eq 'And this too'
@@ -107,12 +107,12 @@ module Commontator
       attributes = Hash.new
 
       attributes[:body] = 'Something'
-      post :create, :thread_id => @thread.id, :comment => attributes
+      post :create, params: { thread_id: @thread.id, comment: attributes }
       assert_redirected_to @thread
       expect(assigns(:comment).errors).not_to be_empty
 
       attributes[:body] = 'Something else'
-      post :create, :thread_id => @thread.id, :comment => attributes
+      post :create, params: { thread_id: @thread.id, comment: attributes }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
       expect(assigns(:comment).body).to eq 'Something else'
@@ -121,17 +121,17 @@ module Commontator
       expect(assigns(:comment).thread).to eq @thread
 
       attributes[:body] = 'Something else'
-      post :create, :thread_id => @thread.id, :comment => attributes
+      post :create, params: { thread_id: @thread.id, comment: attributes }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).not_to be_empty
     end
 
     it "won't edit unless authorized" do
-      get :edit, :id => @comment.id
+      get :edit, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
 
       sign_in @user
-      get :edit, :id => @comment.id
+      get :edit, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
 
       user2 = DummyUser.create
@@ -139,7 +139,7 @@ module Commontator
       user2.can_edit = true
       user2.is_admin = true
       sign_in user2
-      get :edit, :id => @comment.id
+      get :edit, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
 
       @user.can_read = true
@@ -151,7 +151,7 @@ module Commontator
       comment2.creator = @user
       comment2.body = 'Something else'
       comment2.save!
-      get :edit, :id => @comment.id
+      get :edit, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
     end
 
@@ -159,19 +159,19 @@ module Commontator
       sign_in @user
 
       @user.can_read = true
-      get :edit, :id => @comment.id
+      get :edit, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
 
       @user.can_read = false
       @user.can_edit = true
-      get :edit, :id => @comment.id
+      get :edit, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
 
       @user.can_edit = false
       @user.is_admin = true
-      get :edit, :id => @comment.id
+      get :edit, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
     end
@@ -180,14 +180,14 @@ module Commontator
       attributes = Hash.new
       attributes[:body] = 'Something else'
 
-      put :update, :id => @comment.id, :comment => attributes
+      put :update, params: { id: @comment.id, comment: attributes }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.body).to eq 'Something'
       expect(@comment.editor).to be_nil
 
       sign_in @user
-      put :update, :id => @comment.id, :comment => attributes
+      put :update, params: { id: @comment.id, comment: attributes }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.body).to eq 'Something'
@@ -198,7 +198,7 @@ module Commontator
       user2.can_edit = true
       user2.is_admin = true
       sign_in user2
-      put :update, :id => @comment.id, :comment => attributes
+      put :update, params: { id: @comment.id, comment: attributes }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.body).to eq 'Something'
@@ -213,7 +213,7 @@ module Commontator
       comment2.creator = @user
       comment2.body = 'Something else'
       comment2.save!
-      put :update, :id => @comment.id, :comment => attributes
+      put :update, params: { id: @comment.id, comment: attributes }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.body).to eq 'Something'
@@ -226,42 +226,42 @@ module Commontator
       attributes[:body] = 'Something else'
 
       @user.can_read = true
-      put :update, :id => @comment.id, :comment => attributes
+      put :update, params: { id: @comment.id, comment: attributes }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
       expect(assigns(:comment).editor).to eq @user
 
       @user.can_read = false
       @user.can_edit = true
-      put :update, :id => @comment.id, :comment => attributes
+      put :update, params: { id: @comment.id, comment: attributes }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
       expect(assigns(:comment).editor).to eq @user
 
       @user.can_edit = false
       @user.is_admin = true
-      put :update, :id => @comment.id, :comment => attributes
+      put :update, params: { id: @comment.id, comment: attributes }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
       expect(assigns(:comment).editor).to eq @user
     end
 
     it "won't delete unless authorized and not deleted" do
-      put :delete, :id => @comment.id
+      put :delete, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.is_deleted?).to eq false
 
       sign_in @user
 
-      put :delete, :id => @comment.id
+      put :delete, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.is_deleted?).to eq false
 
       @user.can_read = true
       expect(@comment.delete_by(@user)).to eq true
-      put :delete, :id => @comment.id
+      put :delete, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).not_to be_empty
 
@@ -271,7 +271,7 @@ module Commontator
       comment2.body = 'Something else'
       comment2.save!
       expect(@comment.undelete_by(@user)).to eq true
-      put :delete, :id => @comment.id
+      put :delete, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.is_deleted?).to eq false
@@ -281,7 +281,7 @@ module Commontator
       sign_in @user
 
       @user.can_read = true
-      put :delete, :id => @comment.id
+      put :delete, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
       expect(assigns(:comment).is_deleted?).to eq true
@@ -297,7 +297,7 @@ module Commontator
 
       expect(assigns(:comment).undelete_by(@user)).to eq true
       user2.can_edit = true
-      put :delete, :id => @comment.id
+      put :delete, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
       expect(assigns(:comment).is_deleted?).to eq true
@@ -306,7 +306,7 @@ module Commontator
       expect(assigns(:comment).undelete_by(@user)).to eq true
       user2.can_edit = false
       user2.is_admin = true
-      put :delete, :id => @comment.id
+      put :delete, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
       expect(assigns(:comment).is_deleted?).to eq true
@@ -315,21 +315,21 @@ module Commontator
 
     it "won't undelete unless authorized and deleted" do
       expect(@comment.delete_by(@user)).to eq true
-      put :undelete, :id => @comment.id
+      put :undelete, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.is_deleted?).to eq true
 
       sign_in @user
 
-      put :undelete, :id => @comment.id
+      put :undelete, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.is_deleted?).to eq true
 
       @user.can_read = true
       expect(@comment.undelete_by(@user)).to eq true
-      put :undelete, :id => @comment.id
+      put :undelete, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).not_to be_empty
 
@@ -338,7 +338,7 @@ module Commontator
       user2.can_edit = true
       user2.is_admin = true
       expect(@comment.delete_by(user2)).to eq true
-      put :undelete, :id => @comment.id
+      put :undelete, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.is_deleted?).to eq true
@@ -350,7 +350,7 @@ module Commontator
       comment2.save!
       expect(@comment.undelete_by(@user)).to eq true
       expect(@comment.delete_by(@user)).to eq true
-      put :undelete, :id => @comment.id
+      put :undelete, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.is_deleted?).to eq true
@@ -361,7 +361,7 @@ module Commontator
 
       expect(@comment.delete_by(@user)).to eq true
       @user.can_read = true
-      put :undelete, :id => @comment.id
+      put :undelete, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
       expect(assigns(:comment).is_deleted?).to eq false
@@ -376,7 +376,7 @@ module Commontator
 
       expect(assigns(:comment).delete_by(@user)).to eq true
       user2.can_edit = true
-      put :undelete, :id => @comment.id
+      put :undelete, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
       expect(assigns(:comment).is_deleted?).to eq false
@@ -384,14 +384,14 @@ module Commontator
       expect(assigns(:comment).delete_by(@user)).to eq true
       user2.can_edit = false
       user2.is_admin = true
-      put :undelete, :id => @comment.id
+      put :undelete, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).errors).to be_empty
       expect(assigns(:comment).is_deleted?).to eq false
     end
 
     it "won't upvote unless authorized" do
-      put :upvote, :id => @comment.id
+      put :upvote, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.get_upvotes).to be_empty
@@ -399,7 +399,7 @@ module Commontator
 
       sign_in @user
       @user.can_read = true
-      put :upvote, :id => @comment.id
+      put :upvote, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.get_upvotes).to be_empty
@@ -407,7 +407,7 @@ module Commontator
 
       user2 = DummyUser.create
       sign_in user2
-      put :upvote, :id => @comment.id
+      put :upvote, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.get_upvotes).to be_empty
@@ -419,26 +419,26 @@ module Commontator
       user2.can_read = true
       sign_in user2
 
-      put :upvote, :id => @comment.id
+      put :upvote, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).get_upvotes.count).to eq 1
       expect(assigns(:comment).get_downvotes).to be_empty
 
-      put :upvote, :id => @comment.id
+      put :upvote, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).get_upvotes.count).to eq 1
       expect(assigns(:comment).get_downvotes).to be_empty
 
       expect(@comment.downvote_from(user2)).to eq true
 
-      put :upvote, :id => @comment.id
+      put :upvote, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).get_upvotes.count).to eq 1
       expect(assigns(:comment).get_downvotes).to be_empty
     end
 
     it "won't downvote unless authorized" do
-      put :downvote, :id => @comment.id
+      put :downvote, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.get_upvotes).to be_empty
@@ -446,7 +446,7 @@ module Commontator
 
       sign_in @user
       @user.can_read = true
-      put :downvote, :id => @comment.id
+      put :downvote, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.get_upvotes).to be_empty
@@ -454,7 +454,7 @@ module Commontator
 
       user2 = DummyUser.create
       sign_in user2
-      put :downvote, :id => @comment.id
+      put :downvote, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.get_upvotes).to be_empty
@@ -466,19 +466,19 @@ module Commontator
       user2.can_read = true
       sign_in user2
 
-      put :downvote, :id => @comment.id
+      put :downvote, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(@comment.get_upvotes).to be_empty
       expect(@comment.get_downvotes.count).to eq 1
 
-      put :downvote, :id => @comment.id
+      put :downvote, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(@comment.get_upvotes).to be_empty
       expect(@comment.get_downvotes.count).to eq 1
 
       expect(@comment.upvote_from(user2)).to eq true
 
-      put :downvote, :id => @comment.id
+      put :downvote, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(@comment.get_upvotes).to be_empty
       expect(@comment.get_downvotes.count).to eq 1
@@ -487,7 +487,7 @@ module Commontator
     it "won't unvote unless authorized" do
       expect(@comment.upvote_from(@user)).to eq true
 
-      put :unvote, :id => @comment.id
+      put :unvote, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.get_upvotes.count).to eq 1
@@ -495,7 +495,7 @@ module Commontator
 
       sign_in @user
       @user.can_read = true
-      put :unvote, :id => @comment.id
+      put :unvote, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.get_upvotes.count).to eq 1
@@ -503,7 +503,7 @@ module Commontator
 
       user2 = DummyUser.create
       sign_in user2
-      put :unvote, :id => @comment.id
+      put :unvote, params: { id: @comment.id }
       expect(response).to have_http_status(:forbidden)
       @comment.reload
       expect(@comment.get_upvotes.count).to eq 1
@@ -516,18 +516,18 @@ module Commontator
       sign_in user2
 
       expect(@comment.upvote_from(user2)).to eq true
-      put :unvote, :id => @comment.id
+      put :unvote, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).get_upvotes).to be_empty
       expect(assigns(:comment).get_downvotes).to be_empty
 
-      put :unvote, :id => @comment.id
+      put :unvote, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).get_upvotes).to be_empty
       expect(assigns(:comment).get_downvotes).to be_empty
 
       expect(@comment.downvote_from(user2)).to eq true
-      put :unvote, :id => @comment.id
+      put :unvote, params: { id: @comment.id }
       expect(response).to redirect_to @thread
       expect(assigns(:comment).get_upvotes).to be_empty
       expect(assigns(:comment).get_downvotes).to be_empty
@@ -540,10 +540,9 @@ module Commontator
       @user.can_read = true
       sign_in @user
 
-      attributes = { :body => 'Something else' }
-      expect {
-        post :create, :thread_id => @thread.id, :comment => attributes
-      }.not_to change{ ActionMailer::Base.deliveries.count }
+      attributes = { body: 'Something else' }
+      expect_any_instance_of(ActionMailer::MessageDelivery).not_to receive(:deliver_later)
+      post :create, params: { thread_id: @thread.id, comment: attributes }
       expect(assigns(:comment).errors).to be_empty
     end
 
@@ -555,10 +554,9 @@ module Commontator
       @user.can_read = true
       sign_in @user
 
-      attributes = { :body => 'Something else' }
-      expect {
-        post :create, :thread_id => @thread.id, :comment => attributes
-      }.to change{ ActionMailer::Base.deliveries.count }.by(1)
+      attributes = { body: 'Something else' }
+      expect_any_instance_of(ActionMailer::MessageDelivery).to receive(:deliver_later)
+      post :create, params: { thread_id: @thread.id, comment: attributes }
       expect(assigns(:comment).errors).to be_empty
     end
 
@@ -567,9 +565,11 @@ module Commontator
       let!(:other_user)        { DummyUser.create }
 
       let(:attributes)         { { body: 'some comment' } }
-      let(:call_request)       { post :create, thread_id: @thread.id,
-                                               comment: attributes,
-                                               mentioned_ids: [user_to_subscribe.id] }
+      let(:call_request)       do
+        post :create, params: { thread_id: @thread.id,
+                                comment: attributes,
+                                mentioned_ids: [user_to_subscribe.id] }
+      end
 
       before do
         @user.can_read = true
@@ -587,7 +587,8 @@ module Commontator
         end
 
         it 'does not send subscription emails' do
-          expect{ call_request }.not_to change{ ActionMailer::Base.deliveries.count }
+          expect_any_instance_of(ActionMailer::MessageDelivery).not_to receive(:deliver_later)
+          call_request
         end
       end
 
@@ -603,10 +604,10 @@ module Commontator
         end
 
         it 'sends a subscription email' do
-          expect{ call_request }.to change{ ActionMailer::Base.deliveries.count }.by(1)
+          expect_any_instance_of(ActionMailer::MessageDelivery).to receive(:deliver_later)
+          call_request
         end
       end
     end
   end
 end
-