ckeditor 4.3.0 → 5.1.0

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

data/test/integration/navigation_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class NavigationTest < ActiveSupport::IntegrationCase

data/test/models/attachment_file_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class AttachmentFileTest < ActiveSupport::TestCase
@@ -8,10 +10,8 @@ class AttachmentFileTest < ActiveSupport::TestCase
   test 'Set file content_type and size' do
     @attachment = create_attachment
 
-    assert_equal "rails.tar.gz", @attachment.data_file_name
-
-    assert_match /application\/(x-)?gzip/, @attachment.data_content_type
+    assert_equal 'rails.tar.gz', @attachment.data_file_name
     assert_equal 6823, @attachment.data_file_size
-    assert_equal "ckeditor/filebrowser/thumbs/gz.gif", @attachment.url_thumb
+    assert_equal 'ckeditor/filebrowser/thumbs/gz.gif', @attachment.url_thumb
   end
 end

data/test/models/ckeditor_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class CkeditorTest < ActiveSupport::TestCase
@@ -59,27 +61,7 @@ class CkeditorTest < ActiveSupport::TestCase
   end
 
   test 'attachment file model adapter' do
-    assert_equal Ckeditor.attachment_file_adapter,
-      Ckeditor::AttachmentFile.to_adapter
-  end
-
-  test 'languages ingnore list' do
-    Ckeditor.assets = nil
-    Ckeditor.assets_languages = ['en', 'uk']
-
-    assert_equal Ckeditor.assets.include?('ckeditor/lang/ru.js'), false
-    assert_equal Ckeditor.assets.include?('ckeditor/lang/en.js'), true
-    assert_equal Ckeditor.assets.include?('ckeditor/lang/uk.js'), true
-    assert_equal Ckeditor.assets.include?('ckeditor/plugins/a11yhelp/dialogs/lang/bg.js'), false
-    assert_equal Ckeditor.assets.include?('ckeditor/plugins/a11yhelp/dialogs/lang/uk.js'), true
-  end
-
-  test 'plugins ingnore list' do
-    Ckeditor.assets = nil
-    Ckeditor.assets_plugins = ['image']
-
-    assert_equal Ckeditor.assets.include?('ckeditor/plugins/table/dialogs/table.js'), false
-    assert_equal Ckeditor.assets.include?('ckeditor/plugins/image/dialogs/image.js'), true
+    assert_equal Ckeditor.attachment_file_adapter, Ckeditor::AttachmentFile.to_adapter
   end
 
   test 'configuration specifying running ckeditor:nondigest task on assets:precompile' do

data/test/models/picture_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class PictureTest < ActiveSupport::TestCase
@@ -5,22 +7,22 @@ class PictureTest < ActiveSupport::TestCase
     @picture.destroy rescue nil
   end
 
-  test "Set file content_type and size" do
+  test 'Set file content_type and size' do
     @picture = create_picture
 
-    assert_equal "image/png", @picture.data_content_type
-    assert_equal "rails.png", @picture.data_file_name
-    assert_equal 6646, @picture.data_file_size
-
-    if CKEDITOR_BACKEND == :dragonfly
+    assert_equal 'rails.png', @picture.data_file_name unless CKEDITOR_BACKEND == :shrine
+    case CKEDITOR_BACKEND
+    when :dragonfly
       assert @picture.url_thumb.include?('thumb_rails')
+    when :active_storage
+      assert @picture.url_thumb =~ /\/representations\/.*\/rails.png/
+    when :shrine
+      assert @picture.url_thumb =~ /\S{32}\.png/
+      assert @picture.data_file_name =~ /image_processing(\d{8})-(\d{5})-(\S{,7})\.png/
     else
       assert @picture.url_thumb.include?('thumb_rails.png')
     end
 
-    if @picture.has_dimensions?
-      assert_equal 50, @picture.width
-      assert_equal 64, @picture.height
-    end
+    assert_equal 6646, @picture.data_file_size
   end
 end

data/test/models/utils_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class UtilsTest < ActiveSupport::TestCase

data/test/orm/active_record.rb

@@ -1 +1,11 @@
-ActiveRecord::Migrator.migrate(File.expand_path("../../dummy/db/migrate/", __FILE__))
+# frozen_string_literal: true
+
+def activerecord_below_5_2?
+  ActiveRecord.version.release() < Gem::Version.new('5.2.0')
+end
+
+if activerecord_below_5_2?
+  ActiveRecord::Migrator.migrate('test/dummy/db/migrate')
+else
+  ActiveRecord::MigrationContext.new('test/dummy/db/migrate').migrate
+end

data/test/orm/mongoid.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActiveSupport::TestCase
   setup do
     Post.delete_all

data/test/support/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/test_case'
 require 'action_dispatch/testing/test_process'
 

data/test/support/integration_case.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Define a bare test case to use with Capybara
 class ActiveSupport::IntegrationCase < ActiveSupport::TestCase
   include Capybara::DSL

data/test/test_helper.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 # Configure Rails Envinronment
-ENV["RAILS_ENV"] = "test"
-CKEDITOR_ORM = (ENV["CKEDITOR_ORM"] || :active_record).to_sym
-CKEDITOR_BACKEND = (ENV["CKEDITOR_BACKEND"] || :paperclip).to_sym
+ENV['RAILS_ENV'] = 'test'
+CKEDITOR_ORM = (ENV['CKEDITOR_ORM'] || :active_record).to_sym
+CKEDITOR_BACKEND = (ENV['CKEDITOR_BACKEND'] || :paperclip).to_sym
 
 $:.unshift File.dirname(__FILE__)
 puts "\n==> Ckeditor.orm = #{CKEDITOR_ORM.inspect}. CKEDITOR_ORM = (active_record|mongoid)"
-puts "\n==> Ckeditor.backend = #{CKEDITOR_BACKEND.inspect}. CKEDITOR_BACKEND = (paperclip|carrierwave|refile|dragonfly)"
+puts "\n==> Ckeditor.backend = #{CKEDITOR_BACKEND.inspect}. CKEDITOR_BACKEND = (shrine|paperclip|active_storage|carrierwave|dragonfly)"
 
-require File.expand_path("../dummy/config/environment.rb", __FILE__)
-require "rails/test_help"
+require File.expand_path('../dummy/config/environment.rb', __FILE__)
+require 'rails/test_help'
 require 'redgreen'
 
 Rails.backtrace_cleaner.remove_silencers!
 
 # Configure capybara for integration testing
-require "capybara/rails"
+require 'capybara/rails'
 Capybara.default_driver   = :rack_test
 Capybara.default_selector = :css
 
@@ -26,11 +28,15 @@ $:.unshift File.expand_path('../support', __FILE__)
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 # For generators
-require "rails/generators/test_case"
-require "generators/ckeditor/install_generator"
+require 'rails/generators/test_case'
+require 'generators/ckeditor/install_generator'
 
 # Run template migration for the selected backend
 if CKEDITOR_ORM == :active_record
   require "generators/ckeditor/templates/active_record/#{CKEDITOR_BACKEND}/migration.rb"
   CreateCkeditorAssets.new.up
 end
+
+# For create variants in Active Storage
+require "active_job"
+ActiveJob::Base.queue_adapter = :test