commontator 4.11.1 → 5.0.0

data/spec/controllers/commontator/subscriptions_controller_spec.rb

@@ -7,96 +7,95 @@ module Commontator
     before(:each) do
       setup_controller_spec
     end
-    
+
     it "won't subscribe unless authorized" do
-      put :subscribe, :id => @thread.id
+      put :subscribe, params: { id: @thread.id }
       expect(response).to have_http_status(:forbidden)
       expect(@thread.subscription_for(nil)).to be_nil
       expect(@thread.subscription_for(@user)).to be_nil
-      
+
       sign_in @user
-      put :subscribe, :id => @thread.id
+      put :subscribe, params: { id: @thread.id }
       expect(response).to have_http_status(:forbidden)
       expect(@thread.subscription_for(@user)).to be_nil
-      
+
       @thread.subscribe(@user)
       @user.can_read = true
-      put :subscribe, :id => @thread.id
+      put :subscribe, params: { id: @thread.id }
       expect(response).to redirect_to(@thread)
       expect(assigns(:thread).errors).not_to be_empty
     end
-    
+
     it 'must subscribe if authorized' do
       sign_in @user
-      
+
       @user.can_read = true
-      put :subscribe, :id => @thread.id
+      put :subscribe, params: { id: @thread.id }
       expect(response).to redirect_to(@thread)
       expect(assigns(:thread).errors).to be_empty
       expect(@thread.subscription_for(@user)).not_to be_nil
-      
+
       @thread.unsubscribe(@user)
       @user.can_read = false
       @user.can_edit = true
-      put :subscribe, :id => @thread.id
+      put :subscribe, params: { id: @thread.id }
       expect(response).to redirect_to(@thread)
       expect(assigns(:thread).errors).to be_empty
       expect(@thread.subscription_for(@user)).not_to be_nil
-      
+
       @thread.unsubscribe(@user)
       @user.can_edit = false
       @user.is_admin = true
-      put :subscribe, :id => @thread.id
+      put :subscribe, params: { id: @thread.id }
       expect(response).to redirect_to(@thread)
       expect(assigns(:thread).errors).to be_empty
       expect(@thread.subscription_for(@user)).not_to be_nil
     end
-    
+
     it "won't unsubscribe unless authorized" do
       @thread.subscribe(@user)
-      put :unsubscribe, :id => @thread.id
+      put :unsubscribe, params: { id: @thread.id }
       expect(response).to have_http_status(:forbidden)
       expect(@thread.subscription_for(nil)).to be_nil
       expect(@thread.subscription_for(@user)).not_to be_nil
-      
+
       sign_in @user
-      put :unsubscribe, :id => @thread.id
+      put :unsubscribe, params: { id: @thread.id }
       expect(response).to have_http_status(:forbidden)
       expect(@thread.subscription_for(@user)).not_to be_nil
-      
+
       @thread.unsubscribe(@user)
       @user.can_read = true
-      put :unsubscribe, :id => @thread.id
+      put :unsubscribe, params: { id: @thread.id }
       expect(response).to redirect_to(@thread)
       expect(assigns(:thread).errors).not_to be_empty
     end
-    
+
     it 'must unsubscribe if authorized' do
       sign_in @user
-      
+
       @thread.subscribe(@user)
       @user.can_read = true
-      put :unsubscribe, :id => @thread.id
+      put :unsubscribe, params: { id: @thread.id }
       expect(response).to redirect_to(@thread)
       expect(assigns(:thread).errors).to be_empty
       expect(@thread.subscription_for(@user)).to be_nil
-      
+
       @thread.subscribe(@user)
       @user.can_read = false
       @user.can_edit = true
-      put :unsubscribe, :id => @thread.id
+      put :unsubscribe, params: { id: @thread.id }
       expect(response).to redirect_to(@thread)
       expect(assigns(:thread).errors).to be_empty
       expect(@thread.subscription_for(@user)).to be_nil
-      
+
       @thread.subscribe(@user)
       @user.can_edit = false
       @user.is_admin = true
-      put :unsubscribe, :id => @thread.id
+      put :unsubscribe, params: { id: @thread.id }
       expect(response).to redirect_to(@thread)
       expect(assigns(:thread).errors).to be_empty
       expect(@thread.subscription_for(@user)).to be_nil
     end
   end
 end
-

data/spec/controllers/commontator/threads_controller_spec.rb

@@ -7,128 +7,130 @@ module Commontator
     before(:each) do
       setup_controller_spec
     end
-    
+
     it "won't show unless authorized" do
-      get :show, :id => @thread.id
+      get :show, params: { id: @thread.id }
       expect(response).to have_http_status(:forbidden)
-      
+
       sign_in @user
