glebtv-ckeditor 4.11.1 → 4.13.0

data/test/controllers/pictures_controller_test.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class PicturesControllerTest < ActionController::TestCase
   tests Ckeditor::PicturesController
 
-  include RawPost
-  
   def setup
     @image = fixture_file_upload('files/rails.png', 'image/png')
     @routes = Ckeditor::Engine.routes
@@ -14,48 +14,50 @@ class PicturesControllerTest < ActionController::TestCase
     Ckeditor::Picture.destroy_all
   end
 
-  test "index action" do
+  test 'index action' do
     get :index
 
     assert_equal 200, @response.status
-    assert_template "ckeditor/pictures/index"
+    assert_template 'ckeditor/pictures/index'
   end
 
-  test "create action via filebrowser" do
+  test 'create action via filebrowser' do
     assert_difference 'Ckeditor::Picture.count' do
-      post :create, :qqfile => @image
+      post :create, params: { qqfile: @image }
     end
 
     assert_equal 200, @response.status
   end
 
-  test "create action via CKEditor upload form" do
+  test 'create action via CKEditor upload form' do
     assert_difference 'Ckeditor::Picture.count' do
-      post :create, :upload => @image, :CKEditor => 'ckeditor_field'
+      post :create, params: { upload: @image, CKEditor: 'ckeditor_field' }
     end
 
     assert_equal 200, @response.status
   end
 
-  test "create action via html5 upload" do
+  test 'create action via html5 upload' do
+    params = { qqfile: @image.original_filename }
+
     assert_difference 'Ckeditor::Picture.count' do
-      raw_post :create, { :qqfile => @image.original_filename }, @image.read, "image/png"
+      post :create, params: params, body: @image.read
     end
 
     assert_equal 200, @response.status
   end
 
-  test "invalid params for create action" do
+  test 'invalid params for create action' do
     assert_no_difference 'Ckeditor::Picture.count' do
-      post :create, :qqfile => nil, :format => :html
+      post :create, params: { qqfile: nil, format: :html }
     end
   end
 
-  test "destroy action via filebrowser" do
-    @picture = Ckeditor::Picture.create :data => @image
+  test 'destroy action via filebrowser' do
+    @picture = Ckeditor::Picture.create data: @image
 
     assert_difference 'Ckeditor::Picture.count', -1 do
-      delete :destroy, :id => @picture.id
+      delete :destroy, params: { id: @picture.id }
     end
 
     assert_equal 302, @response.status

data/test/dummy/Rakefile

@@ -1,4 +1,6 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 

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

@@ -6,5 +6,3 @@
 //
 //= require jquery
 //= require jquery_ujs
-
-//= require ckeditor/init

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
   protect_from_forgery
 end

data/test/dummy/app/controllers/posts_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PostsController < ApplicationController
   # GET /posts
   # GET /posts.xml

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

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module ApplicationHelper
 end

data/test/dummy/app/helpers/posts_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module PostsHelper
 end

data/test/dummy/app/models/post.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 case CKEDITOR_ORM
 
 when :active_record

data/test/dummy/app/views/posts/index.html.erb

@@ -22,6 +22,3 @@
 
 <h2>Text area test</h2>
 <%= cktext_area_tag("test_area", "Ckeditor") %>
-
-<h2>Text area test with options</h2>
-<%= cktext_area_tag("content", "Ckeditor", :cols => 10, :rows => 20, :ckeditor => {:toolbar => 'Easy'}) %>

data/test/dummy/app/views/posts/show.html.erb

@@ -3,3 +3,6 @@
 
 <%= link_to 'Edit', edit_post_path(@post) %> |
 <%= link_to 'Back', posts_path %>
+
+<h2>Text area test with options</h2>
+<%= cktext_area_tag("content", "Ckeditor", :cols => 10, :rows => 20, :ckeditor => {:toolbar => 'Easy'}) %>

data/test/dummy/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)

data/test/dummy/config/application.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('../boot', __FILE__)
 
 require "rails"
@@ -10,7 +12,8 @@ require "action_controller/railtie"
 require "action_view/railtie"
 require "sprockets/railtie"
 require "rails/test_unit/railtie"
-
+require "active_storage/engine"
+require "active_job/railtie"
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
@@ -59,5 +62,6 @@ module Dummy
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+    config.active_storage.service = :local
   end
 end

data/test/dummy/config/boot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 gemfile = File.expand_path('../../../../Gemfile', __FILE__)
 

data/test/dummy/config/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load the rails application
 require File.expand_path('../application', __FILE__)
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
   config.eager_load = false
