puppet 5.0.0 → 6.0.0

data/spec/unit/pops/parser/parse_basic_expressions_spec.rb

@@ -137,6 +137,7 @@ describe "egrammar parsing basic expressions" do
   context "When parsing unfold" do
     it "$a = *[1,2]" do; expect(dump(parse("$a = *[1,2]"))).to eq("(= $a (unfold ([] 1 2)))") ; end
     it "$a = *1"     do; expect(dump(parse("$a = *1"))).to eq("(= $a (unfold 1))") ; end
+    it "$a = *[1,a => 2]" do; expect(dump(parse("$a = *[1,a => 2]"))).to eq("(= $a (unfold ([] 1 ({} (a 2)))))") ; end
   end
 
   context "When parsing Lists" do
@@ -152,6 +153,26 @@ describe "egrammar parsing basic expressions" do
       expect(dump(parse("$a = [1,2,3]"))).to eq("(= $a ([] 1 2 3))")
     end
 
+    it "$a = [1,a => 2]" do
+      expect(dump(parse("$a = [1,a => 2]"))).to eq('(= $a ([] 1 ({} (a 2))))')
+    end
+
+    it "$a = [1,a => 2, 3]" do
+      expect(dump(parse("$a = [1,a => 2, 3]"))).to eq('(= $a ([] 1 ({} (a 2)) 3))')
+    end
+
+    it "$a = [1,a => 2, b => 3]" do
+      expect(dump(parse("$a = [1,a => 2, b => 3]"))).to eq('(= $a ([] 1 ({} (a 2) (b 3))))')
+    end
+
+    it "$a = [1,a => 2, b => 3, 4]" do
+      expect(dump(parse("$a = [1,a => 2, b => 3, 4]"))).to eq('(= $a ([] 1 ({} (a 2) (b 3)) 4))')
+    end
+
+    it "$a = [{ x => y }, a => 2, b => 3, { z => p }]" do
+      expect(dump(parse("$a = [{ x => y }, a => 2, b => 3, { z => p }]"))).to eq('(= $a ([] ({} (x y)) ({} (a 2) (b 3)) ({} (z p))))')
+    end
+
     it "[...[...[]]] should create nested arrays without trouble" do
       expect(dump(parse("$a = [1,[2.0, 2.1, [2.2]],[3.0, 3.1]]"))).to eq("(= $a ([] 1 ([] 2.0 2.1 ([] 2.2)) ([] 3.0 3.1)))")
     end
@@ -202,11 +223,45 @@ describe "egrammar parsing basic expressions" do
       expect(dump(parse("$a = [1,2,3][2]"))).to eq("(= $a (slice ([] 1 2 3) 2))")
     end
 
+    it '$a = [1, 2, 3][a => 2]' do
+      expect(dump(parse('$a = [1,2,3][a => 2]'))).to eq('(= $a (slice ([] 1 2 3) ({} (a 2))))')
+    end
+
     it "$a = {'a' => 1, 'b' => 2}['b']" do
       expect(dump(parse("$a = {'a'=>1,'b' =>2}[b]"))).to eq("(= $a (slice ({} ('a' 1) ('b' 2)) b))")
     end
   end
 
+  context 'When parsing type aliases' do
+    it 'type A = B' do
+      expect(dump(parse('type A = B'))).to eq('(type-alias A B)')
+    end
+
+    it 'type A = B[]' do
+      expect{parse('type A = B[]')}.to raise_error(/Syntax error at '\]'/)
+    end
+
+    it 'type A = B[,]' do
+      expect{parse('type A = B[,]')}.to raise_error(/Syntax error at ','/)
+    end
+
+    it 'type A = B[C]' do
+      expect(dump(parse('type A = B[C]'))).to eq('(type-alias A (slice B C))')
+    end
+
+    it 'type A = B[C,]' do
+      expect(dump(parse('type A = B[C,]'))).to eq('(type-alias A (slice B C))')
+    end
+
+    it 'type A = B[C,D]' do
+      expect(dump(parse('type A = B[C,D]'))).to eq('(type-alias A (slice B (C D)))')
+    end
+
+    it 'type A = B[C,D,]' do
+      expect(dump(parse('type A = B[C,D,]'))).to eq('(type-alias A (slice B (C D)))')
+    end
+  end
+
   context "When parsing assignments" do
     it "Should allow simple assignment" do
       expect(dump(parse("$a = 10"))).to eq("(= $a 10)")
