test_w3c.rb in nanoc-3.5.0b1

- old
+ new
@@ -4,44 +4,38 @@
 
   include Nanoc::TestHelpers
 
   def test_simple
     if_have 'w3c_validators' do
-      # Create some sample files
-      %w{ foo bar baz }.each do |filename|
-        %w{ xxx yyy }.each do |extension|
-          File.open("#{filename}.#{extension}", 'w') { |io| io.write("hello") }
+      with_site do |site|
+        # Create some sample files
+        %w{ foo bar baz }.each do |filename|
+          %w{ xxx yyy }.each do |extension|
+            File.open("output/#{filename}.#{extension}", 'w') { |io| io.write("hello") }
+          end
         end
-      end
 
-      # Create validator
-      w3c = Nanoc::Extra::Validators::W3C.new('.', [ :xxx ])
+        # Create validator
+        w3c = Nanoc::Extra::Validators::W3C.new('.', [ :html ])
 
-      # Configure expectations
-      validator_result = mock
-      validator_result.expects(:errors).times(3)
-      validator = mock
-      validator.expects(:validate_file).times(3).returns(validator_result)
-      w3c.expects(:types_to_extensions).with([ :xxx ]).returns([ 'xxx' ])
-      w3c.expects(:validator_for).with('xxx').times(3).returns(validator)
-      w3c.expects(:validation_started).times(3)
-      w3c.expects(:validation_ended).times(3)
-
-      # Run
-      w3c.run
+        # Run
+        w3c.run
+      end
     end
   end
 
   def test_with_unknown_types
     if_have 'w3c_validators' do
-      # Create validator
-      w3c = Nanoc::Extra::Validators::W3C.new('.', [ :foo ])
+      with_site do |site|
+        # Create validator
+        w3c = Nanoc::Extra::Validators::W3C.new('.', [ :foo ])
 
-      # Test
-      exception = assert_raises RuntimeError do
-        w3c.run
+        # Test
+        exception = assert_raises Nanoc::Errors::GenericTrivial do
+          w3c.run
+        end
+        assert_equal 'unknown type(s) specified: foo', exception.message
       end
-      assert_equal 'unknown type: foo', exception.message
     end
   end
 
 end