-      get :show, :id => @thread.id
+      get :show, params: { id: @thread.id }
       expect(response).to have_http_status(:forbidden)
     end
-    
+
     it 'must show if authorized' do
       commontable_path = Rails.application.routes.url_helpers.dummy_model_path(@commontable)
       sign_in @user
-      
+
       @user.can_read = true
-      get :show, :id => @thread.id
+      get :show, params: { id: @thread.id }
       expect(response).to redirect_to(commontable_path)
-      
+
       @user.can_read = false
       @user.can_edit = true
-      get :show, :id => @thread.id
+      get :show, params: { id: @thread.id }
       expect(response).to redirect_to(commontable_path)
-      
+
       @user.can_edit = false
       @user.is_admin = true
-      get :show, :id => @thread.id
+      get :show, params: { id: @thread.id }
       expect(response).to redirect_to(commontable_path)
     end
-    
+
     it "won't close unless authorized and open" do
-      put :close, :id => @thread.id
+      put :close, params: { id: @thread.id }
       expect(response).to have_http_status(:forbidden)
       @thread.reload
       expect(@thread.is_closed?).to eq false
-      
+
       sign_in @user
-      put :close, :id => @thread.id
+      put :close, params: { id: @thread.id }
       expect(response).to have_http_status(:forbidden)
       @thread.reload
       expect(@thread.is_closed?).to eq false
-      
+
       @user.can_read = true
-      put :close, :id => @thread.id
+      put :close, params: { id: @thread.id }
       expect(response).to have_http_status(:forbidden)
       @thread.reload
       expect(@thread.is_closed?).to eq false
-      
+
       @user.can_edit = true
       expect(@thread.close).to eq true
-      put :close, :id => @thread.id
+      put :close, params: { id: @thread.id }
       expect(response).to redirect_to(@thread)
       expect(assigns(:thread).errors).not_to be_empty
     end
-    
+
     it 'must close if authorized and open' do
       sign_in @user
-      
+
       @user.can_edit = true
-      put :close, :id => @thread.id
+      put :close, params: { id: @thread.id }
       expect(response).to redirect_to(@thread)
       expect(assigns(:thread).errors).to be_empty
       expect(assigns(:thread).is_closed?).to eq true
       expect(assigns(:thread).closer).to eq @user
-      
+
       expect(assigns(:thread).reopen).to eq true
       @user.can_edit = false
       @user.is_admin = true
-      put :close, :id => @thread.id
+      put :close, params: { id: @thread.id }
       expect(response).to redirect_to(@thread)
       expect(assigns(:thread).errors).to be_empty
       expect(assigns(:thread).is_closed?).to eq true
       expect(assigns(:thread).closer).to eq @user
     end
-    
+
     it "won't reopen unless authorized and closed" do
       expect(@thread.close).to eq true
-      put :reopen, :id => @thread.id
+      put :reopen, params: { id: @thread.id }
       expect(response).to have_http_status(:forbidden)
       @thread.reload
       expect(@thread.is_closed?).to eq true
-      
+
       sign_in @user
-      put :reopen, :id => @thread.id
+      put :reopen, params: { id: @thread.id }
       expect(response).to have_http_status(:forbidden)
       @thread.reload
       expect(@thread.is_closed?).to eq true
-      
+
       @user.can_read = true
-      put :reopen, :id => @thread.id
+      put :reopen, params: { id: @thread.id }
       expect(response).to have_http_status(:forbidden)
       @thread.reload
       expect(@thread.is_closed?).to eq true
-      
+
       expect(@thread.reopen).to eq true
       @user.can_edit = true
-      put :reopen, :id => @thread.id
+      put :reopen, params: { id: @thread.id }
       expect(response).to redirect_to(@thread)
       expect(assigns(:thread).errors).not_to be_empty
     end
-    
+
     it 'must reopen if authorized and closed' do
       sign_in @user
-      
+
       expect(@thread.close).to eq true
       @user.can_edit = true
-      put :reopen, :id => @thread.id
+      put :reopen, params: { id: @thread.id }
       expect(response).to redirect_to(@thread)
       expect(assigns(:thread).errors).to be_empty
       expect(assigns(:thread).is_closed?).to eq false
-      
+
       expect(assigns(:thread).close).to eq true
       @user.can_edit = false
       @user.is_admin = true
-      put :reopen, :id => @thread.id
+      put :reopen, params: { id: @thread.id }
       expect(response).to redirect_to(@thread)
       expect(assigns(:thread).errors).to be_empty
       expect(assigns(:thread).is_closed?).to eq false
     end
-    
+
     context '#mentions' do
       let(:search_phrase) { nil }