@@ -250,6 +305,14 @@ describe "egrammar parsing basic expressions" do
       expect(dump(parse("$a = {'a'=>1,'b'=>2} != {'a'=>1,'b'=>2}"))).to eq("(= $a (!= ({} ('a' 1) ('b' 2)) ({} ('a' 1) ('b' 2))))")
     end
 
+    it "$a = 'a' => 1" do
+      expect{parse("$a = 'a' => 1")}.to raise_error(/Syntax error at '=>'/)
+    end
+
+    it "$a = { 'a' => 'b' => 1 }" do
+      expect{parse("$a = { 'a' => 'b' => 1 }")}.to raise_error(/Syntax error at '=>'/)
+    end
+
     it "calculates the text length of an empty hash" do
       expect(parse("{}").model.body.length).to eq(2)
       expect(parse("{ }").model.body.length).to eq(3)
@@ -276,11 +339,11 @@ describe "egrammar parsing basic expressions" do
 
   context "When parsing string interpolation" do
     it "should interpolate a bare word as a variable name, \"${var}\"" do
-      expect(dump(parse("$a = \"$var\""))).to eq("(= $a (cat '' (str $var) ''))")
+      expect(dump(parse("$a = \"$var\""))).to eq("(= $a (cat (str $var)))")
     end
 
     it "should interpolate a variable in a text expression, \"${$var}\"" do
-      expect(dump(parse("$a = \"${$var}\""))).to eq("(= $a (cat '' (str $var) ''))")
+      expect(dump(parse("$a = \"${$var}\""))).to eq("(= $a (cat (str $var)))")
     end
 
     it "should interpolate a variable, \"yo${var}yo\"" do
@@ -309,11 +372,11 @@ describe "egrammar parsing basic expressions" do
     end
 
     it "should interpolate interpolated expressions with a variable, \"yo${\"$var\"}yo\"" do
-      expect(dump(parse("$a = \"yo${\"$var\"}yo\""))).to eq("(= $a (cat 'yo' (str (cat '' (str $var) '')) 'yo'))")
+      expect(dump(parse("$a = \"yo${\"$var\"}yo\""))).to eq("(= $a (cat 'yo' (str (cat (str $var))) 'yo'))")
     end
 
     it "should interpolate interpolated expressions with an expression, \"yo${\"${$var+2}\"}yo\"" do
-      expect(dump(parse("$a = \"yo${\"${$var+2}\"}yo\""))).to eq("(= $a (cat 'yo' (str (cat '' (str (+ $var 2)) '')) 'yo'))")
+      expect(dump(parse("$a = \"yo${\"${$var+2}\"}yo\""))).to eq("(= $a (cat 'yo' (str (cat (str (+ $var 2)))) 'yo'))")
     end
   end
 end

data/spec/unit/pops/parser/parse_calls_spec.rb

@@ -30,6 +30,10 @@ describe "egrammar parsing function calls" do
         expect(dump(parse("notice {a => 2}"))).to eq("(invoke notice ({} ('a' 2)))")
       end
 
+      it 'notice a=>2' do
+        expect{parse('notice a => 2')}.to raise_error(/Syntax error at '=>'/)
+      end
+
       it "foo(bar,)" do
         expect(dump(parse("foo(bar,)"))).to eq("(invoke foo bar)")
       end
@@ -38,6 +42,26 @@ describe "egrammar parsing function calls" do
         expect(dump(parse("foo(bar,fum,)"))).to eq("(invoke foo bar fum)")
       end
 
+      it 'foo(a=>1)' do
+        expect(dump(parse('foo(a=>1)'))).to eq('(invoke foo ({} (a 1)))')
+      end
+
+      it 'foo(a=>1, b=>2)' do
+        expect(dump(parse('foo(a=>1, b=>2)'))).to eq('(invoke foo ({} (a 1) (b 2)))')
+      end
+
+      it 'foo({a=>1, b=>2})' do
+        expect(dump(parse('foo({a=>1, b=>2})'))).to eq('(invoke foo ({} (a 1) (b 2)))')
+      end
+
+      it 'foo({a=>1}, b=>2)' do
+        expect(dump(parse('foo({a=>1}, b=>2)'))).to eq('(invoke foo ({} (a 1)) ({} (b 2)))')
+      end
+
+      it 'foo(a=>1, {b=>2})' do
+        expect(dump(parse('foo(a=>1, {b=>2})'))).to eq('(invoke foo ({} (a 1)) ({} (b 2)))')
+      end
+
       it "notice fqdn_rand(30)" do
         expect(dump(parse("notice fqdn_rand(30)"))).to eq('(invoke notice (call fqdn_rand 30))')
       end
