pageflow 13.0.0.beta5 → 13.0.0.beta6

data/spec/factories/accounts.rb

@@ -1,19 +1,19 @@
 FactoryBot.define do
   factory :account, class: Pageflow::Account do
-    name 'Account Name'
+    name { 'Account Name' }
 
     after(:build) do |account|
       account.default_theming ||= build(:theming, account: account)
     end
 
     transient do
-      with_member nil
-      with_previewer nil
-      with_editor nil
-      with_publisher nil
-      with_manager nil
+      with_member { nil }
+      with_previewer { nil }
+      with_editor { nil }
+      with_publisher { nil }
+      with_manager { nil }
 
-      with_feature nil
+      with_feature { nil }
     end
 
     after(:create) do |account, evaluator|

data/spec/factories/audio_files.rb

@@ -4,10 +4,10 @@ module Pageflow
       entry
       uploader { create(:user) }
 
-      attachment_on_s3 File.open(Engine.root.join('spec', 'fixtures', 'et.ogg'))
+      attachment_on_s3 { File.open(Engine.root.join('spec', 'fixtures', 'et.ogg')) }
 
       transient do
-        used_in nil
+        used_in { nil }
       end
 
       before(:create) do |file, evaluator|
@@ -19,27 +19,27 @@ module Pageflow
       end
 
       trait :on_filesystem do
-        attachment_on_filesystem File.open(Engine.root.join('spec', 'fixtures', 'et.ogg'))
-        attachment_on_s3 nil
-        state 'not_uploaded_to_s3'
+        attachment_on_filesystem { File.open(Engine.root.join('spec', 'fixtures', 'et.ogg')) }
+        attachment_on_s3 { nil }
+        state { 'not_uploaded_to_s3' }
       end
 
       trait :uploading_to_s3_failed do
-        attachment_on_filesystem File.open(Engine.root.join('spec', 'fixtures', 'et.ogg'))
-        attachment_on_s3 nil
-        state 'uploading_to_s3_failed'
+        attachment_on_filesystem { File.open(Engine.root.join('spec', 'fixtures', 'et.ogg')) }
+        attachment_on_s3 { nil }
+        state { 'uploading_to_s3_failed' }
       end
 
       trait :waiting_for_confirmation do
-        state 'waiting_for_confirmation'
+        state { 'waiting_for_confirmation' }
       end
 
       trait :encoding_failed do
-        state 'encoding_failed'
+        state { 'encoding_failed' }
       end
 
       trait :encoded do
-        state 'encoded'
+        state { 'encoded' }
       end
     end
   end

data/spec/factories/chapters.rb

@@ -4,7 +4,7 @@ module Pageflow
       storyline
 
       transient do
-        in_main_storyline_of nil
+        in_main_storyline_of { nil }
       end
 
       before(:create) do |chapter, evaluator|
@@ -16,7 +16,7 @@ module Pageflow
     end
 
     factory :valid_chapter, :class => Chapter do
-      title "Introduction"
+      title { 'Introduction' }
     end
   end
 end

data/spec/factories/entries.rb

@@ -14,12 +14,12 @@ module Pageflow
       end
 
       transient do
-        with_previewer nil
-        with_editor nil
-        with_publisher nil
-        with_manager nil
+        with_previewer { nil }
+        with_editor { nil }
+        with_publisher { nil }
+        with_manager { nil }
 
-        with_feature nil
+        with_feature { nil }
       end
 
       after(:create) do |entry, evaluator|
@@ -48,7 +48,7 @@ module Pageflow
 
       trait :published do
         transient do
-          published_revision_attributes({})
+          published_revision_attributes { {} }
         end
 
         after(:create) do |entry, evaluator|
@@ -63,7 +63,7 @@ module Pageflow
       end
 
       trait :with_highdef_video_encoding do
-        feature_states('highdef_video_encoding' => true)
+        feature_states { {'highdef_video_encoding' => true} }
       end
     end
   end

data/spec/factories/file_usages.rb

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

data/spec/factories/folders.rb

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

data/spec/factories/hosted_files.rb

@@ -7,20 +7,20 @@ module Pageflow
   FactoryBot.define do
     factory :hosted_file, class: TestHostedFile do
       trait :on_filesystem do
-        attachment_on_filesystem File.open(Engine.root.join('spec', 'fixtures', 'image.png'))
-        attachment_on_s3 nil
-        state 'not_uploaded_to_s3'
+        attachment_on_filesystem { File.open(Engine.root.join('spec', 'fixtures', 'image.png')) }
+        attachment_on_s3 { nil }
+        state { 'not_uploaded_to_s3' }
       end
 
       trait :uploading_to_s3_failed do