@@ -10,7 +12,7 @@ Dummy::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_files = true
-  config.static_cache_control = "public, max-age=3600"
+  config.static_cache_control = 'public, max-age=3600'
 
   # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
@@ -23,7 +25,7 @@ Dummy::Application.configure do
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
@@ -35,5 +37,5 @@ Dummy::Application.configure do
 
   config.active_support.test_order = :sorted
 
-  config.active_record.raise_in_transactional_callbacks = true
+  config.active_record.sqlite3.represent_boolean_as_integer = true
 end

data/test/dummy/config/initializers/assets.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 Rails.application.config.assets.precompile += %w( ckeditor/* )

data/test/dummy/config/initializers/backtrace_silencers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.

data/test/dummy/config/initializers/ckeditor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 dir = File.join(Rails.root, "..", "..", "lib", "generators", "ckeditor", "templates")
 
 # Load the CKEditor initializer from the codebase.

data/test/dummy/config/initializers/cookies_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.action_dispatch.cookies_serializer = :json

data/test/dummy/config/initializers/inflections.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format

data/test/dummy/config/initializers/mime_types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:

data/test/dummy/config/initializers/paperclip.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if Object.const_defined?('Paperclip')
   Paperclip.options[:command_path] = '/usr/local/bin/'
 end

data/test/dummy/config/initializers/session_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'

data/test/dummy/config/initializers/wrap_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 #
 # This file contains settings for ActionController::ParamsWrapper which

data/test/dummy/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   resources :posts
   root to: "posts#index"

data/test/dummy/config/storage.yml

@@ -0,0 +1,3 @@
+local:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>

data/test/dummy/db/migrate/20110623120047_create_posts.rb

@@ -1,5 +1,7 @@
-class CreatePosts < ActiveRecord::Migration
-  def self.up
+# frozen_string_literal: true
+
+class CreatePosts < ActiveRecord::Migration[5.2]
+  def up
     create_table :posts do |t|
       t.string :title
       t.text :info
@@ -8,7 +10,7 @@ class CreatePosts < ActiveRecord::Migration
     end
   end
 
-  def self.down
+  def down
     drop_table :posts
   end
 end

data/test/dummy/db/migrate/20170806125915_create_active_storage_tables.rb

@@ -0,0 +1,26 @@
+class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
+  def change
+    create_table :active_storage_blobs do |t|
+      t.string   :key,        null: false
+      t.string   :filename,   null: false
+      t.string   :content_type
+      t.text     :metadata
+      t.bigint   :byte_size,  null: false
+      t.string   :checksum,   null: false
+      t.datetime :created_at, null: false
+
+      t.index [ :key ], unique: true
+    end
+
+    create_table :active_storage_attachments do |t|
+      t.string     :name,     null: false
+      t.references :record,   null: false, polymorphic: true, index: false
+      t.references :blob,     null: false
+
+      t.datetime :created_at, null: false
+
+      t.index [ :record_type, :record_id, :name, :blob_id ], name: "index_active_storage_attachments_uniqueness", unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+end

data/test/dummy/script/rails

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
 APP_PATH = File.expand_path('../../config/application',  __FILE__)

data/test/functional/posts_controller_test.rb

@@ -1,40 +1,42 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class PostsControllerTest < ActionController::TestCase
   def setup
-    @post = Post.create!(title: "test", content: "content", info: "info")
+    @post = Post.create!(title: 'test', content: 'content', info: 'info')
   end
 
   def teardown
     @post.destroy rescue nil
   end
 
-  test "include javascripts" do
+  test 'include javascripts' do
     get :index
 
-    assert_select "script", Regexp.new(Regexp.escape(%q!CKEDITOR.replace('test_area');!))
+    assert_select 'script', Regexp.new("CKEDITOR\\.replace\\('test_area'")
   end
 
-  test "pass text_area with options" do
-    get :index
+  test 'pass text_area with options' do
+    get :show, params: { id: @post }
 
-    assert_select "textarea[name='content']", "Ckeditor"
-    assert_select "script", Regexp.new(Regexp.escape(%q!CKEDITOR.replace('content', {"toolbar":"Easy"});!))
+    assert_select "textarea[name='content']", 'Ckeditor'
+    assert_select 'script', Regexp.new("CKEDITOR\\.replace\\('content',\s\{\"toolbar\":\"Easy\"")
   end
 
-  test "form builder helper" do
+  test 'form builder helper' do
     get :new
 
-    assert_select "textarea[name='post[content]']", ""
-    assert_select "script", Regexp.new(Regexp.escape(%q!CKEDITOR.replace('post_content', {"width":800,"height":400});!))
-    assert_select "textarea[name='post[info]']", "Defaults info content"
-    assert_select "script", Regexp.new(Regexp.escape(%q!CKEDITOR.replace('new_info_content');!))
+    assert_select "textarea[name='post[content]']", ''
+    assert_select 'script', Regexp.new("CKEDITOR\\.replace\\('post_content',\s\{\"width\":800,\"height\":400")
+    assert_select "textarea[name='post[info]']", 'Defaults info content'
+    assert_select 'script', Regexp.new("CKEDITOR\\.replace\\('new_info_content'")
   end
 
-  test "text_area value" do
-    get :edit, id: @post.id
+  test 'text_area value' do
+    get :edit, params: { id: @post }
 
-    assert_select "textarea[name='post[content]']", "content"
-    assert_select "textarea[name='post[info]']", "info"
+    assert_select "textarea[name='post[content]']", 'content'
+    assert_select "textarea[name='post[info]']", 'info'
   end
 end

data/test/generators/install_generator_test.rb

@@ -1,111 +1,113 @@
-require "test_helper"
-require "fileutils"
+# frozen_string_literal: true
+
+require 'test_helper'
+require 'fileutils'
 
 class InstallGeneratorTest < Rails::Generators::TestCase
   tests Ckeditor::Generators::InstallGenerator
-  destination File.expand_path("../../tmp", __FILE__)
+  destination File.expand_path('../../tmp', __FILE__)
   setup :prepare_destination
 
   setup do
-    dir = File.expand_path("../../", __FILE__)
+    dir = File.expand_path('../../', __FILE__)
 
     FileUtils.mkdir_p File.join(dir, 'tmp/config')
     FileUtils.cp File.join(dir, 'support/routes.txt'), File.join(dir, 'tmp/config/routes.rb')
   end
 
-  test "Assert all files are properly created" do
-    run_generator %w(--orm=active_record)
+  test 'Assert all files are properly created' do
+    run_generator %w[--orm=active_record]
 
-    assert_file "config/initializers/ckeditor.rb", /require 'ckeditor\/orm\/active_record'/
-    assert_file "config/routes.rb", /mount\sCkeditor::Engine\s=\>\s\'\/ckeditor\'/
+    assert_file 'config/initializers/ckeditor.rb', /require 'ckeditor\/orm\/active_record'/
+    assert_file 'config/routes.rb', /mount\sCkeditor::Engine\s=\>\s\'\/ckeditor\'/
   end
 
-  test "Assert configurator is valid for mongoid" do
-    run_generator %w(--orm=mongoid)
+  test 'Assert configurator is valid for mongoid' do
+    run_generator %w[--orm=mongoid]
 
-    assert_file "config/initializers/ckeditor.rb", /require 'ckeditor\/orm\/mongoid'/
+    assert_file 'config/initializers/ckeditor.rb', /require 'ckeditor\/orm\/mongoid'/
   end
 
-  test "models and migration for active_record orm via paperclip" do
-    run_generator %w(--orm=active_record --backend=paperclip)
+  test 'models and migration for active_record orm via paperclip' do
+    run_generator %w[--orm=active_record --backend=paperclip]
 
-    assert_file "app/models/ckeditor/asset.rb"
-    assert_file "app/models/ckeditor/picture.rb"
-    assert_file "app/models/ckeditor/attachment_file.rb"
+    assert_file 'app/models/ckeditor/asset.rb'
+    assert_file 'app/models/ckeditor/picture.rb'
+    assert_file 'app/models/ckeditor/attachment_file.rb'
 
-    assert_migration "db/migrate/create_ckeditor_assets.rb" do |migration|
-      assert_class_method :up, migration do |up|
+    assert_migration 'db/migrate/create_ckeditor_assets.rb' do |migration|
+      assert_method :up, migration do |up|
         assert_match /create_table/, up
       end
     end
   end
 
-  test "models and migration for active_record orm via carrierwave" do
-    run_generator %w(--orm=active_record --backend=carrierwave)
-
-    assert_file "app/models/ckeditor/asset.rb"
-    assert_file "app/models/ckeditor/picture.rb"
-    assert_file "app/models/ckeditor/attachment_file.rb"
+  test 'models and migration for active_record orm via active_storage' do
+    run_generator %w[--orm=active_record --backend=active_storage]
 
-    assert_file "app/uploaders/ckeditor_attachment_file_uploader.rb"
-    assert_file "app/uploaders/ckeditor_picture_uploader.rb"
+    assert_file 'app/models/ckeditor/asset.rb'
+    assert_file 'app/models/ckeditor/picture.rb'
+    assert_file 'app/models/ckeditor/attachment_file.rb'
 
-    assert_migration "db/migrate/create_ckeditor_assets.rb" do |migration|
-      assert_class_method :up, migration do |up|
+    assert_migration 'db/migrate/create_ckeditor_assets.rb' do |migration|
+      assert_method :up, migration do |up|
         assert_match /create_table/, up
       end
     end
   end
 
-  test "models and migration for active_record orm via refile" do
-    run_generator %w(--orm=active_record --backend=refile)
+  test 'models and migration for active_record orm via carrierwave' do
+    run_generator %w[--orm=active_record --backend=carrierwave]
+
+    assert_file 'app/models/ckeditor/asset.rb'
+    assert_file 'app/models/ckeditor/picture.rb'
+    assert_file 'app/models/ckeditor/attachment_file.rb'
 
-    assert_file "app/models/ckeditor/asset.rb"
-    assert_file "app/models/ckeditor/picture.rb"
-    assert_file "app/models/ckeditor/attachment_file.rb"
+    assert_file 'app/uploaders/ckeditor_attachment_file_uploader.rb'
+    assert_file 'app/uploaders/ckeditor_picture_uploader.rb'
 
-    assert_migration "db/migrate/create_ckeditor_assets.rb" do |migration|
-      assert_class_method :up, migration do |up|
+    assert_migration 'db/migrate/create_ckeditor_assets.rb' do |migration|
+      assert_method :up, migration do |up|
         assert_match /create_table/, up
       end
     end
   end
 
-  test "models and migration for active_record orm via dragonfly" do
-    run_generator %w(--orm=active_record --backend=dragonfly)
+  test 'models and migration for active_record orm via dragonfly' do
+    run_generator %w[--orm=active_record --backend=dragonfly]
 
-    assert_file "app/models/ckeditor/asset.rb"
-    assert_file "app/models/ckeditor/picture.rb"
-    assert_file "app/models/ckeditor/attachment_file.rb"
+    assert_file 'app/models/ckeditor/asset.rb'
+    assert_file 'app/models/ckeditor/picture.rb'
+    assert_file 'app/models/ckeditor/attachment_file.rb'
 
-    assert_migration "db/migrate/create_ckeditor_assets.rb" do |migration|
-      assert_class_method :up, migration do |up|
+    assert_migration 'db/migrate/create_ckeditor_assets.rb' do |migration|
+      assert_method :up, migration do |up|
         assert_match /create_table/, up
         assert_match /data_uid/, up
       end
     end
   end
 
-  test "models for mongoid orm via paperclip" do
-    run_generator %w(--orm=mongoid --backend=paperclip)
+  test 'models for mongoid orm via paperclip' do
+    run_generator %w[--orm=mongoid --backend=paperclip]
 
-    assert_file "app/models/ckeditor/asset.rb"
-    assert_file "app/models/ckeditor/picture.rb"
-    assert_file "app/models/ckeditor/attachment_file.rb"
+    assert_file 'app/models/ckeditor/asset.rb'
+    assert_file 'app/models/ckeditor/picture.rb'
+    assert_file 'app/models/ckeditor/attachment_file.rb'
 
-    assert_no_migration "db/migrate/create_ckeditor_assets.rb"
+    assert_no_migration 'db/migrate/create_ckeditor_assets.rb'
   end
 
-  test "models for mongoid orm via carrierwave" do
-    run_generator %w(--orm=mongoid --backend=carrierwave)
+  test 'models for mongoid orm via carrierwave' do
+    run_generator %w[--orm=mongoid --backend=carrierwave]
 
-    assert_file "app/models/ckeditor/asset.rb"
-    assert_file "app/models/ckeditor/picture.rb"
-    assert_file "app/models/ckeditor/attachment_file.rb"
+    assert_file 'app/models/ckeditor/asset.rb'
+    assert_file 'app/models/ckeditor/picture.rb'
+    assert_file 'app/models/ckeditor/attachment_file.rb'
 
-    assert_file "app/uploaders/ckeditor_attachment_file_uploader.rb"
-    assert_file "app/uploaders/ckeditor_picture_uploader.rb"
+    assert_file 'app/uploaders/ckeditor_attachment_file_uploader.rb'
+    assert_file 'app/uploaders/ckeditor_picture_uploader.rb'
 
-    assert_no_migration "db/migrate/create_ckeditor_assets.rb"
+    assert_no_migration 'db/migrate/create_ckeditor_assets.rb'
   end
 end