@@ -113,6 +137,10 @@ describe "egrammar parsing function calls" do
       expect(dump(parse("notice 42.type()"))).to eq('(invoke notice (call-method (. 42 type)))')
     end
 
+    it 'notice Hash.assert_type(a => 42)' do
+      expect(dump(parse('notice Hash.assert_type(a => 42)'))).to eq('(invoke notice (call-method (. Hash assert_type) ({} (a 42))))')
+    end
+
     it "notice 42.type(detailed)" do
       expect(dump(parse("notice 42.type(detailed)"))).to eq('(invoke notice (call-method (. 42 type) detailed))')
     end

data/spec/unit/pops/parser/parse_conditionals_spec.rb

@@ -114,6 +114,18 @@ describe "egrammar parsing conditionals" do
       "(= $a (? $b (:default => wat) (banana => fruit) (grape => berry)))"
       )
     end
+
+    it '1+2 ? 3 => yes' do
+      expect(dump(parse("1+2 ? 3 => yes"))).to eq(
+      "(? (+ 1 2) (3 => yes))"
+      )
+    end
+
+    it 'true and 1+2 ? 3 => yes' do
+      expect(dump(parse("true and 1+2 ? 3 => yes"))).to eq(
+      "(&& true (? (+ 1 2) (3 => yes)))"
+      )
+    end
   end
 
   context "When parsing case statements" do

data/spec/unit/pops/parser/parse_containers_spec.rb

@@ -88,7 +88,7 @@ describe "egrammar parsing containers" do
       it "class 'foo' {} # a string as class name" do
         # A common error is to put quotes around the class name, the parser should provide the error message at the right location
         # See PUP-7471
-        expect { parse("class 'foo' {}") }.to raise_error(/A quoted string is not valid as a name here at line 1:7/)
+        expect { parse("class 'foo' {}") }.to raise_error(/A quoted string is not valid as a name here \(line: 1, column: 7\)/)
       end
 
 

data/spec/unit/pops/parser/parse_functions_spec.rb

@@ -13,7 +13,7 @@ describe 'egrammar parsing function definitions' do
 
   context 'with return type' do
     it 'function foo() >> Integer { 1 }' do
-      expect(dump(parse('function foo() >> Integer { 1 }'))).to eq("(function foo (return_type integer) (block\n  1\n))")
+      expect(dump(parse('function foo() >> Integer { 1 }'))).to eq("(function foo (return_type Integer) (block\n  1\n))")
     end
   end
 end

data/spec/unit/pops/parser/parse_heredoc_spec.rb

@@ -66,7 +66,7 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated (cat 'Hello ' (str $name) ''))",
+      "  (sublocated (cat 'Hello ' (str $name)))",
       ")"
     ].join("\n"))
   end
@@ -79,7 +79,7 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated (cat 'Hello \\' (str $name) ''))",
+      "  (sublocated (cat 'Hello \\' (str $name)))",
       ")"
     ].join("\n"))
   end
@@ -92,7 +92,7 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated (cat 'Hello \\' (str $name) ''))",
+      "  (sublocated (cat 'Hello \\' (str $name)))",
       ")"
     ].join("\n"))
   end

data/spec/unit/pops/parser/parse_lambda_spec.rb

@@ -13,7 +13,7 @@ describe 'egrammar parsing lambda definitions' do
 
   context 'with return type' do
     it 'f() |$x| >> Integer { 1 }' do
-      expect(dump(parse('f() |$x| >> Integer { 1 }'))).to eq("(invoke f (lambda (parameters x) (return_type integer) (block\n  1\n)))")
+      expect(dump(parse('f() |$x| >> Integer { 1 }'))).to eq("(invoke f (lambda (parameters x) (return_type Integer) (block\n  1\n)))")
     end
   end
 end

data/spec/unit/pops/parser/parse_plan_spec.rb

