pageflow 17.0.5 → 17.1.0

data/spec/factories/accounts.rb

@@ -4,12 +4,16 @@ FactoryBot.define do
 
     after(:build) do |account, evaluator|
       account.default_site ||=
-        build(:site, account: account, **evaluator.default_site_attributes)
+        build(:site, *evaluator.default_site_traits, account:, **evaluator.default_site_attributes)
+    end
+
+    trait :with_permalinks do
+      default_site_traits { [:with_root_permalink_directory] }
     end
 
     trait(:with_first_paged_entry_template) do
       after(:create) do |account, _|
-        create(:entry_template, account: account, entry_type: 'paged')
+        create(:entry_template, account:, entry_type: 'paged')
       end
     end
 
@@ -24,29 +28,40 @@ FactoryBot.define do
       without_feature { nil }
 
       default_site_attributes { {} }
+      default_site_traits { [] }
     end
 
     after(:create) do |account, evaluator|
-      create(:membership,
-             entity: account,
-             user: evaluator.with_member,
-             role: :member) if evaluator.with_member
-      create(:membership,
-             entity: account,
-             user: evaluator.with_previewer,
-             role: :previewer) if evaluator.with_previewer
-      create(:membership,
-             entity: account,
-             user: evaluator.with_editor,
-             role: :editor) if evaluator.with_editor
-      create(:membership,
-             entity: account,
-             user: evaluator.with_publisher,
-             role: :publisher) if evaluator.with_publisher
-      create(:membership,
-             entity: account,
-             user: evaluator.with_manager,
-             role: :manager) if evaluator.with_manager
+      if evaluator.with_member
+        create(:membership,
+               entity: account,
+               user: evaluator.with_member,
+               role: :member)
+      end
+      if evaluator.with_previewer
+        create(:membership,
+               entity: account,
+               user: evaluator.with_previewer,
+               role: :previewer)
+      end
+      if evaluator.with_editor
+        create(:membership,
+               entity: account,
+               user: evaluator.with_editor,
+               role: :editor)
+      end
+      if evaluator.with_publisher
+        create(:membership,
+               entity: account,
+               user: evaluator.with_publisher,
+               role: :publisher)
+      end
+      if evaluator.with_manager
+        create(:membership,
+               entity: account,
+               user: evaluator.with_manager,
+               role: :manager)
+      end
     end
 
     after(:build) do |entry, evaluator|

data/spec/factories/audio_files.rb

@@ -1,6 +1,6 @@
 module Pageflow
   FactoryBot.define do
-    factory :audio_file, :class => AudioFile do
+    factory :audio_file, class: AudioFile do
       entry
       uploader { create(:user) }
 
@@ -19,7 +19,7 @@ module Pageflow
       after(:create) do |file, evaluator|
         if evaluator.used_in
           create(:file_usage,
-                 file: file,
+                 file:,
                  revision: evaluator.used_in,
                  configuration: evaluator.with_configuration)
         end

data/spec/factories/authentication_tokens.rb

@@ -4,10 +4,10 @@ module Pageflow
       user
       provider { 'default' }
       auth_token do
-        'QEVuQwAAElPhP47/EQeKvGyQL0asd9DITXSBzT4fg5SL++gkPCuPJGW8LFHyuvEtp5X4sZTn++'\
-        'I59UKjJ5rEB67k2p8iJw+8nNVFBZ288G6DlSpTteDLvoIvBSbremWg7Hz123apFkQCGTJuZV61eu'\
-        'QVhQ5KAvnLl0HwJ1JSjM0aXUUF1fL1gEOFaoB2x/T56p4BnKzZjtIWfuB+pmtygsL47C8TTyjint0V'\
-        'u7Oa47C/uMngIRb6AZYi4FU9uPXkJonakaCwI'
+        'QEVuQwAAElPhP47/EQeKvGyQL0asd9DITXSBzT4fg5SL++gkPCuPJGW8LFHyuvEtp5X4sZTn++' \
+          'I59UKjJ5rEB67k2p8iJw+8nNVFBZ288G6DlSpTteDLvoIvBSbremWg7Hz123apFkQCGTJuZV61eu' \
+          'QVhQ5KAvnLl0HwJ1JSjM0aXUUF1fL1gEOFaoB2x/T56p4BnKzZjtIWfuB+pmtygsL47C8TTyjint0V' \
+          'u7Oa47C/uMngIRb6AZYi4FU9uPXkJonakaCwI'
       end
       expiry_time { Time.at(925_036_800_00) }
     end

