Merge pull request #227 from rbuchberger/test-improvements

Test improvements
rbuchberger · Jan 10, 2021 · cae65d8 · cae65d8
2 parents e19ed21 + adf2954
commit cae65d8
Show file tree

Hide file tree

Showing 31 changed files with 284 additions and 267 deletions.
diff --git a/test/pestka.jpg → test/image_files/pestka.jpg b/test/pestka.jpg → test/image_files/pestka.jpg
diff --git a/test/rms with space.jpg → test/image_files/rms with space.jpg b/test/rms with space.jpg → test/image_files/rms with space.jpg
diff --git a/test/rms.gif → test/image_files/rms.gif b/test/rms.gif → test/image_files/rms.gif
diff --git a/test/rms.jp2 → test/image_files/rms.jp2 b/test/rms.jp2 → test/image_files/rms.jp2
diff --git a/test/rms.jpg → test/image_files/rms.jpg b/test/rms.jpg → test/image_files/rms.jpg
diff --git a/test/rms.png → test/image_files/rms.png b/test/rms.png → test/image_files/rms.png
diff --git a/test/rms.webp → test/image_files/rms.webp b/test/rms.webp → test/image_files/rms.webp
diff --git a/test/spx.jpg → test/image_files/spx.jpg b/test/spx.jpg → test/image_files/spx.jpg
diff --git a/test/stubs.rb b/test/stubs.rb
@@ -0,0 +1,3 @@
+require_relative 'stubs/presets'
+require_relative 'stubs/structs'
+require_relative 'stubs/jekyll'
diff --git a/test/stubs/jekyll.rb b/test/stubs/jekyll.rb
@@ -1,24 +1,7 @@
 # Tools to stub the jekyll and liquid interfaces
-module JekyllStub
-  ContextStub = Struct.new(:environments, :registers)
-  SiteStub = Struct.new(:config, :data, :source, :dest, :cache_dir)
-
-  def build_defaults
-    @widths = [25, 50, 100]
-    @pconfig = {}
-    @pdata = picture_data_stub
-
-    @jekyll_env = 'development'
-    @site_dest = '/tmp/jpt'
-    @jconfig = { 'picture' => @pconfig,
-                 'keep_files' => [],
-                 'destination' => @site_dest,
-                 'url' => 'example.com' }
-    @data = { 'picture' => @pdata }
-    @page = { 'ext' => 'html' }
-    @site_source = TestHelper::TEST_DIR
-    @cache_dir = '/tmp/jpt/cache'
-  end
+module Stubs
+  include Presets
+  include Structs
 
   def build_context_stub
     environments = [{ 'jekyll' => { 'environment' => @jekyll_env } }]
@@ -51,203 +34,7 @@ def stub_liquid_tag
   def stub_template_parsing
     template_stub = Object.new
     Liquid::Template.stubs(:parse).with do |params|
-      template_stub.define_singleton_method(:render) { |_context| params }
+      template_stub.stubs(:render).returns(params)
     end.returns(template_stub)
   end
-
-  def picture_data_stub
-    {
-      'presets' => {
-        'default' => {
-          'widths' => @widths
-        },
-
-        'auto' => {
-          'widths' => @widths,
-          'formats' => %w[webp original]
-        },
-
-        'data_auto' => {
-          'markup' => 'data_auto',
-          'widths' => @widths,
-          'formats' => %w[webp original]
-        },
-
-        'data_img' => {
-          'markup' => 'data_img',
-          'widths' => @widths
-        },
-
-        'data_picture' => {
-          'markup' => 'data_picture',
-          'widths' => @widths,
-          'formats' => %w[webp original]
-        },
-
-        'data_img_no_size' => {
-          'markup' => 'data_img',
-          'widths' => @widths,
-          'sizes' => {
-            'mobile' => '80vw'
-          },
-          'size' => '50%',
-          'data_sizes' => false
-        },
-
-        'data_img_yes_size' => {
-          'markup' => 'data_img',
-          'widths' => @widths,
-          'sizes' => {
-            'mobile' => '80vw'
-          },
-          'size' => '50%',
-          'data_sizes' => true
-        },
-
-        'direct_url' => {
-          'markup' => 'direct_url',
-          'fallback_width' => 100
-        },
-
-        'img' => {
-          'markup' => 'img',
-          'widths' => @widths
-        },
-
-        'naked_srcset' => {
-          'markup' => 'naked_srcset',
-          'widths' => @widths
-        },
-
-        'sizes' => {
-          'sizes' => {
-            'mobile' => '80vw'
-          },
-          'size' => '50%'
-        },
-
-        'pixel_ratio' => {
-          'base_width' => 10,
-          'pixel_ratios' => [1, 2, 3]
-        },
-
-        'attributes' => {
-          'formats' => %w[webp original],
-          'widths' => @widths,
-          'attributes' => {
-            'parent' => 'class="parent"',
-            'alt' => 'Alternate Text',
-            'a' => 'class="anchor"',
-            'picture' => 'data-awesomeness="11"',
-            'source' => 'class="source"',
-            'img' => 'class="img"'
-          }
-        },
-
-        'link_source' => {
-          'widths' => @widths,
-          'link_source' => true
-        },
-
-        'media_widths' => {
-          'widths' => @widths,
-          'media_widths' => {
-            'mobile' => [10, 20, 30]
-          }
-        },
-
-        'data_noscript' => {
-          'markup' => 'data_img',
-          'widths' => @widths,
-          'noscript' => true
-        },
-
-        'fallback' => {
-          'widths' => @widths,
-          'fallback_width' => 35,
-          'fallback_format' => 'webp'
-        },
-
-        'nomarkdown' => {
-          'widths' => @widths,
-          'nomarkdown' => true
-        },
-
-        'too_large' => {
-          'widths' => [400, 600, 800],
-          'fallback_width' => 800
-        },
-
-        'formats' => {
-          'widths' => [100],
-          'fallback_width' => 100,
-          'formats' => %w[jpg jp2 png webp gif]
-        },
-
-        'quality' => {
-          'widths' => [100],
-          'quality' => 30,
-          'format_quality' => {
-            'webp' => 45
-          }
-        },
-
-        'format_quality' => {
-          'widths' => [100],
-          'quality' => 30,
-          'format_quality' => {
-            'jpg' => 45
-          }
-        },
-
-        'calculated_quality' => {
-          'quality' => {
-            50 => 50,
-            100 => 100
-          }
-        },
-
-        'calculated_quality_reverse' => {
-          'quality' => {
-            100 => 100,
-            50 => 50
-          }
-        },
-
-        'crop' => {
-          'crop' => '3:2',
-          'media_crop' => {
-            'mobile' => '16:9'
-          },
-          'gravity' => 'north',
-          'media_gravity' => {
-            'mobile' => 'northwest'
-          }
-        },
-
-        'dimension_attributes' => {
-          'dimension_attributes' => true
-        },
-
-        'dimension_attributes_multiformat' => {
-          'dimension_attributes' => true,
-          'formats' => %w[original webp]
-        },
-
-        'dimension_attributes_replace_values' => {
-          'dimension_attributes' => true,
-          'attributes' => {
-            'img' => {
-              'height' => 'auto'
-            }
-          }
-
-        }
-      },
-
-      'media_queries' => {
-        'mobile' => 'max-width: 600px'
-      }
-    }
-  end
 end