@@ -0,0 +1,48 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/pops'
+require_relative 'parser_rspec_helper'
+
+describe "egrammar parsing of 'plan'" do
+  include ParserRspecHelper
+
+  context 'with --tasks' do
+    before(:each) do
+      Puppet[:tasks] = true
+    end
+
+    it "an empty body" do
+      expect(dump(parse("plan foo { }"))).to eq("(plan foo ())")
+    end
+
+    it "a non empty body" do
+      prog = <<-EPROG
+  plan foo {
+    $a = 10
+    $b = 20
+  }
+  EPROG
+      expect(dump(parse(prog))).to eq( [
+  "(plan foo (block",
+  "  (= $a 10)",
+  "  (= $b 20)",
+  "))",
+  ].join("\n"))
+    end
+
+    it "accepts parameters" do
+      s = "plan foo($p1 = 'yo', $p2) { }"
+      expect(dump(parse(s))).to eq("(plan foo (parameters (= p1 'yo') p2) ())")
+    end
+  end
+
+  context 'with --no-tasks' do
+    before(:each) do
+      Puppet[:tasks] = false
+    end
+
+    it "the keyword 'plan' is a name" do
+      expect(dump(parse("$a = plan"))).to eq("(= $a plan)")
+    end
+  end
+end

data/spec/unit/pops/parser/parse_resource_spec.rb