data/spec/factories/chapters.rb

@@ -1,6 +1,6 @@
 module Pageflow
   FactoryBot.define do
-    factory :chapter, :class => Chapter do
+    factory :chapter, class: Chapter do
       storyline
 
       transient do
@@ -8,14 +8,14 @@ module Pageflow
       end
 
       before(:create) do |chapter, evaluator|
-        if revision = evaluator.in_main_storyline_of
+        if (revision = evaluator.in_main_storyline_of)
           chapter.storyline = revision.storylines.first ||
-            fail('Expected revision to have a main storyline.')
+                              raise('Expected revision to have a main storyline.')
         end
       end
     end
 
-    factory :valid_chapter, :class => Chapter do
+    factory :valid_chapter, class: Chapter do
       title { 'Introduction' }
     end
   end

data/spec/factories/draft_entries.rb

@@ -10,20 +10,28 @@ module Pageflow
 
         with_feature { nil }
         without_feature { nil }
+
+        translation_of { nil }
       end
 
       initialize_with do
         DraftEntry.new(create(:entry,
-                              title: title,
-                              account: account,
-                              site: site,
-                              type_name: type_name,
+                              title:,
+                              account:,
+                              site:,
+                              type_name:,
                               draft_attributes: revision_attributes,
-                              with_feature: with_feature,
-                              without_feature: without_feature))
+                              with_feature:,
+                              without_feature:))
       end
 
       to_create { |draft_entry| draft_entry.entry.save! }
+
+      after(:create) do |published_entry, evaluator|
+        if evaluator.translation_of
+          published_entry.entry.mark_as_translation_of(evaluator.translation_of.to_model)
+        end
+      end
     end
   end
 end

data/spec/factories/edit_locks.rb

@@ -1,6 +1,6 @@
 module Pageflow
   FactoryBot.define do
-    factory :edit_lock, :class => EditLock do
+    factory :edit_lock, class: EditLock do
       user { build(:user) }
       entry { build(:entry) }
       updated_at { Time.now }

data/spec/factories/entries.rb

@@ -28,22 +28,30 @@ module Pageflow
       end
 
       after(:create) do |entry, evaluator|
-        create(:membership,
-               entity: entry,
-               user: evaluator.with_previewer,
-               role: :previewer) if evaluator.with_previewer
-        create(:membership,
-               entity: entry,
-               user: evaluator.with_editor,
-               role: :editor) if evaluator.with_editor
-        create(:membership,
-               entity: entry,
-               user: evaluator.with_publisher,
-               role: :publisher) if evaluator.with_publisher
-        create(:membership,
-               entity: entry,
-               user: evaluator.with_manager,
-               role: :manager) if evaluator.with_manager
+        if evaluator.with_previewer
+          create(:membership,
+                 entity: entry,
+                 user: evaluator.with_previewer,
+                 role: :previewer)
+        end
+        if evaluator.with_editor
+          create(:membership,
+                 entity: entry,
+                 user: evaluator.with_editor,
+                 role: :editor)
+        end
+        if evaluator.with_publisher
+          create(:membership,
+                 entity: entry,
+                 user: evaluator.with_publisher,
+                 role: :publisher)
+        end
+        if evaluator.with_manager
+          create(:membership,
+                 entity: entry,
+                 user: evaluator.with_manager,
+                 role: :manager)
+        end
 
         entry.draft.update!(evaluator.draft_attributes) if evaluator.draft_attributes
       end
@@ -63,6 +71,7 @@ module Pageflow
             )
 
           entry.build_permalink(
+            allow_root_path: evaluator.permalink_attributes[:allow_root_path],
             directory: permalink_directory,
             slug: evaluator.permalink_attributes.fetch(:slug)
           )