-        attachment_on_filesystem File.open(Engine.root.join('spec', 'fixtures', 'image.png'))
-        attachment_on_s3 nil
-        state 'uploading_to_s3_failed'
+        attachment_on_filesystem { File.open(Engine.root.join('spec', 'fixtures', 'image.png')) }
+        attachment_on_s3 { nil }
+        state { 'uploading_to_s3_failed' }
       end
 
       trait :uploaded_to_s3 do
-        attachment_on_s3 File.open(Engine.root.join('spec', 'fixtures', 'image.png'))
-        state 'uploaded_to_s3'
+        attachment_on_s3 { File.open(Engine.root.join('spec', 'fixtures', 'image.png')) }
+        state { 'uploaded_to_s3' }
       end
 
       trait :with_overridden_keep_on_filesystem do

data/spec/factories/image_files.rb

@@ -4,11 +4,11 @@ module Pageflow
       entry
       uploader { create(:user) }
 
-      attachment File.open(Engine.root.join('spec', 'fixtures', 'image.jpg'))
-      state 'processed'
+      attachment { File.open(Engine.root.join('spec', 'fixtures', 'image.jpg')) }
+      state { 'processed' }
 
       transient do
-        used_in nil
+        used_in { nil }
       end
 
       before(:create) do |file, evaluator|
@@ -20,19 +20,19 @@ module Pageflow
       end
 
       trait :processed do
-        processed_attachment File.open(Engine.root.join('spec', 'fixtures', 'image.jpg'))
+        processed_attachment { File.open(Engine.root.join('spec', 'fixtures', 'image.jpg')) }
       end
 
       trait :unprocessed do
-        unprocessed_attachment File.open(Engine.root.join('spec', 'fixtures', 'image.jpg'))
-        processed_attachment nil
-        state 'not_processed'
+        unprocessed_attachment { File.open(Engine.root.join('spec', 'fixtures', 'image.jpg')) }
+        processed_attachment { nil }
+        state { 'not_processed' }
       end
 
       trait :failed do
-        unprocessed_attachment File.open(Engine.root.join('spec', 'fixtures', 'image.jpg'))
-        processed_attachment nil
-        state 'processing_failed'
+        unprocessed_attachment { File.open(Engine.root.join('spec', 'fixtures', 'image.jpg')) }
+        processed_attachment { nil }
+        state { 'processing_failed' }
       end
 
       trait :encoded do

data/spec/factories/invited_user.rb

@@ -2,8 +2,8 @@ module Pageflow
   FactoryBot.define do
     factory :invited_user, class: InvitedUser do
       email
-      first_name 'Edison'
-      last_name 'Editor'
+      first_name { 'Edison' }
+      last_name { 'Editor' }
     end
   end
 end

data/spec/factories/memberships.rb

@@ -3,7 +3,7 @@ module Pageflow
     factory :membership, class: Membership do
       user
       association :entity, factory: :entry
-      role :previewer
+      role { :previewer }
       before(:create) do |membership|
         if membership.entity_type != 'Pageflow::Account' &&
            !membership.user.accounts.include?(membership.entity.account) &&
@@ -19,7 +19,7 @@ module Pageflow
     factory :entry_membership, class: Membership do
       user
       association :entity, factory: :entry
-      role :previewer
+      role { :previewer }
       before(:create) do |membership|
         if !membership.user.accounts.include?(membership.entity.account) &&
            !membership.entity.account.nil?
@@ -34,7 +34,7 @@ module Pageflow
     factory :account_membership, class: Membership do
       user
       association :entity, factory: :account
-      role :member
+      role { :member }
     end
   end
 end

data/spec/factories/pages.rb

@@ -2,13 +2,13 @@ module Pageflow
   FactoryBot.define do
     factory :page, :class => Page do
       chapter
-      template "background_image"
-      configuration({})
+      template { 'background_image' }
+      configuration { {} }
     end
 
     factory :valid_page, :class => Page do
-      template "background_image"
-      configuration({})
+      template { 'background_image' }
+      configuration { {} }
     end
   end
 end

data/spec/factories/revisions.rb

@@ -20,30 +20,30 @@ module Pageflow
 
       trait :user_snapshot do
         frozen
-        snapshot_type 'user'
+        snapshot_type { 'user' }
       end
 
       trait :auto_snapshot do
         frozen
-        snapshot_type 'auto'
+        snapshot_type { 'auto' }
       end
 
       trait :with_home_button do
-        home_button_enabled true
-        home_url 'http://example.com'
+        home_button_enabled { true }
+        home_url { 'http://example.com' }
       end
 
       trait :without_home_button do
-        home_button_enabled false
-        home_url 'http://example.com'
+        home_button_enabled { false }
+        home_url { 'http://example.com' }
       end
 
       trait :with_overview_button do
-        overview_button_enabled true
+        overview_button_enabled { true }
       end
 
       trait :without_overview_button do
