test/data_sources/test_static.rb in nanoc-3.8.0 vs test/data_sources/test_static.rb in nanoc-4.0.0a1

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
 class Nanoc::DataSources::StaticTest < Nanoc::TestCase
   def new_data_source(params = nil)
     # Mock site
-    site = Nanoc::Site.new({})
+    site = Nanoc::Int::Site.new({})
 
     # Create data source
     data_source = Nanoc::DataSources::Static.new(site, nil, nil, params)
 
     # Done
@@ -35,11 +35,11 @@
     actual_filenames   = Nanoc::Extra::FilesystemTools.all_files_in('foo', nil).sort
     assert_equal expected_filenames, actual_filenames
 
     # Check items
     items = data_source.send(:items).sort_by(&:identifier)
-    actual_item_identifiers   = items.map(&:identifier).sort
+    actual_item_identifiers   = items.map(&:identifier).map(&:to_s).sort
     expected_item_identifiers = %w( /a.png/ /1/b.png/ /c.png/ ).sort
     assert_equal expected_item_identifiers, actual_item_identifiers
   end
 
   def test_items
@@ -53,41 +53,41 @@
     File.open('foo/b.c.css',   'w') { |io| io.write('more binary data') }
     File.open('foo/a/b/c.gif', 'w') { |io| io.write('yet more binary data') }
 
     # Get expected and actual output
     expected_out = [
-      Nanoc::Item.new(
+      Nanoc::Int::Item.new(
         'foo/bar.png',
         { extension: 'png', filename: 'foo/bar.png' },
         '/bar.png/',
         binary: true,
         mtime: File.mtime('foo/bar.png'),
-        checksum: Pathname.new('foo/bar.png').checksum
+        checksum: Pathname.new('foo/bar.png').__nanoc_checksum
       ),
-      Nanoc::Item.new(
+      Nanoc::Int::Item.new(
         'foo/b.c.css',
         { extension: 'css', filename: 'foo/b.c.css' },
         '/b.c.css/',
         binary: true,
         mtime: File.mtime('foo/b.c.css'),
-        checksum: Pathname.new('foo/b.c.css').checksum
+        checksum: Pathname.new('foo/b.c.css').__nanoc_checksum
       ),
-      Nanoc::Item.new(
+      Nanoc::Int::Item.new(
         'foo/a/b/c.gif',
         { extension: 'gif', filename: 'foo/a/b/c.gif' },
         '/a/b/c.gif/',
         binary: true,
         mtime: File.mtime('foo/a/b/c.gif'),
-        checksum: Pathname.new('foo/a/b/c.gif').checksum
+        checksum: Pathname.new('foo/a/b/c.gif').__nanoc_checksum
       )
     ].sort_by(&:identifier)
 
     actual_out = data_source.send(:items).sort_by(&:identifier)
 
     (0..expected_out.size - 1).each do |i|
       assert_equal expected_out[i].raw_content, actual_out[i].raw_content, 'content must match'
       assert_equal expected_out[i].identifier, actual_out[i].identifier, 'identifier must match'
-      assert_equal expected_out[i].mtime, actual_out[i].mtime, 'mtime must match'
+      assert_equal expected_out[i].attributes[:mtime], actual_out[i].attributes[:mtime], 'mtime must match'
       assert_equal expected_out[i].raw_filename, actual_out[i].raw_filename, 'file paths must match'
     end
   end
 end