@@ -78,7 +87,7 @@ module Pageflow
 
         after(:create) do |entry, evaluator|
           create(:revision, :published,
-                 evaluator.published_revision_attributes.merge(entry: entry))
+                 evaluator.published_revision_attributes.merge(entry:))
         end
       end
 
@@ -93,7 +102,7 @@ module Pageflow
           create(:revision,
                  :published,
                  evaluator.published_revision_attributes.merge(
-                   entry: entry,
+                   entry:,
                    password_protected: true
                  ))
         end
@@ -110,7 +119,7 @@ module Pageflow
           create(:revision,
                  :published,
                  evaluator.published_revision_attributes.merge(
-                   entry: entry,
+                   entry:,
                    noindex: true
                  ))
         end

data/spec/factories/entry_translation_groups.rb

@@ -0,0 +1,6 @@
+module Pageflow
+  FactoryBot.define do
+    factory :entry_translation_group, class: EntryTranslationGroup do
+    end
+  end
+end

data/spec/factories/file_usages.rb

@@ -1,8 +1,9 @@
 module Pageflow
   FactoryBot.define do
-    factory :file_usage, :class => FileUsage do
+    factory :file_usage, class: FileUsage do
       revision { nil }
       file { nil }
+      display_name { nil }
     end
   end
 end

data/spec/factories/folders.rb

@@ -1,6 +1,6 @@
 module Pageflow
   FactoryBot.define do
-    factory :folder, :class => Folder do
+    factory :folder, class: Folder do
       name { 'some folder' }
       account
     end

data/spec/factories/image_files.rb

@@ -1,6 +1,6 @@
 module Pageflow
   FactoryBot.define do
-    factory :image_file, :class => ImageFile do
+    factory :image_file, class: ImageFile do
       entry
       uploader { create(:user) }
       attachment { File.open(Engine.root.join('spec', 'fixtures', 'image.jpg')) }
@@ -18,7 +18,7 @@ module Pageflow
       after(:create) do |file, evaluator|
         if evaluator.used_in
           create(:file_usage,
-                 file: file,
+                 file:,
                  revision: evaluator.used_in,
                  configuration: evaluator.with_configuration)
         end

data/spec/factories/pages.rb

@@ -1,6 +1,6 @@
 module Pageflow
   FactoryBot.define do
-    factory :page, :class => Page do
+    factory :page, class: Page do
       chapter
       template { 'background_image' }
       configuration { {} }
@@ -12,12 +12,12 @@ module Pageflow
       before(:create) do |page, evaluator|
         if evaluator.revision
           storyline = create(:storyline, revision: evaluator.revision)
-          page.chapter = create(:chapter, storyline: storyline)
+          page.chapter = create(:chapter, storyline:)
         end
       end
     end
 
-    factory :valid_page, :class => Page do
+    factory :valid_page, class: Page do
       template { 'background_image' }
       configuration { {} }
     end

data/spec/factories/published_entries.rb

@@ -11,22 +11,40 @@ module Pageflow
 
         with_feature { nil }
         without_feature { nil }
+
+        translation_of { nil }
+
+        entry_trait { :published }
+      end
+
+      trait :published_with_password do
+        entry_trait { :published_with_password }
+      end
+
+      trait :published_with_noindex do
+        entry_trait { :published_with_noindex }
       end
 
       initialize_with do
         PublishedEntry.new(create(:entry,
-                                  :published,
-                                  title: title,
-                                  account: account,
-                                  site: site,
-                                  type_name: type_name,
+                                  entry_trait,
+                                  title:,
+                                  account:,
+                                  site:,
+                                  type_name:,
                                   published_revision_attributes: revision_attributes,
-                                  permalink_attributes: permalink_attributes,
-                                  with_feature: with_feature,
-                                  without_feature: without_feature))
+                                  permalink_attributes:,
+                                  with_feature:,
+                                  without_feature:))
       end
 
       to_create { |published_entry| published_entry.entry.save! }