-      let(:call_request)  { get :mentions, id: @thread.id, format: :json, q: search_phrase }
+      let(:call_request)  do
+        get :mentions, params: { id: @thread.id, format: :json, q: search_phrase }
+      end
 
       let!(:other_user)   { DummyUser.create }
 
@@ -199,7 +201,7 @@ module Commontator
 
             it 'calls the user_mentions_proc and returns the result' do
               expect(Commontator.user_mentions_proc).to(
-                receive(:call).with(@user, search_phrase).and_return(valid_result)
+                receive(:call).with(@user, @thread, search_phrase).and_return(valid_result)
               )
 
               call_request
@@ -215,4 +217,3 @@ module Commontator
     end
   end
 end
-

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

@@ -1,5 +1,5 @@
 class DummyModelsController < ApplicationController
-  before_filter :get_dummy
+  before_action :get_dummy
 
   def show
     commontator_thread_show(@dummy_model)

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

@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <%= stylesheet_link_tag    "application", media: "all" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
 </head>
@@ -12,4 +12,3 @@
 
 </body>
 </html>
-

data/spec/dummy/config/application.rb

@@ -20,7 +20,7 @@ module Dummy
     # config.i18n.default_locale = :de
 
     config.generators do |g|
-      g.test_framework :mini_test, :spec => true, :fixture => false
+      g.test_framework :mini_test, spec: true, fixture: false
     end
   end
 end

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

@@ -16,7 +16,7 @@ Dummy::Application.configure do
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  config.action_mailer.default_url_options = { :host => "dev.example.com" }
+  config.action_mailer.default_url_options = { host: "dev.example.com" }
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
@@ -29,4 +29,3 @@ Dummy::Application.configure do
   # number of complex assets.
   config.assets.debug = true
 end
-

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

@@ -69,7 +69,7 @@ Dummy::Application.configure do
   # the I18n.default_locale when a translation can not be found).
   config.i18n.fallbacks = true
 
-  config.action_mailer.default_url_options = { :host => "www.example.com" }
+  config.action_mailer.default_url_options = { host: "www.example.com" }
 
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
@@ -80,4 +80,3 @@ 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

@@ -31,11 +31,10 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  config.action_mailer.default_url_options = { :host => "test.example.com" }
+  config.action_mailer.default_url_options = { host: "test.example.com" }
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
   config.active_support.test_order = :sorted
 end
-

data/spec/dummy/config/initializers/commontator.rb

@@ -1,12 +1,12 @@
 # Dummy application configuration file
 Commontator.configure do |config|
-  config.javascript_proc = lambda { |view| '// Some javascript' }
+  config.javascript_proc = ->(view) { '// Some javascript' }
 
-  config.user_name_proc = lambda { |user| user.try(:name) || 'Anonymous' }
+  config.user_name_proc = ->(user) { user.try(:name) || 'Anonymous' }
 
-  config.thread_read_proc = lambda { |thread, user| user && user.can_read }
+  config.thread_read_proc = ->(thread, user) { user && user.can_read }
 
-  config.thread_moderator_proc = lambda { |thread, user| user.is_admin || user.can_edit }
+  config.thread_moderator_proc = ->(thread, user) { user.is_admin || user.can_edit }
 
   config.comment_voting = :ld
 
@@ -14,7 +14,7 @@ Commontator.configure do |config|
 
   config.mentions_enabled = true
 
-  config.user_mentions_proc = lambda { |current_user, query|
-    'DummyUser'.include?(query) ? DummyUser.all : DummyUser.none }
+  config.user_mentions_proc = ->(current_user, thread, query) {
+    'DummyUser'.include?(query) ? DummyUser.all : DummyUser.none
+  }
 end
-

data/spec/dummy/config/routes.rb

@@ -1,10 +1,9 @@
 Rails.application.routes.draw do
-  root to: "dummy_models#show", id: 1
+  root to: 'dummy_models#show', id: 1
 
   resources :dummy_models, only: :show do
     get :hide, on: :member
   end
 
-  mount Commontator::Engine => "/commontator"
+  mount Commontator::Engine => '/commontator'
 end
-

data/spec/dummy/db/migrate/1_create_dummy_models.rb

@@ -1,8 +1,7 @@
-class CreateDummyModels < ActiveRecord::Migration
+class CreateDummyModels < ActiveRecord::Migration[5.0]
   def change
     create_table "dummy_models" do |t|
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
-

data/spec/dummy/db/migrate/2_create_dummy_users.rb

@@ -1,8 +1,7 @@
-class CreateDummyUsers < ActiveRecord::Migration
+class CreateDummyUsers < ActiveRecord::Migration[5.0]
   def change
     create_table "dummy_users" do |t|
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
-