test/data_sources/test_filesystem.rb in nanoc-4.4.4 vs test/data_sources/test_filesystem.rb in nanoc-4.4.5

@@ -133,11 +133,11 @@
     # Create sample files
     FileUtils.mkdir_p('foo')
     File.open('foo/stuff.dat', 'w') { |io| io.write('random binary data') }
 
     # Load
-    assert_raises(RuntimeError) do
+    assert_raises(Nanoc::DataSources::Filesystem::Errors::BinaryLayout) do
       data_source.send(:load_objects, 'foo', Nanoc::Int::Layout)
     end
   end
 
   def test_identifier_for_filename_with_full_style_identifier
@@ -640,11 +640,11 @@
     %w(foo.html foo.xhtml foo.txt foo.yaml bar.html qux.yaml).each do |filename|
       File.open(filename, 'w') { |io| io.write('test') }
     end
 
     # Check
-    assert_raises RuntimeError do
+    assert_raises(Nanoc::DataSources::Filesystem::Errors::MultipleContentFiles) do
       data_source.send(:all_split_files_in, '.')
     end
   end
 
   def test_basename_of_allowing_periods_in_identifiers
@@ -827,11 +827,11 @@
 
     # Create data source
     data_source = Nanoc::DataSources::Filesystem.new(nil, nil, nil, nil)
 
     # Parse it
-    assert_raises(RuntimeError) do
+    assert_raises(Nanoc::DataSources::Filesystem::Errors::InvalidFormat) do
       data_source.instance_eval { parse('test.html', nil) }
     end
   end
 
   def test_parse_embedded_separators_but_not_metadata
@@ -979,21 +979,21 @@
 
     File.open('test.html', 'w') { |io| io.write(content) }
 
     data_source = Nanoc::DataSources::Filesystem.new(nil, nil, nil, nil)
 
-    assert_raises(Nanoc::DataSources::Filesystem::InvalidMetadataError) do
+    assert_raises(Nanoc::DataSources::Filesystem::Errors::InvalidMetadata) do
       data_source.instance_eval { parse('test.html', nil) }
     end
   end
 
   def test_parse_external_bad_metadata
     File.open('test.html', 'w') { |io| io.write('blah blah') }
     File.open('test.yaml', 'w') { |io| io.write('Hello world!') }
 
     data_source = Nanoc::DataSources::Filesystem.new(nil, nil, nil, nil)
 
-    assert_raises(Nanoc::DataSources::Filesystem::InvalidMetadataError) do
+    assert_raises(Nanoc::DataSources::Filesystem::Errors::InvalidMetadata) do
       data_source.instance_eval { parse('test.html', 'test.yaml') }
     end
   end
 end