Merge e39ba78 into 4dd7382

watermarkchurch · Jan 30, 2020 · 02b260a · 02b260a
2 parents 4dd7382 + e39ba78
commit 02b260a
Show file tree

Hide file tree

Showing 8 changed files with 576 additions and 177 deletions.
diff --git a/Dangerfile b/Dangerfile
@@ -23,4 +23,4 @@ unless declared_trivial
 end
 
 # Run all checks in WM plugin
-wcc.all(reek: false, rubocop: false)
+wcc.all(reek: false, rubocop_exceptions: false, jshint: false, commit_lint: false)
diff --git a/wcc-contentful/lib/wcc/contentful/store/base.rb b/wcc-contentful/lib/wcc/contentful/store/base.rb
@@ -115,7 +115,7 @@ def ensure_hash(val)
       raise ArgumentError, 'Value must be a Hash' unless val.is_a?(Hash)
     end
 
-    protected
+    private
 
     attr_reader :mutex
   end

diff --git a/wcc-contentful/lib/wcc/contentful/store/cdn_adapter.rb b/wcc-contentful/lib/wcc/contentful/store/cdn_adapter.rb
@@ -148,7 +148,7 @@ def response
       def resolve_includes(entry, depth)
         return entry unless entry && depth && depth > 0
 
-        WCC::Contentful::LinkVisitor.new(entry, :Link, :Asset, depth: depth).map! do |val|
+        WCC::Contentful::LinkVisitor.new(entry, :Link, :Asset, depth: depth - 1).map! do |val|
           resolve_link(val)
         end
       end