-        overview_button_enabled false
+        overview_button_enabled { false }
       end
     end
   end

data/spec/factories/text_track_files.rb

@@ -5,10 +5,10 @@ module Pageflow
       uploader { create(:user) }
       parent_file { nil }
 
-      attachment_on_s3 File.open(Engine.root.join('spec', 'fixtures', 'sample.vtt'))
+      attachment_on_s3 { File.open(Engine.root.join('spec', 'fixtures', 'sample.vtt')) }
 
       transient do
-        used_in nil
+        used_in { nil }
       end
 
       before(:create) do |file, evaluator|
@@ -21,19 +21,19 @@ module Pageflow
       end
 
       trait :from_srt_file do
-        attachment_on_s3 File.open(Engine.root.join('spec', 'fixtures', 'sample.srt'))
+        attachment_on_s3 { File.open(Engine.root.join('spec', 'fixtures', 'sample.srt')) }
       end
 
       trait :on_filesystem do
-        attachment_on_filesystem File.open(Engine.root.join('spec', 'fixtures', 'et.ogg'))
-        attachment_on_s3 nil
-        state 'not_uploaded_to_s3'
+        attachment_on_filesystem { File.open(Engine.root.join('spec', 'fixtures', 'et.ogg')) }
+        attachment_on_s3 { nil }
+        state { 'not_uploaded_to_s3' }
       end
 
       trait :uploading_to_s3_failed do
-        attachment_on_filesystem File.open(Engine.root.join('spec', 'fixtures', 'et.ogg'))
-        attachment_on_s3 nil
-        state 'uploading_to_s3_failed'
+        attachment_on_filesystem { File.open(Engine.root.join('spec', 'fixtures', 'et.ogg')) }
+        attachment_on_s3 { nil }
+        state { 'uploading_to_s3_failed' }
       end
     end
   end

data/spec/factories/themings.rb

@@ -2,7 +2,7 @@ module Pageflow
   FactoryBot.define do
     factory :theming, :class => Pageflow::Theming do
       account
-      theme_name 'default'
+      theme_name { 'default' }
     end
   end
 end

data/spec/factories/users.rb

@@ -6,14 +6,14 @@ module Pageflow
 
     factory :user do
       transient do
-        on nil
+        on { nil }
       end
 
       email
-      first_name 'John'
-      last_name 'Doe'
+      first_name { 'John' }
+      last_name { 'Doe' }
 
-      password '@qwert12345'
+      password { '@qwert12345' }
       password_confirmation { password }
 
       trait :member do
@@ -47,7 +47,7 @@ module Pageflow
       end
 
       trait :admin do
-        admin true
+        admin { true }
         after(:create) do |user, evaluator|
           create(:membership,
                  user: user,
@@ -63,8 +63,8 @@ module Pageflow
 
     factory :valid_user, class: User do
       email
-      first_name 'Edison'
-      last_name 'Editor'
+      first_name { 'Edison' }
+      last_name { 'Editor' }
     end
   end
 end

data/spec/factories/video_files.rb

@@ -4,12 +4,12 @@ module Pageflow
       entry
       uploader { create(:user) }
 
-      attachment_on_s3 File.open(Engine.root.join('spec', 'fixtures', 'video.mp4'))
-      state 'encoded'
+      attachment_on_s3 { File.open(Engine.root.join('spec', 'fixtures', 'video.mp4')) }
+      state { 'encoded' }
 
       transient do
-        used_in nil
-        with_configuration nil
+        used_in { nil }
+        with_configuration { nil }
       end
 
       before(:create) do |file, evaluator|
@@ -26,23 +26,23 @@ module Pageflow
       end
 
       trait :on_filesystem do
-        attachment_on_filesystem File.open(Engine.root.join('spec', 'fixtures', 'video.mp4'))
-        attachment_on_s3 nil
-        state 'not_uploaded_to_s3'
+        attachment_on_filesystem { File.open(Engine.root.join('spec', 'fixtures', 'video.mp4')) }
+        attachment_on_s3 { nil }
+        state { 'not_uploaded_to_s3' }
       end
 
       trait :uploading_to_s3_failed do
-        attachment_on_filesystem File.open(Engine.root.join('spec', 'fixtures', 'video.mp4'))
-        attachment_on_s3 nil
-        state 'uploading_to_s3_failed'
+        attachment_on_filesystem { File.open(Engine.root.join('spec', 'fixtures', 'video.mp4')) }
+        attachment_on_s3 { nil }
+        state { 'uploading_to_s3_failed' }
       end
 
       trait :waiting_for_confirmation do
-        state 'waiting_for_confirmation'
+        state { 'waiting_for_confirmation' }
       end
 
       trait :encoding_failed do
-        state 'encoding_failed'
+        state { 'encoding_failed' }
       end
 
       trait :encoded do