+
+      after(:create) do |published_entry, evaluator|
+        if evaluator.translation_of
+          published_entry.entry.mark_as_translation_of(evaluator.translation_of.to_model)
+        end
+      end
     end
   end
 end

data/spec/factories/revisions.rb

@@ -1,6 +1,6 @@
 module Pageflow
   FactoryBot.define do
-    factory :revision, :class => Revision do
+    factory :revision, class: Revision do
       entry
 
       trait :frozen do

data/spec/factories/sites.rb

@@ -7,6 +7,12 @@ module Pageflow
       after(:build) do |site|
         site.account ||= build(:account, default_site: site)
       end
+
+      trait(:with_root_permalink_directory) do
+        after(:build) do |site|
+          site.permalink_directories.build(path: '')
+        end
+      end
     end
   end
 end

data/spec/factories/test_multi_attachment_files.rb

@@ -9,7 +9,7 @@ module Pageflow
       end
 
       after(:create) do |file, evaluator|
-        create(:file_usage, file: file, revision: evaluator.used_in) if evaluator.used_in
+        create(:file_usage, file:, revision: evaluator.used_in) if evaluator.used_in
       end
     end
   end

data/spec/factories/text_track_files.rb

@@ -18,7 +18,7 @@ module Pageflow
       end
 
       after(:create) do |file, evaluator|
-        create(:file_usage, file: file, revision: evaluator.used_in) if evaluator.used_in
+        create(:file_usage, file:, revision: evaluator.used_in) if evaluator.used_in
       end
 
       trait :from_srt_file do

data/spec/factories/uploadable_files.rb

@@ -9,7 +9,7 @@ module Pageflow
       end
 
       after(:create) do |file, evaluator|
-        create(:file_usage, file: file, revision: evaluator.used_in) if evaluator.used_in
+        create(:file_usage, file:, revision: evaluator.used_in) if evaluator.used_in
       end
 
       trait :uploading do

data/spec/factories/users.rb

@@ -18,31 +18,31 @@ module Pageflow
 
       trait :member do
         after(:create) do |user, evaluator|
-          create(:membership, user: user, entity: evaluator.on, role: :member)
+          create(:membership, user:, entity: evaluator.on, role: :member)
         end
       end
 
       trait :previewer do
         after(:create) do |user, evaluator|
-          create(:membership, user: user, entity: evaluator.on, role: :previewer)
+          create(:membership, user:, entity: evaluator.on, role: :previewer)
         end
       end
 
       trait :editor do
         after(:create) do |user, evaluator|
-          create(:membership, user: user, entity: evaluator.on, role: :editor)
+          create(:membership, user:, entity: evaluator.on, role: :editor)
         end
       end
 
       trait :publisher do
         after(:create) do |user, evaluator|
-          create(:membership, user: user, entity: evaluator.on, role: :publisher)
+          create(:membership, user:, entity: evaluator.on, role: :publisher)
         end
       end
 
       trait :manager do
         after(:create) do |user, evaluator|
-          create(:membership, user: user, entity: evaluator.on, role: :manager)
+          create(:membership, user:, entity: evaluator.on, role: :manager)
         end
       end
 
@@ -50,7 +50,7 @@ module Pageflow
         admin { true }
         after(:create) do |user, evaluator|
           create(:membership,
-                 user: user,
+                 user:,
                  role: :member,
                  entity: evaluator.on || create(:account))
         end

data/spec/factories/video_files.rb

@@ -1,6 +1,6 @@
 module Pageflow
   FactoryBot.define do
-    factory :video_file, :class => VideoFile do
+    factory :video_file, class: VideoFile do
       entry
       uploader { create(:user) }
 
@@ -19,7 +19,7 @@ module Pageflow
       after(:create) do |file, evaluator|
         if evaluator.used_in
           create(:file_usage,
-                 file: file,
+                 file:,
                  revision: evaluator.used_in,
                  configuration: evaluator.with_configuration)
         end

data/spec/factories/widgets.rb

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :widget, :class => Pageflow::Widget do
+  factory :widget, class: Pageflow::Widget do
     role { 'navigation' }
     type_name { 'test_widget' }
   end