pageflow-support 15.1.2 → 15.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ce2c0aaf4361f2210f379214e50b84c88672fd7c
-  data.tar.gz: 53f9858177255c4a00f0f1fbd348ef1679e1cc81
+SHA256:
+  metadata.gz: ff6e2a042c492b5d356ab03b25507bee3ef47042a3b22f6509b1634cd2363302
+  data.tar.gz: 1e50597d286d416c70c0b5b2cf2e79b7fc2a060dc06d46139324d56ab7d1924b
 SHA512:
-  metadata.gz: b10014ac6da2f26ff1729c661a0e4a28529b8e47108760ed532889739f00b78c039d5f0aaf9cf0ff9a7c733b4945d6c47752b0ee4377a001753c956e6a0c9114
-  data.tar.gz: 7a87b0af5869cc78d10a93a1e9d0817f85710cf4f3d9356fe0ddf923832ea94001ab42b0522dce15fcd7088ac39ce620246b4dc38f982947dc5eb76d6a011bb0
+  metadata.gz: 973979be6e1ca5dfb259083919c52494b4f59d711367bba48cfed2926744aabc8b978d5a8b91a8a2e61dda446eef8699866122edf01dcc7e284c7f221fe23dd9
+  data.tar.gz: 3a109fa870dc91d1267fb8e88c0887def41b5b7336043d82ab2b31a96bde1ad34279c427c01dff37989d8f72cdfcf5e3d992235225b308f6c993dc40cf565df2

data/pageflow/dom/editor/edit_configuration_view.rb

@@ -7,6 +7,20 @@ module Pageflow
         def destroy_button
           node.find('.destroy')
         end
+
+        def back_button
+          node.find('.back')
+        end
+
+        def input_value(label_text)
+          node.find_field(label_text).value
+        end
+
+        def change_input(label_text, value)
+          field = node.find_field(label_text)
+          field.fill_in(with: value)
+          field.native.send_keys(:tab)
+        end
       end
     end
   end

data/pageflow/dummy/app.rb

@@ -1,4 +1,5 @@
 require 'pageflow/version'
+require 'pageflow/dummy/exit_on_failure_patch'
 
 module Pageflow
   module Dummy
@@ -10,7 +11,8 @@ module Pageflow
           puts("Dummy directory #{directory} exists.")
         else
           system("bundle exec rails new #{directory} " \
-                 "--template #{template_path} #{rails_new_options}")
+                 "--template #{template_path} #{rails_new_options}") ||
+            raise('Error generating dummy app.')
         end
 
         require(File.join(ENV['RAILS_ROOT'], 'config', 'environment'))

data/pageflow/dummy/exit_on_failure_patch.rb

@@ -0,0 +1,25 @@
+require 'rails/generators'
+
+# Thor exits with 0, when an error occurs. This behavior is deprecated
+# in 1.0 [1], but has not yet changed. As a result the dummy app
+# generation is not aborted and tests fail due to confusing follow up
+# errors. Rails provides an `abort_on_failure` option for `rake` and
+# `generate` actions [2], but it needs to be added to each such
+# action. In particular, generating the dummy app invokes other
+# generators, which we do not have control over.
+#
+# To work around this problem, we override the default behavior for
+# all generators and make them fail loudly.
+#
+# [1] https://github.com/erikhuda/thor/blob/master/CHANGELOG.md#100
+# [2] https://github.com/rails/rails/pull/34420/
+
+module Rails
+  module Generators
+    class Base
+      def self.exit_on_failure?
+        true
+      end
+    end
+  end
+end

data/pageflow/dummy/rails_template.rb

@@ -35,8 +35,7 @@ gsub_file('app/assets/javascripts/application.js', %r'//=.*', '')
 
 # Recreate db. Ignore if it does not exist.
 
-log :rake, 'db:drop:all'
-in_root { run('rake db:environment:set db:drop:all 2> /dev/null', verbose: false) }
+in_root { run('rake db:environment:set db:drop:all', capture: true, abort_on_failure: false) }
 rake 'db:create:all'
 
 # Install pageflow and the tested engine via their generators.

data/pageflow/lint/entry_type.rb

@@ -10,7 +10,12 @@ module Pageflow
 
           describe '#editor_fragment_renderer' do
             it 'renders head fragment without error' do