@@ -12,14 +12,14 @@ describe "egrammar parsing resource declarations" do
     ["File", "file"].each do |word|
       it "#{word} { 'title': }" do
         expect(dump(parse("#{word} { 'title': }"))).to eq([
-          "(resource file",
+          "(resource #{word}",
           "  ('title'))"
         ].join("\n"))
       end
 
       it "#{word} { 'title': path => '/somewhere', mode => '0777'}" do
         expect(dump(parse("#{word} { 'title': path => '/somewhere', mode => '0777'}"))).to eq([
-          "(resource file",
+          "(resource #{word}",
           "  ('title'",
           "    (path => '/somewhere')",
           "    (mode => '0777')))"
@@ -28,7 +28,7 @@ describe "egrammar parsing resource declarations" do
 
       it "#{word} { 'title': path => '/somewhere', }" do
         expect(dump(parse("#{word} { 'title': path => '/somewhere', }"))).to eq([
-          "(resource file",
+          "(resource #{word}",
           "  ('title'",
           "    (path => '/somewhere')))"
         ].join("\n"))
@@ -36,21 +36,21 @@ describe "egrammar parsing resource declarations" do
 
       it "#{word} { 'title': , }" do
         expect(dump(parse("#{word} { 'title': , }"))).to eq([
-          "(resource file",
+          "(resource #{word}",
           "  ('title'))"
         ].join("\n"))
       end
 
       it "#{word} { 'title': ; }" do
         expect(dump(parse("#{word} { 'title': ; }"))).to eq([
-          "(resource file",
+          "(resource #{word}",
           "  ('title'))"
         ].join("\n"))
       end
 
       it "#{word} { 'title': ; 'other_title': }" do
         expect(dump(parse("#{word} { 'title': ; 'other_title': }"))).to eq([
-          "(resource file",
+          "(resource #{word}",
           "  ('title')",
           "  ('other_title'))"
         ].join("\n"))
@@ -59,7 +59,7 @@ describe "egrammar parsing resource declarations" do
       # PUP-2898, trailing ';'
       it "#{word} { 'title': ; 'other_title': ; }" do
         expect(dump(parse("#{word} { 'title': ; 'other_title': ; }"))).to eq([
-          "(resource file",
+          "(resource #{word}",
           "  ('title')",
           "  ('other_title'))"
         ].join("\n"))
@@ -67,7 +67,7 @@ describe "egrammar parsing resource declarations" do
 
       it "#{word} { 'title1': path => 'x'; 'title2': path => 'y'}" do
         expect(dump(parse("#{word} { 'title1': path => 'x'; 'title2': path => 'y'}"))).to eq([
-          "(resource file",
+          "(resource #{word}",
           "  ('title1'",
           "    (path => 'x'))",
           "  ('title2'",
@@ -77,7 +77,7 @@ describe "egrammar parsing resource declarations" do
 
       it "#{word} { title: * => {mode => '0777'} }" do
         expect(dump(parse("#{word} { title: * => {mode => '0777'}}"))).to eq([
-          "(resource file",
+          "(resource #{word}",
           "  (title",
           "    (* => ({} (mode '0777')))))"
         ].join("\n"))
@@ -87,19 +87,19 @@ describe "egrammar parsing resource declarations" do
 
   context "When parsing (type based) resource defaults" do
     it "File {  }" do
-      expect(dump(parse("File { }"))).to eq("(resource-defaults file)")
+      expect(dump(parse("File { }"))).to eq("(resource-defaults File)")
     end
 
     it "File { mode => '0777' }" do
       expect(dump(parse("File { mode => '0777'}"))).to eq([
-        "(resource-defaults file",
+        "(resource-defaults File",
         "  (mode => '0777'))"
       ].join("\n"))
     end
 
     it "File { * => {mode => '0777'} } (even if validated to be illegal)" do
       expect(dump(parse("File { * => {mode => '0777'}}"))).to eq([
-        "(resource-defaults file",
+        "(resource-defaults File",
         "  (* => ({} (mode '0777'))))"
       ].join("\n"))
     end
@@ -107,12 +107,12 @@ describe "egrammar parsing resource declarations" do
 
   context "When parsing resource override" do
     it "File['x'] {  }" do
-      expect(dump(parse("File['x'] { }"))).to eq("(override (slice file 'x'))")
+      expect(dump(parse("File['x'] { }"))).to eq("(override (slice File 'x'))")
     end
 
     it "File['x'] { x => 1 }" do
       expect(dump(parse("File['x'] { x => 1}"))).to eq([
-        "(override (slice file 'x')",
+        "(override (slice File 'x')",
         "  (x => 1))"
         ].join("\n"))
     end
@@ -120,14 +120,14 @@ describe "egrammar parsing resource declarations" do
 
     it "File['x', 'y'] { x => 1 }" do
       expect(dump(parse("File['x', 'y'] { x => 1}"))).to eq([
-        "(override (slice file ('x' 'y'))",
+        "(override (slice File ('x' 'y'))",
         "  (x => 1))"
         ].join("\n"))
     end
 
     it "File['x'] { x => 1, y => 2 }" do
       expect(dump(parse("File['x'] { x => 1, y=> 2}"))).to eq([
-        "(override (slice file 'x')",
+        "(override (slice File 'x')",
         "  (x => 1)",
         "  (y => 2))"
         ].join("\n"))
@@ -135,14 +135,14 @@ describe "egrammar parsing resource declarations" do
 
     it "File['x'] { x +> 1 }" do
       expect(dump(parse("File['x'] { x +> 1}"))).to eq([
-        "(override (slice file 'x')",
+        "(override (slice File 'x')",
         "  (x +> 1))"
         ].join("\n"))
     end
 
     it "File['x'] { * => {mode => '0777'} } (even if validated to be illegal)" do
       expect(dump(parse("File['x'] { * => {mode => '0777'}}"))).to eq([
-        "(override (slice file 'x')",
+        "(override (slice File 'x')",
         "  (* => ({} (mode '0777'))))"
       ].join("\n"))
     end
@@ -173,28 +173,28 @@ describe "egrammar parsing resource declarations" do
 
     it "parses global defaults with @ (even if validated to be illegal)" do
       expect(dump(parse("@File { mode => '0777' }"))).to eq([
-        "(virtual-resource-defaults file",
+        "(virtual-resource-defaults File",
         "  (mode => '0777'))"
         ].join("\n"))
     end
 
     it "parses global defaults with @@ (even if validated to be illegal)" do
       expect(dump(parse("@@File { mode => '0777' }"))).to eq([
-        "(exported-resource-defaults file",
+        "(exported-resource-defaults File",
         "  (mode => '0777'))"
         ].join("\n"))
     end
 
     it "parses override with @ (even if validated to be illegal)" do
       expect(dump(parse("@File[foo] { mode => '0777' }"))).to eq([
-        "(virtual-override (slice file foo)",
+        "(virtual-override (slice File foo)",
         "  (mode => '0777'))"
         ].join("\n"))
     end
 
     it "parses override combined with @@ (even if validated to be illegal)" do
       expect(dump(parse("@@File[foo] { mode => '0777' }"))).to eq([
-        "(exported-override (slice file foo)",
+        "(exported-override (slice File foo)",
         "  (mode => '0777'))"
         ].join("\n"))
     end
@@ -253,19 +253,19 @@ describe "egrammar parsing resource declarations" do
 
   context "When parsing Relationships" do
     it "File[a] -> File[b]" do
-      expect(dump(parse("File[a] -> File[b]"))).to eq("(-> (slice file a) (slice file b))")
+      expect(dump(parse("File[a] -> File[b]"))).to eq("(-> (slice File a) (slice File b))")
     end
 
     it "File[a] <- File[b]" do
-      expect(dump(parse("File[a] <- File[b]"))).to eq("(<- (slice file a) (slice file b))")
+      expect(dump(parse("File[a] <- File[b]"))).to eq("(<- (slice File a) (slice File b))")
     end
 
     it "File[a] ~> File[b]" do
-      expect(dump(parse("File[a] ~> File[b]"))).to eq("(~> (slice file a) (slice file b))")
+      expect(dump(parse("File[a] ~> File[b]"))).to eq("(~> (slice File a) (slice File b))")
     end
 
     it "File[a] <~ File[b]" do
-      expect(dump(parse("File[a] <~ File[b]"))).to eq("(<~ (slice file a) (slice file b))")
+      expect(dump(parse("File[a] <~ File[b]"))).to eq("(<~ (slice File a) (slice File b))")
     end
 
     it "Should chain relationships" do
@@ -276,13 +276,13 @@ describe "egrammar parsing resource declarations" do
 
     it "Should chain relationships" do
       expect(dump(parse("File[a] -> File[b] ~> File[c] <- File[d] <~ File[e]"))).to eq(
-      "(<~ (<- (~> (-> (slice file a) (slice file b)) (slice file c)) (slice file d)) (slice file e))"
+      "(<~ (<- (~> (-> (slice File a) (slice File b)) (slice File c)) (slice File d)) (slice File e))"
       )
     end
 
     it "should create relationships between collects" do
       expect(dump(parse("File <| mode == 0644 |> -> File <| mode == 0755 |>"))).to eq(
-      "(-> (collect file\n  (<| |> (== mode 0644))) (collect file\n  (<| |> (== mode 0755))))"
+      "(-> (collect File\n  (<| |> (== mode 0644))) (collect File\n  (<| |> (== mode 0755))))"
       )
     end
   end
@@ -290,38 +290,38 @@ describe "egrammar parsing resource declarations" do
   context "When parsing collection" do
     context "of virtual resources" do
       it "File <| |>" do
-        expect(dump(parse("File <| |>"))).to eq("(collect file\n  (<| |>))")
+        expect(dump(parse("File <| |>"))).to eq("(collect File\n  (<| |>))")
       end
     end
 
     context "of exported resources" do
       it "File <<| |>>" do
-        expect(dump(parse("File <<| |>>"))).to eq("(collect file\n  (<<| |>>))")
+        expect(dump(parse("File <<| |>>"))).to eq("(collect File\n  (<<| |>>))")
       end
     end
 
     context "queries are parsed with correct precedence" do
       it "File <| tag == 'foo' |>" do
-        expect(dump(parse("File <| tag == 'foo' |>"))).to eq("(collect file\n  (<| |> (== tag 'foo')))")
+        expect(dump(parse("File <| tag == 'foo' |>"))).to eq("(collect File\n  (<| |> (== tag 'foo')))")
       end
 
       it "File <| tag == 'foo' and mode != '0777' |>" do
-        expect(dump(parse("File <| tag == 'foo' and mode != '0777' |>"))).to eq("(collect file\n  (<| |> (&& (== tag 'foo') (!= mode '0777'))))")
+        expect(dump(parse("File <| tag == 'foo' and mode != '0777' |>"))).to eq("(collect File\n  (<| |> (&& (== tag 'foo') (!= mode '0777'))))")
       end
 
       it "File <| tag == 'foo' or mode != '0777' |>" do
-        expect(dump(parse("File <| tag == 'foo' or mode != '0777' |>"))).to eq("(collect file\n  (<| |> (|| (== tag 'foo') (!= mode '0777'))))")
+        expect(dump(parse("File <| tag == 'foo' or mode != '0777' |>"))).to eq("(collect File\n  (<| |> (|| (== tag 'foo') (!= mode '0777'))))")
       end
 
       it "File <| tag == 'foo' or tag == 'bar' and mode != '0777' |>" do
         expect(dump(parse("File <| tag == 'foo' or tag == 'bar' and mode != '0777' |>"))).to eq(
-        "(collect file\n  (<| |> (|| (== tag 'foo') (&& (== tag 'bar') (!= mode '0777')))))"
+        "(collect File\n  (<| |> (|| (== tag 'foo') (&& (== tag 'bar') (!= mode '0777')))))"
         )
       end
 
       it "File <| (tag == 'foo' or tag == 'bar') and mode != '0777' |>" do
         expect(dump(parse("File <| (tag == 'foo' or tag == 'bar') and mode != '0777' |>"))).to eq(
-        "(collect file\n  (<| |> (&& (|| (== tag 'foo') (== tag 'bar')) (!= mode '0777'))))"
+        "(collect File\n  (<| |> (&& (|| (== tag 'foo') (== tag 'bar')) (!= mode '0777'))))"
         )
       end
     end