Skip to content

Commit 1b6e205

Browse files
committed
Update
1 parent 5f47074 commit 1b6e205

3 files changed

Lines changed: 5 additions & 7 deletions

File tree

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
ruby_cms (0.1.4)
4+
ruby_cms (0.1.8)
55
actiontext (>= 7.1)
66
ahoy_matey (>= 5.0)
77
rails (>= 7.1)
@@ -520,7 +520,7 @@ CHECKSUMS
520520
rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
521521
rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100
522522
ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
523-
ruby_cms (0.1.4)
523+
ruby_cms (0.1.8)
524524
rugged (1.9.0) sha256=7faaa912c5888d6e348d20fa31209b6409f1574346b1b80e309dbc7e8d63efac
525525
safely_block (0.5.0) sha256=782c342bc400a79c1233c40cf8c379da6116c6cfd1d7c1f17f0ef2ef11090103
526526
sawyer (0.9.3) sha256=0d0f19298408047037638639fe62f4794483fb04320269169bd41af2bdcf5e41

lib/generators/ruby_cms/install_generator.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -399,9 +399,7 @@ def add_action_text_importmap_pins
399399
content = File.read(importmap_path)
400400
lines_to_add = []
401401
lines_to_add << %(pin "trix") unless content.include?('pin "trix"')
402-
unless content.include?('pin "@rails/actiontext"')
403-
lines_to_add << %(pin "@rails/actiontext", to: "actiontext.esm.js")
404-
end
402+
lines_to_add << %(pin "@rails/actiontext", to: "actiontext.esm.js") unless content.include?('pin "@rails/actiontext"')
405403
return if lines_to_add.empty?
406404

407405
inject_into_file importmap_path.to_s, before: /^end/ do

spec/ruby_cms/content_block_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
RSpec.describe ContentBlock do
77
describe "rich text and attachment associations" do
88
it "defines rich_content association when ActionText is loaded" do
9-
skip "ActionText not loaded in test environment" unless defined?(::ActionText::RichText)
9+
skip "ActionText not loaded in test environment" unless defined?(ActionText::RichText)
1010

1111
expect(described_class.reflect_on_association(:rich_content)).to be_present
1212
end
1313

1414
it "defines image association when ActiveStorage is loaded" do
15-
skip "ActiveStorage not loaded in test environment" unless defined?(::ActiveStorage::Blob)
15+
skip "ActiveStorage not loaded in test environment" unless defined?(ActiveStorage::Blob)
1616

1717
expect(described_class.reflect_on_association(:image)).to be_present
1818
end

0 commit comments

Comments
 (0)