nanoc 4.7.6 → 4.7.7

data/spec/nanoc/base/services/compiler/stages/compile_reps_spec.rb

@@ -26,7 +26,7 @@ describe Nanoc::Int::Compiler::Stages::CompileReps do
   let(:snapshot_repo) { Nanoc::Int::SnapshotRepo.new }
 
   let(:outdatedness_store) { Nanoc::Int::OutdatednessStore.new(site: site, reps: reps) }
-  let(:dependency_store) { Nanoc::Int::DependencyStore.new(items.to_a) }
+  let(:dependency_store) { Nanoc::Int::DependencyStore.new(items, layouts) }
 
   let(:rep) { Nanoc::Int::ItemRep.new(item, :default) }
   let(:item) { Nanoc::Int::Item.new('<%= 1 + 2 %>', {}, '/hi.md') }
@@ -43,9 +43,12 @@ describe Nanoc::Int::Compiler::Stages::CompileReps do
   end
 
   let(:config) { Nanoc::Int::Configuration.new.with_defaults }
-  let(:layouts) { [] }
   let(:code_snippets) { [] }
 
+  let(:layouts) do
+    Nanoc::Int::IdentifiableCollection.new(config)
+  end
+
   let(:items) do
     Nanoc::Int::IdentifiableCollection.new(
       config,

data/spec/nanoc/base/services/dependency_tracker_spec.rb

@@ -1,12 +1,18 @@
 describe Nanoc::Int::DependencyTracker do
   let(:tracker) { described_class.new(store) }
 
-  let(:store) { Nanoc::Int::DependencyStore.new([]) }
+  let(:store) { Nanoc::Int::DependencyStore.new(empty_identifiable_collection, empty_identifiable_collection) }
 
   let(:item_a) { Nanoc::Int::Item.new('a', {}, '/a.md') }
   let(:item_b) { Nanoc::Int::Item.new('b', {}, '/b.md') }
   let(:item_c) { Nanoc::Int::Item.new('c', {}, '/c.md') }
 
+  let(:empty_identifiable_collection) do
+    Nanoc::Int::IdentifiableCollection.new(config)
+  end
+
+  let(:config) { Nanoc::Int::Configuration.new.with_defaults }
+
   shared_examples 'a null dependency tracker' do
     let(:tracker) { Nanoc::Int::DependencyTracker::Null.new }
 

data/spec/nanoc/base/services/outdatedness_checker_spec.rb

@@ -13,10 +13,11 @@ describe Nanoc::Int::OutdatednessChecker do
   let(:checksum_store) { double(:checksum_store) }
 
   let(:dependency_store) do
-    Nanoc::Int::DependencyStore.new(objects)
+    Nanoc::Int::DependencyStore.new(items, layouts)
   end
 
-  let(:objects) { [item] }
+  let(:items) { Nanoc::Int::IdentifiableCollection.new(config, [item]) }
+  let(:layouts) { Nanoc::Int::IdentifiableCollection.new(config) }
 
   let(:site) do
     Nanoc::Int::Site.new(
@@ -49,8 +50,6 @@ describe Nanoc::Int::OutdatednessChecker do
   let(:item_rep) { Nanoc::Int::ItemRep.new(item, :default) }
   let(:item) { Nanoc::Int::Item.new('stuff', {}, '/foo.md') }
 
-  let(:objects) { [item] }
-
   before do
     reps << item_rep
     action_sequence_store[item_rep] = old_action_sequence_for_item_rep.serialize
@@ -59,7 +58,7 @@ describe Nanoc::Int::OutdatednessChecker do
   describe 'basic outdatedness reasons' do
     subject { outdatedness_checker.send(:basic).outdatedness_status_for(obj).reasons.first }
 
-    let(:checksum_store) { Nanoc::Int::ChecksumStore.new(objects: objects) }
+    let(:checksum_store) { Nanoc::Int::ChecksumStore.new(objects: items.to_a + layouts.to_a) }
 
     let(:config) { Nanoc::Int::Configuration.new }
 
@@ -114,14 +113,14 @@ describe Nanoc::Int::OutdatednessChecker do
   describe '#outdated_due_to_dependencies?' do
     subject { outdatedness_checker.send(:outdated_due_to_dependencies?, item) }
 
-    let(:checksum_store) { Nanoc::Int::ChecksumStore.new(objects: objects) }
+    let(:checksum_store) { Nanoc::Int::ChecksumStore.new(objects: items.to_a + layouts.to_a) }
 
     let(:other_item) { Nanoc::Int::Item.new('other stuff', {}, '/other.md') }
     let(:other_item_rep) { Nanoc::Int::ItemRep.new(other_item, :default) }
 
     let(:config) { Nanoc::Int::Configuration.new }
 
-    let(:objects) { [item, other_item] }
+    let(:items) { Nanoc::Int::IdentifiableCollection.new(config, [item, other_item]) }
 
     let(:old_action_sequence_for_other_item_rep) do
       Nanoc::Int::ActionSequence.new(other_item_rep).tap do |seq|

data/spec/nanoc/base/services/outdatedness_rules_spec.rb

@@ -32,11 +32,12 @@ describe Nanoc::Int::OutdatednessRules do
 
     let(:action_sequences) { {} }
     let(:reps) { Nanoc::Int::ItemRepRepo.new }
-    let(:dependency_store) { Nanoc::Int::DependencyStore.new(dependency_store_objects) }
+    let(:dependency_store) { Nanoc::Int::DependencyStore.new(items, layouts) }
     let(:action_sequence_store) { Nanoc::Int::ActionSequenceStore.new }
     let(:checksum_store) { Nanoc::Int::ChecksumStore.new(objects: objects) }
 
-    let(:dependency_store_objects) { [item] }
+    let(:items) { Nanoc::Int::IdentifiableCollection.new(config, [item]) }
+    let(:layouts) { Nanoc::Int::IdentifiableCollection.new(config) }
 
     before do
       allow(site).to receive(:code_snippets).and_return(code_snippets)
@@ -332,60 +333,6 @@ describe Nanoc::Int::OutdatednessRules do
       end
     end
 
-    context 'PathsModified' do
-      let(:rule_class) { Nanoc::Int::OutdatednessRules::PathsModified }
-
-      let(:action_sequences) { { item_rep => new_mem } }
-
-      context 'old mem does not exist' do
-        let(:new_mem) do
-          Nanoc::Int::ActionSequence.new(item_rep).tap do |mem|
-            mem.add_snapshot(:donkey, '/foo.md')
-            mem.add_filter(:asdf, {})
-          end
-        end
-
-        it { is_expected.to be }
-      end
-
-      context 'old mem exists' do
-        let(:old_mem) do
-          Nanoc::Int::ActionSequence.new(item_rep).tap do |mem|
-            mem.add_filter(:erb, {})
-            mem.add_snapshot(:donkey, '/foo.md')
-          end
-        end
-
-        before do
-          action_sequence_store[item_rep] = old_mem.serialize
-        end
-
-        context 'paths in memory are the same' do
-          let(:new_mem) do
-            Nanoc::Int::ActionSequence.new(item_rep).tap do |mem|
-              mem.add_snapshot(:donkey, '/foo.md')
-              mem.add_filter(:asdf, {})
-            end
-          end
-
-          it { is_expected.not_to be }
-        end
-
-        context 'paths in memory are different' do
-          let(:new_mem) do
-            Nanoc::Int::ActionSequence.new(item_rep).tap do |mem|
-              mem.add_filter(:erb, {})
-              mem.add_snapshot(:donkey, '/foo.md')
-              mem.add_filter(:donkey, {})
-              mem.add_snapshot(:giraffe, '/bar.md')
-            end
-          end
-
-          it { is_expected.to be }
-        end
-      end
-    end
-
     describe '#{Content,Attributes}Modified' do
       subject do
         [

data/spec/nanoc/base/views/document_view_spec.rb

@@ -12,9 +12,15 @@ shared_examples 'a document view' do
   end
 
   let(:dependency_tracker) { Nanoc::Int::DependencyTracker.new(dependency_store) }
-  let(:dependency_store) { Nanoc::Int::DependencyStore.new([]) }
+  let(:dependency_store) { Nanoc::Int::DependencyStore.new(empty_identifiable_collection, empty_identifiable_collection) }
   let(:base_item) { Nanoc::Int::Item.new('base', {}, '/base.md') }
 
+  let(:empty_identifiable_collection) do
+    Nanoc::Int::IdentifiableCollection.new(config)
+  end
+
+  let(:config) { Nanoc::Int::Configuration.new.with_defaults }
+
   before do
     dependency_tracker.enter(base_item)
   end

data/spec/nanoc/base/views/item_rep_view_spec.rb

@@ -15,9 +15,15 @@ describe Nanoc::ItemRepView do
   let(:snapshot_repo) { Nanoc::Int::SnapshotRepo.new }
 
   let(:dependency_tracker) { Nanoc::Int::DependencyTracker.new(dependency_store) }
-  let(:dependency_store) { Nanoc::Int::DependencyStore.new([]) }
+  let(:dependency_store) { Nanoc::Int::DependencyStore.new(empty_identifiable_collection, empty_identifiable_collection) }
   let(:base_item) { Nanoc::Int::Item.new('base', {}, '/base.md') }
 
+  let(:empty_identifiable_collection) do
+    Nanoc::Int::IdentifiableCollection.new(config)
+  end
+
+  let(:config) { Nanoc::Int::Configuration.new.with_defaults }
+
   before do
     dependency_tracker.enter(base_item)
   end

data/spec/nanoc/base/views/item_view_spec.rb

@@ -16,12 +16,18 @@ describe Nanoc::ItemWithRepsView do
   let(:reps) { [] }
   let(:items) { [] }
   let(:dependency_tracker) { Nanoc::Int::DependencyTracker.new(dependency_store) }
-  let(:dependency_store) { Nanoc::Int::DependencyStore.new([]) }
+  let(:dependency_store) { Nanoc::Int::DependencyStore.new(empty_identifiable_collection, empty_identifiable_collection) }
   let(:compilation_context) { double(:compilation_context) }
   let(:snapshot_repo) { Nanoc::Int::SnapshotRepo.new }
 
   let(:base_item) { Nanoc::Int::Item.new('base', {}, '/base.md') }
 
+  let(:empty_identifiable_collection) do
+    Nanoc::Int::IdentifiableCollection.new(config)
+  end
+
+  let(:config) { Nanoc::Int::Configuration.new.with_defaults }
+
   before do
     dependency_tracker.enter(base_item)
   end

data/spec/nanoc/cli/commands/compile/diff_generator_spec.rb

@@ -0,0 +1,44 @@
+describe Nanoc::CLI::Commands::CompileListeners::DiffGenerator do
+  describe '.enable_for?' do
+    subject { described_class.enable_for?(command_runner) }
+
+    let(:options) { {} }
+    let(:config_hash) { {} }
+
+    let(:arguments) { double(:arguments) }
+    let(:command) { double(:command) }
+
+    let(:site) do
+      Nanoc::Int::Site.new(
+        config: config,
+        code_snippets: code_snippets,
+        data_source: Nanoc::Int::InMemDataSource.new(items, layouts),
+      )
+    end
+
+    let(:config) { Nanoc::Int::Configuration.new(hash: config_hash).with_defaults }
+    let(:items) { [] }
+    let(:layouts) { [] }
+    let(:code_snippets) { [] }
+
+    let(:command_runner) do
+      Nanoc::CLI::Commands::Compile.new(options, arguments, command).tap do |cr|
+        cr.site = site
+      end
+    end
+
+    context 'default' do
+      it { is_expected.not_to be }
+    end
+
+    context 'enabled in config' do
+      let(:config_hash) { { enable_output_diff: true } }
+      it { is_expected.to be }
+    end
+
+    context 'enabled on command line' do
+      let(:options) { { diff: true } }
+      it { is_expected.to be }
+    end
+  end
+end

data/spec/nanoc/cli/commands/show_data_spec.rb

@@ -28,11 +28,7 @@ describe Nanoc::CLI::Commands::ShowData, stdio: true do
     let(:config) { Nanoc::Int::Configuration.new }
 
     let(:dependency_store) do
-      Nanoc::Int::DependencyStore.new(objects)
-    end
-
-    let(:objects) do
-      items.to_a + layouts.to_a
+      Nanoc::Int::DependencyStore.new(items, layouts)
     end
 
     let(:layouts) do

data/spec/nanoc/integration/compile_command_spec.rb

@@ -0,0 +1,31 @@
+describe 'Compile command', site: true, stdio: true do
+  describe 'diff generation' do
+    before do
+      File.write('content/foo.md', "I am foo!\n")
+
+      File.write('Rules', <<EOS)
+compile '/foo.*' do
+  write '/foo.html'
+end
+EOS
+    end
+
+    it 'does not generate diff by default' do
+      FileUtils.mkdir_p('output')
+      File.write('output/foo.html', "I am old foo!\n")
+
+      Nanoc::CLI.run(%w[compile])
+
+      expect(File.file?('output.diff')).not_to be
+    end
+
+    it 'honors --diff' do
+      FileUtils.mkdir_p('output')
+      File.write('output/foo.html', "I am old foo!\n")
+
+      Nanoc::CLI.run(%w[compile --diff])
+
+      expect(File.file?('output.diff')).to be
+    end
+  end
+end

data/test/base/test_dependency_tracker.rb

@@ -2,242 +2,262 @@ require 'helper'
 
 class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
   def test_initialize
-    # Mock items
-    items = [
+    # Mock objects
+    config = Nanoc::Int::Configuration.new.with_defaults
+    layouts = Nanoc::Int::IdentifiableCollection.new(config)
+    items = Nanoc::Int::IdentifiableCollection.new(config, [
       Nanoc::Int::Item.new('a', {}, '/a.md'),
       Nanoc::Int::Item.new('b', {}, '/b.md'),
-    ]
+    ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items)
+    store = Nanoc::Int::DependencyStore.new(items, layouts)
 
     # Verify no dependencies yet
-    assert_empty store.objects_causing_outdatedness_of(items[0])
-    assert_empty store.objects_causing_outdatedness_of(items[1])
+    assert_empty store.objects_causing_outdatedness_of(items.to_a[0])
+    assert_empty store.objects_causing_outdatedness_of(items.to_a[1])
   end
 
   def test_record_dependency
-    # Mock items
-    items = [
+    # Mock objects
+    config = Nanoc::Int::Configuration.new.with_defaults
+    layouts = Nanoc::Int::IdentifiableCollection.new(config)
+    items = Nanoc::Int::IdentifiableCollection.new(config, [
       Nanoc::Int::Item.new('a', {}, '/a.md'),
       Nanoc::Int::Item.new('b', {}, '/b.md'),
-    ]
+    ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items)
+    store = Nanoc::Int::DependencyStore.new(items, layouts)
 
     # Record some dependencies
-    store.record_dependency(items[0], items[1])
+    store.record_dependency(items.to_a[0], items.to_a[1])
 
     # Verify dependencies
-    assert_contains_exactly [items[1]], store.objects_causing_outdatedness_of(items[0])
+    assert_contains_exactly [items.to_a[1]], store.objects_causing_outdatedness_of(items.to_a[0])
   end
 
   def test_record_dependency_no_self
-    # Mock items
-    items = [
+    # Mock objects
+    config = Nanoc::Int::Configuration.new.with_defaults
+    layouts = Nanoc::Int::IdentifiableCollection.new(config)
+    items = Nanoc::Int::IdentifiableCollection.new(config, [
       Nanoc::Int::Item.new('a', {}, '/a.md'),
       Nanoc::Int::Item.new('b', {}, '/b.md'),
-    ]
+    ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items)
+    store = Nanoc::Int::DependencyStore.new(items, layouts)
 
     # Record some dependencies
-    store.record_dependency(items[0], items[0])
-    store.record_dependency(items[0], items[1])
+    store.record_dependency(items.to_a[0], items.to_a[0])
+    store.record_dependency(items.to_a[0], items.to_a[1])
 
     # Verify dependencies
-    assert_contains_exactly [items[1]], store.objects_causing_outdatedness_of(items[0])
+    assert_contains_exactly [items.to_a[1]], store.objects_causing_outdatedness_of(items.to_a[0])
   end
 
   def test_record_dependency_no_doubles
-    # Mock items
-    items = [
+    # Mock objects
+    config = Nanoc::Int::Configuration.new.with_defaults
+    layouts = Nanoc::Int::IdentifiableCollection.new(config)
+    items = Nanoc::Int::IdentifiableCollection.new(config, [
       Nanoc::Int::Item.new('a', {}, '/a.md'),
       Nanoc::Int::Item.new('b', {}, '/b.md'),
-    ]
+    ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items)
+    store = Nanoc::Int::DependencyStore.new(items, layouts)
 
     # Record some dependencies
-    store.record_dependency(items[0], items[1])
-    store.record_dependency(items[0], items[1])
-    store.record_dependency(items[0], items[1])
+    store.record_dependency(items.to_a[0], items.to_a[1])
+    store.record_dependency(items.to_a[0], items.to_a[1])
+    store.record_dependency(items.to_a[0], items.to_a[1])
 
     # Verify dependencies
-    assert_contains_exactly [items[1]], store.objects_causing_outdatedness_of(items[0])
+    assert_contains_exactly [items.to_a[1]], store.objects_causing_outdatedness_of(items.to_a[0])
   end
 
   def test_objects_causing_outdatedness_of
-    # Mock items
-    items = [
+    # Mock objects
+    config = Nanoc::Int::Configuration.new.with_defaults
+    layouts = Nanoc::Int::IdentifiableCollection.new(config)
+    items = Nanoc::Int::IdentifiableCollection.new(config, [
       Nanoc::Int::Item.new('a', {}, '/a.md'),
       Nanoc::Int::Item.new('b', {}, '/b.md'),
       Nanoc::Int::Item.new('c', {}, '/c.md'),
-    ]
+    ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items)
+    store = Nanoc::Int::DependencyStore.new(items, layouts)
 
     # Record some dependencies
-    store.record_dependency(items[0], items[1])
-    store.record_dependency(items[1], items[2])
+    store.record_dependency(items.to_a[0], items.to_a[1])
+    store.record_dependency(items.to_a[1], items.to_a[2])
 
     # Verify dependencies
-    assert_contains_exactly [items[1]], store.objects_causing_outdatedness_of(items[0])
+    assert_contains_exactly [items.to_a[1]], store.objects_causing_outdatedness_of(items.to_a[0])
   end
 
   def test_store_graph_and_load_graph_simple
-    # Mock items
-    items = [
+    # Mock objects
+    config = Nanoc::Int::Configuration.new.with_defaults
+    layouts = Nanoc::Int::IdentifiableCollection.new(config)
+    items = Nanoc::Int::IdentifiableCollection.new(config, [
       Nanoc::Int::Item.new('a', {}, '/a.md'),
       Nanoc::Int::Item.new('b', {}, '/b.md'),
       Nanoc::Int::Item.new('c', {}, '/c.md'),
       Nanoc::Int::Item.new('d', {}, '/d.md'),
-    ]
+    ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items)
+    store = Nanoc::Int::DependencyStore.new(items, layouts)
 
     # Record some dependencies
-    store.record_dependency(items[0], items[1])
-    store.record_dependency(items[1], items[2])
-    store.record_dependency(items[1], items[3])
+    store.record_dependency(items.to_a[0], items.to_a[1])
+    store.record_dependency(items.to_a[1], items.to_a[2])
+    store.record_dependency(items.to_a[1], items.to_a[3])
 
     # Store
     store.store
     assert File.file?(store.filename)
 
     # Re-create
-    store = Nanoc::Int::DependencyStore.new(items)
+    store = Nanoc::Int::DependencyStore.new(items, layouts)
 
     # Load
     store.load
 
     # Check loaded graph
-    assert_contains_exactly [items[1]],           store.objects_causing_outdatedness_of(items[0])
-    assert_contains_exactly [items[2], items[3]], store.objects_causing_outdatedness_of(items[1])
-    assert_empty store.objects_causing_outdatedness_of(items[2])
-    assert_empty store.objects_causing_outdatedness_of(items[3])
+    assert_contains_exactly [items.to_a[1]], store.objects_causing_outdatedness_of(items.to_a[0])
+    assert_contains_exactly [items.to_a[2], items.to_a[3]], store.objects_causing_outdatedness_of(items.to_a[1])
+    assert_empty store.objects_causing_outdatedness_of(items.to_a[2])
+    assert_empty store.objects_causing_outdatedness_of(items.to_a[3])
   end
 
   def test_store_graph_and_load_graph_with_removed_items
-    # Mock items
-    items = [
+    # Mock objects
+    config = Nanoc::Int::Configuration.new.with_defaults
+    layouts = Nanoc::Int::IdentifiableCollection.new(config)
+    items = Nanoc::Int::IdentifiableCollection.new(config, [
       Nanoc::Int::Item.new('a', {}, '/a.md'),
       Nanoc::Int::Item.new('b', {}, '/b.md'),
       Nanoc::Int::Item.new('c', {}, '/c.md'),
       Nanoc::Int::Item.new('d', {}, '/d.md'),
-    ]
+    ])
 
     # Create new and old lists
-    old_items = [items[0], items[1], items[2], items[3]]
-    new_items = [items[0], items[1], items[2]]
+    old_items = Nanoc::Int::IdentifiableCollection.new(config, [items.to_a[0], items.to_a[1], items.to_a[2], items.to_a[3]])
+    new_items = Nanoc::Int::IdentifiableCollection.new(config, [items.to_a[0], items.to_a[1], items.to_a[2]])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(old_items)
+    store = Nanoc::Int::DependencyStore.new(old_items, layouts)
 
     # Record some dependencies
-    store.record_dependency(old_items[0], old_items[1])
-    store.record_dependency(old_items[1], old_items[2])
-    store.record_dependency(old_items[1], old_items[3])
+    store.record_dependency(items.to_a[0], items.to_a[1])
+    store.record_dependency(items.to_a[1], items.to_a[2])
+    store.record_dependency(items.to_a[1], items.to_a[3])
 
     # Store
     store.store
     assert File.file?(store.filename)
 
     # Re-create
-    store = Nanoc::Int::DependencyStore.new(new_items)
+    store = Nanoc::Int::DependencyStore.new(new_items, layouts)
 
     # Load
     store.load
 
     # Check loaded graph
-    assert_contains_exactly [items[1]],       store.objects_causing_outdatedness_of(items[0])
-    assert_contains_exactly [items[2], nil],  store.objects_causing_outdatedness_of(items[1])
-    assert_empty store.objects_causing_outdatedness_of(items[2])
+    assert_contains_exactly [items.to_a[1]],       store.objects_causing_outdatedness_of(items.to_a[0])
+    assert_contains_exactly [items.to_a[2], nil],  store.objects_causing_outdatedness_of(items.to_a[1])
+    assert_empty store.objects_causing_outdatedness_of(items.to_a[2])
   end
 
   def test_store_graph_with_nils_in_dst
-    # Mock items
-    items = [
+    # Mock objects
+    config = Nanoc::Int::Configuration.new.with_defaults
+    layouts = Nanoc::Int::IdentifiableCollection.new(config)
+    items = Nanoc::Int::IdentifiableCollection.new(config, [
       Nanoc::Int::Item.new('a', {}, '/a.md'),
       Nanoc::Int::Item.new('b', {}, '/b.md'),
       Nanoc::Int::Item.new('c', {}, '/c.md'),
-    ]
+    ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items)
+    store = Nanoc::Int::DependencyStore.new(items, layouts)
 
     # Record some dependencies
-    store.record_dependency(items[0], items[1])
-    store.record_dependency(items[1], nil)
+    store.record_dependency(items.to_a[0], items.to_a[1])
+    store.record_dependency(items.to_a[1], nil)
 
     # Store
     store.store
     assert File.file?(store.filename)
 
     # Re-create
-    store = Nanoc::Int::DependencyStore.new(items)
+    store = Nanoc::Int::DependencyStore.new(items, layouts)
 
     # Load
     store.load
 
     # Check loaded graph
-    assert_contains_exactly [items[1]], store.objects_causing_outdatedness_of(items[0])
-    assert_contains_exactly [nil],      store.objects_causing_outdatedness_of(items[1])
+    assert_contains_exactly [items.to_a[1]], store.objects_causing_outdatedness_of(items.to_a[0])
+    assert_contains_exactly [nil], store.objects_causing_outdatedness_of(items.to_a[1])
   end
 
   def test_store_graph_with_nils_in_src
-    # Mock items
-    items = [
+    # Mock objects
+    config = Nanoc::Int::Configuration.new.with_defaults
+    layouts = Nanoc::Int::IdentifiableCollection.new(config)
+    items = Nanoc::Int::IdentifiableCollection.new(config, [
       Nanoc::Int::Item.new('a', {}, '/a.md'),
       Nanoc::Int::Item.new('b', {}, '/b.md'),
       Nanoc::Int::Item.new('c', {}, '/c.md'),
-    ]
+    ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items)
+    store = Nanoc::Int::DependencyStore.new(items, layouts)
 
     # Record some dependencies
-    store.record_dependency(items[0], items[1])
-    store.record_dependency(nil,      items[2])
+    store.record_dependency(items.to_a[0], items.to_a[1])
+    store.record_dependency(nil, items.to_a[2])
 
     # Store
     store.store
     assert File.file?(store.filename)
 
     # Re-create
-    store = Nanoc::Int::DependencyStore.new(items)
+    store = Nanoc::Int::DependencyStore.new(items, layouts)
 
     # Load
     store.load
 
     # Check loaded graph
-    assert_contains_exactly [items[1]], store.objects_causing_outdatedness_of(items[0])
-    assert_empty store.objects_causing_outdatedness_of(items[1])
+    assert_contains_exactly [items.to_a[1]], store.objects_causing_outdatedness_of(items.to_a[0])
+    assert_empty store.objects_causing_outdatedness_of(items.to_a[1])
   end
 
   def test_forget_dependencies_for
-    # Mock items
-    items = [
+    # Mock objects
+    config = Nanoc::Int::Configuration.new.with_defaults
+    layouts = Nanoc::Int::IdentifiableCollection.new(config)
+    items = Nanoc::Int::IdentifiableCollection.new(config, [
       Nanoc::Int::Item.new('a', {}, '/a.md'),
       Nanoc::Int::Item.new('b', {}, '/b.md'),
       Nanoc::Int::Item.new('c', {}, '/c.md'),
-    ]
+    ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items)
+    store = Nanoc::Int::DependencyStore.new(items, layouts)
 
     # Record some dependencies
-    store.record_dependency(items[0], items[1])
-    store.record_dependency(items[1], items[2])
-    assert_contains_exactly [items[1]], store.objects_causing_outdatedness_of(items[0])
+    store.record_dependency(items.to_a[0], items.to_a[1])
+    store.record_dependency(items.to_a[1], items.to_a[2])
+    assert_contains_exactly [items.to_a[1]], store.objects_causing_outdatedness_of(items.to_a[0])
 
     # Forget dependencies
-    store.forget_dependencies_for(items[0])
-    assert_empty store.objects_causing_outdatedness_of(items[0])
+    store.forget_dependencies_for(items.to_a[0])
+    assert_empty store.objects_causing_outdatedness_of(items.to_a[0])
   end
 end