-              entry = DraftEntry.new(FactoryBot.create(:entry))
+              entry = DraftEntry.new(
+                FactoryBot.create(
+                  :entry,
+                  type_name: entry_type.name
+                )
+              )
 
               expect {
                 entry_type.editor_fragment_renderer.head_fragment(entry)
@@ -18,7 +23,12 @@ module Pageflow
             end
 
             it 'renders body fragment without error' do
-              entry = DraftEntry.new(FactoryBot.create(:entry))
+              entry = DraftEntry.new(
+                FactoryBot.create(
+                  :entry,
+                  type_name: entry_type.name
+                )
+              )
 
               expect {
                 entry_type.editor_fragment_renderer.body_fragment(entry)
@@ -26,7 +36,12 @@ module Pageflow
             end
 
             it 'renders seed fragment without error' do
-              entry = DraftEntry.new(FactoryBot.create(:entry))
+              entry = DraftEntry.new(
+                FactoryBot.create(
+                  :entry,
+                  type_name: entry_type.name
+                )
+              )
 
               expect {
                 entry_type.editor_fragment_renderer.seed_fragment(entry)

data/pageflow/render_page_test_helper.rb

@@ -18,7 +18,7 @@ module Pageflow
       helper.extend(InfoBoxHelper)
       helper.extend(BackgroundImageHelper)
       helper.extend(EntryJsonSeedHelper)
-      helper.extend(PageBackgroundAssetHelper)
+      helper.extend(PageflowPaged::PageBackgroundAssetHelper)
       helper.extend(PagesHelper)
       helper.extend(VideoFilesHelper)
 

data/pageflow/shared_contexts/fake_translations.rb

@@ -0,0 +1,23 @@
+RSpec.shared_context 'fake translations' do
+  around(:example) do |example|
+    i18n_backend_backup = I18n.backend
+    @fake_i18n_backend = I18n::Backend::Simple.new
+
+    I18n.backend = @fake_i18n_backend
+    example.run
+    I18n.backend = i18n_backend_backup
+  end
+
+  def translation(locale, key_path, value)
+    keys = key_path.split('.')
+    last_key = keys.pop
+    data = {}
+
+    inner = keys.inject(data) do |result, key|
+      result[key] = {}
+    end
+
+    inner[last_key] = value
+    @fake_i18n_backend.store_translations(locale, data)
+  end
+end

data/pageflow/support/config/paperclip.rb

@@ -1,13 +1,21 @@
 RSpec.configure do |config|
-  config.before(:each) do
+  config.before(:all) do
     Dir.glob(Rails.root.join('public', 'system', 's3', '*')).each do |f|
       FileUtils.rm_r(f)
     end
   end
 
-  config.before(:each, stub_paperclip: true) do
-    allow_any_instance_of(Paperclip::Attachment).to receive(:post_process)
-    allow(Paperclip).to receive(:run).and_return('100x100')
+  config.after(:each, unstub_paperclip: true) do
+    Dir.glob(Rails.root.join('public', 'system', 's3', '*')).each do |f|
+      FileUtils.rm_r(f)
+    end
+  end
+
+  config.before(:each) do |example|
+    unless example.metadata[:unstub_paperclip] || example.metadata[:js]
+      allow_any_instance_of(Paperclip::Attachment).to receive(:post_process)
+      allow(Paperclip).to receive(:run).and_return('100x100')
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-support
 version: !ruby/object:Gem::Version
-  version: 15.1.2
+  version: 15.4.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.1.2
+        version: 15.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.1.2
+        version: 15.4.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +201,7 @@ files:
 - pageflow/dummy.rb
 - pageflow/dummy/app.rb
 - pageflow/dummy/config/pageflow.rb
+- pageflow/dummy/exit_on_failure_patch.rb
 - pageflow/dummy/rails_template.rb
 - pageflow/dummy/templates/add_custom_fields.rb
 - pageflow/dummy/templates/create_test_multi_attachment_file.rb
@@ -223,6 +224,7 @@ files:
 - pageflow/matchers/have_meta_tag.rb
 - pageflow/rails_version.rb
 - pageflow/render_page_test_helper.rb
+- pageflow/shared_contexts/fake_translations.rb
 - pageflow/support.rb
 - pageflow/support/config/capybara.rb
 - pageflow/support/config/paperclip.rb
@@ -249,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Spec support for Pageflow extensions.