diff options
| -rw-r--r-- | actiontext/lib/action_text/attachable.rb | 4 | ||||
| -rw-r--r-- | actiontext/test/dummy/app/models/page.rb | 4 | ||||
| -rw-r--r-- | actiontext/test/dummy/db/migrate/20190305172303_create_pages.rb | 9 | ||||
| -rw-r--r-- | actiontext/test/dummy/db/schema.rb | 8 | ||||
| -rw-r--r-- | actiontext/test/unit/attachment_test.rb | 8 |
5 files changed, 31 insertions, 2 deletions
diff --git a/actiontext/lib/action_text/attachable.rb b/actiontext/lib/action_text/attachable.rb index 38cd24aa8d..3343bcc308 100644 --- a/actiontext/lib/action_text/attachable.rb +++ b/actiontext/lib/action_text/attachable.rb @@ -67,6 +67,10 @@ module ActionText super.merge(attachable_sgid: attachable_sgid) end + def to_trix_content_attachment_partial_path + to_partial_path + end + def to_rich_text_attributes(attributes = {}) attributes.dup.tap do |attrs| attrs[:sgid] = attachable_sgid diff --git a/actiontext/test/dummy/app/models/page.rb b/actiontext/test/dummy/app/models/page.rb new file mode 100644 index 0000000000..dfebf282a7 --- /dev/null +++ b/actiontext/test/dummy/app/models/page.rb @@ -0,0 +1,4 @@ +class Page < ApplicationRecord + include ActionText::Attachable +end + diff --git a/actiontext/test/dummy/db/migrate/20190305172303_create_pages.rb b/actiontext/test/dummy/db/migrate/20190305172303_create_pages.rb new file mode 100644 index 0000000000..3a71e55d94 --- /dev/null +++ b/actiontext/test/dummy/db/migrate/20190305172303_create_pages.rb @@ -0,0 +1,9 @@ +class CreatePages < ActiveRecord::Migration[6.0] + def change + create_table :pages do |t| + t.string :title + + t.timestamps + end + end +end diff --git a/actiontext/test/dummy/db/schema.rb b/actiontext/test/dummy/db/schema.rb index 2388986835..60ccbd4873 100644 --- a/actiontext/test/dummy/db/schema.rb +++ b/actiontext/test/dummy/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_10_03_185713) do +ActiveRecord::Schema.define(version: 2019_03_05_172303) do create_table "action_text_rich_texts", force: :cascade do |t| t.string "name", null: false @@ -49,6 +49,12 @@ ActiveRecord::Schema.define(version: 2018_10_03_185713) do t.datetime "updated_at", precision: 6, null: false end + create_table "pages", force: :cascade do |t| + t.string "title" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + create_table "people", force: :cascade do |t| t.string "name" t.datetime "created_at", precision: 6, null: false diff --git a/actiontext/test/unit/attachment_test.rb b/actiontext/test/unit/attachment_test.rb index 65e9d69e84..026078dcec 100644 --- a/actiontext/test/unit/attachment_test.rb +++ b/actiontext/test/unit/attachment_test.rb @@ -32,7 +32,8 @@ class ActionText::AttachmentTest < ActiveSupport::TestCase assert_equal attachable.byte_size, trix_attachment.attributes["filesize"] assert_equal "Captioned", trix_attachment.attributes["caption"] - assert_nil trix_attachment.attributes["content"] + assert_not_nil attachable.to_trix_content_attachment_partial_path + assert_not_nil trix_attachment.attributes["content"] end test "converts to TrixAttachment with content" do @@ -49,6 +50,11 @@ class ActionText::AttachmentTest < ActiveSupport::TestCase assert_not_nil trix_attachment.attributes["content"] end + test "defaults trix partial to model partial" do + attachable = Page.create! title: "Homepage" + assert_equal "pages/page", attachable.to_trix_content_attachment_partial_path + end + private def attachment_from_html(html) ActionText::Content.new(html).attachments.first |