puppet 3.8.7 → 4.0.0.rc1

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

@@ -10,158 +10,158 @@ describe "egrammar parsing basic expressions" do
 
   context "When the parser parses arithmetic" do
     context "with Integers" do
-      it "$a = 2 + 2"   do; dump(parse("$a = 2 + 2")).should == "(= $a (+ 2 2))"      ; end
-      it "$a = 7 - 3"   do; dump(parse("$a = 7 - 3")).should == "(= $a (- 7 3))"      ; end
-      it "$a = 6 * 3"   do; dump(parse("$a = 6 * 3")).should == "(= $a (* 6 3))"      ; end
-      it "$a = 6 / 3"   do; dump(parse("$a = 6 / 3")).should == "(= $a (/ 6 3))"      ; end
-      it "$a = 6 % 3"   do; dump(parse("$a = 6 % 3")).should == "(= $a (% 6 3))"      ; end
-      it "$a = -(6/3)"  do; dump(parse("$a = -(6/3)")).should == "(= $a (- (/ 6 3)))" ; end
-      it "$a = -6/3"    do; dump(parse("$a = -6/3")).should == "(= $a (/ (- 6) 3))"   ; end
-      it "$a = 8 >> 1 " do; dump(parse("$a = 8 >> 1")).should == "(= $a (>> 8 1))"    ; end
-      it "$a = 8 << 1 " do; dump(parse("$a = 8 << 1")).should == "(= $a (<< 8 1))"    ; end
+      it "$a = 2 + 2"   do; expect(dump(parse("$a = 2 + 2"))).to eq("(= $a (+ 2 2))")      ; end
+      it "$a = 7 - 3"   do; expect(dump(parse("$a = 7 - 3"))).to eq("(= $a (- 7 3))")      ; end
+      it "$a = 6 * 3"   do; expect(dump(parse("$a = 6 * 3"))).to eq("(= $a (* 6 3))")      ; end
+      it "$a = 6 / 3"   do; expect(dump(parse("$a = 6 / 3"))).to eq("(= $a (/ 6 3))")      ; end
+      it "$a = 6 % 3"   do; expect(dump(parse("$a = 6 % 3"))).to eq("(= $a (% 6 3))")      ; end
+      it "$a = -(6/3)"  do; expect(dump(parse("$a = -(6/3)"))).to eq("(= $a (- (/ 6 3)))") ; end
+      it "$a = -6/3"    do; expect(dump(parse("$a = -6/3"))).to eq("(= $a (/ (- 6) 3))")   ; end
+      it "$a = 8 >> 1 " do; expect(dump(parse("$a = 8 >> 1"))).to eq("(= $a (>> 8 1))")    ; end
+      it "$a = 8 << 1 " do; expect(dump(parse("$a = 8 << 1"))).to eq("(= $a (<< 8 1))")    ; end
     end
 
     context "with Floats" do
-      it "$a = 2.2 + 2.2"  do; dump(parse("$a = 2.2 + 2.2")).should == "(= $a (+ 2.2 2.2))"      ; end
-      it "$a = 7.7 - 3.3"  do; dump(parse("$a = 7.7 - 3.3")).should == "(= $a (- 7.7 3.3))"      ; end
-      it "$a = 6.1 * 3.1"  do; dump(parse("$a = 6.1 - 3.1")).should == "(= $a (- 6.1 3.1))"      ; end
-      it "$a = 6.6 / 3.3"  do; dump(parse("$a = 6.6 / 3.3")).should == "(= $a (/ 6.6 3.3))"      ; end
-      it "$a = -(6.0/3.0)" do; dump(parse("$a = -(6.0/3.0)")).should == "(= $a (- (/ 6.0 3.0)))" ; end
-      it "$a = -6.0/3.0"   do; dump(parse("$a = -6.0/3.0")).should == "(= $a (/ (- 6.0) 3.0))"   ; end
-      it "$a = 3.14 << 2"  do; dump(parse("$a = 3.14 << 2")).should == "(= $a (<< 3.14 2))"      ; end
-      it "$a = 3.14 >> 2"  do; dump(parse("$a = 3.14 >> 2")).should == "(= $a (>> 3.14 2))"      ; end
+      it "$a = 2.2 + 2.2"  do; expect(dump(parse("$a = 2.2 + 2.2"))).to eq("(= $a (+ 2.2 2.2))")      ; end
+      it "$a = 7.7 - 3.3"  do; expect(dump(parse("$a = 7.7 - 3.3"))).to eq("(= $a (- 7.7 3.3))")      ; end
+      it "$a = 6.1 * 3.1"  do; expect(dump(parse("$a = 6.1 - 3.1"))).to eq("(= $a (- 6.1 3.1))")      ; end
+      it "$a = 6.6 / 3.3"  do; expect(dump(parse("$a = 6.6 / 3.3"))).to eq("(= $a (/ 6.6 3.3))")      ; end
+      it "$a = -(6.0/3.0)" do; expect(dump(parse("$a = -(6.0/3.0)"))).to eq("(= $a (- (/ 6.0 3.0)))") ; end
+      it "$a = -6.0/3.0"   do; expect(dump(parse("$a = -6.0/3.0"))).to eq("(= $a (/ (- 6.0) 3.0))")   ; end
+      it "$a = 3.14 << 2"  do; expect(dump(parse("$a = 3.14 << 2"))).to eq("(= $a (<< 3.14 2))")      ; end
+      it "$a = 3.14 >> 2"  do; expect(dump(parse("$a = 3.14 >> 2"))).to eq("(= $a (>> 3.14 2))")      ; end
     end
 
     context "with hex and octal Integer values" do
-      it "$a = 0xAB + 0xCD" do; dump(parse("$a = 0xAB + 0xCD")).should == "(= $a (+ 0xAB 0xCD))"  ; end
-      it "$a = 0777 - 0333" do; dump(parse("$a = 0777 - 0333")).should == "(= $a (- 0777 0333))"  ; end
+      it "$a = 0xAB + 0xCD" do; expect(dump(parse("$a = 0xAB + 0xCD"))).to eq("(= $a (+ 0xAB 0xCD))")  ; end
+      it "$a = 0777 - 0333" do; expect(dump(parse("$a = 0777 - 0333"))).to eq("(= $a (- 0777 0333))")  ; end
     end
 
     context "with strings requiring boxing to Numeric" do
       # Test that numbers in string form does not turn into numbers
-      it "$a = '2' + '2'"       do; dump(parse("$a = '2' + '2'")).should == "(= $a (+ '2' '2'))"             ; end
-      it "$a = '2.2' + '0.2'"   do; dump(parse("$a = '2.2' + '0.2'")).should == "(= $a (+ '2.2' '0.2'))"     ; end
-      it "$a = '0xab' + '0xcd'" do; dump(parse("$a = '0xab' + '0xcd'")).should == "(= $a (+ '0xab' '0xcd'))" ; end
-      it "$a = '0777' + '0333'" do; dump(parse("$a = '0777' + '0333'")).should == "(= $a (+ '0777' '0333'))" ; end
+      it "$a = '2' + '2'"       do; expect(dump(parse("$a = '2' + '2'"))).to eq("(= $a (+ '2' '2'))")             ; end
+      it "$a = '2.2' + '0.2'"   do; expect(dump(parse("$a = '2.2' + '0.2'"))).to eq("(= $a (+ '2.2' '0.2'))")     ; end
+      it "$a = '0xab' + '0xcd'" do; expect(dump(parse("$a = '0xab' + '0xcd'"))).to eq("(= $a (+ '0xab' '0xcd'))") ; end
+      it "$a = '0777' + '0333'" do; expect(dump(parse("$a = '0777' + '0333'"))).to eq("(= $a (+ '0777' '0333'))") ; end
     end
 
     context "precedence should be correct" do
-      it "$a = 1 + 2 * 3" do; dump(parse("$a = 1 + 2 * 3")).should == "(= $a (+ 1 (* 2 3)))"; end
-      it "$a = 1 + 2 % 3" do; dump(parse("$a = 1 + 2 % 3")).should == "(= $a (+ 1 (% 2 3)))"; end
-      it "$a = 1 + 2 / 3" do; dump(parse("$a = 1 + 2 / 3")).should == "(= $a (+ 1 (/ 2 3)))"; end
-      it "$a = 1 + 2 << 3" do; dump(parse("$a = 1 + 2 << 3")).should == "(= $a (<< (+ 1 2) 3))"; end
-      it "$a = 1 + 2 >> 3" do; dump(parse("$a = 1 + 2 >> 3")).should == "(= $a (>> (+ 1 2) 3))"; end
+      it "$a = 1 + 2 * 3" do; expect(dump(parse("$a = 1 + 2 * 3"))).to eq("(= $a (+ 1 (* 2 3)))"); end
+      it "$a = 1 + 2 % 3" do; expect(dump(parse("$a = 1 + 2 % 3"))).to eq("(= $a (+ 1 (% 2 3)))"); end
+      it "$a = 1 + 2 / 3" do; expect(dump(parse("$a = 1 + 2 / 3"))).to eq("(= $a (+ 1 (/ 2 3)))"); end
+      it "$a = 1 + 2 << 3" do; expect(dump(parse("$a = 1 + 2 << 3"))).to eq("(= $a (<< (+ 1 2) 3))"); end
+      it "$a = 1 + 2 >> 3" do; expect(dump(parse("$a = 1 + 2 >> 3"))).to eq("(= $a (>> (+ 1 2) 3))"); end
     end
 
     context "parentheses alter precedence" do
-      it "$a = (1 + 2) * 3" do; dump(parse("$a = (1 + 2) * 3")).should == "(= $a (* (+ 1 2) 3))"; end
-      it "$a = (1 + 2) / 3" do; dump(parse("$a = (1 + 2) / 3")).should == "(= $a (/ (+ 1 2) 3))"; end
+      it "$a = (1 + 2) * 3" do; expect(dump(parse("$a = (1 + 2) * 3"))).to eq("(= $a (* (+ 1 2) 3))"); end
+      it "$a = (1 + 2) / 3" do; expect(dump(parse("$a = (1 + 2) / 3"))).to eq("(= $a (/ (+ 1 2) 3))"); end
     end
   end
 
   context "When the evaluator performs boolean operations" do
     context "using operators AND OR NOT" do
-      it "$a = true  and true" do; dump(parse("$a = true and true")).should == "(= $a (&& true true))"; end
-      it "$a = true  or true"  do; dump(parse("$a = true or true")).should == "(= $a (|| true true))" ; end
-      it "$a = !true"          do; dump(parse("$a = !true")).should == "(= $a (! true))"              ; end
+      it "$a = true  and true" do; expect(dump(parse("$a = true and true"))).to eq("(= $a (&& true true))"); end
+      it "$a = true  or true"  do; expect(dump(parse("$a = true or true"))).to eq("(= $a (|| true true))") ; end
+      it "$a = !true"          do; expect(dump(parse("$a = !true"))).to eq("(= $a (! true))")              ; end
     end
 
     context "precedence should be correct" do
       it "$a = false or true and true" do
-        dump(parse("$a = false or true and true")).should == "(= $a (|| false (&& true true)))"
+        expect(dump(parse("$a = false or true and true"))).to eq("(= $a (|| false (&& true true)))")
       end
 
       it "$a = (false or true) and true" do
-        dump(parse("$a = (false or true) and true")).should == "(= $a (&& (|| false true) true))"
+        expect(dump(parse("$a = (false or true) and true"))).to eq("(= $a (&& (|| false true) true))")
       end
 
       it "$a = !true or true and true" do
-        dump(parse("$a = !false or true and true")).should == "(= $a (|| (! false) (&& true true)))"
+        expect(dump(parse("$a = !false or true and true"))).to eq("(= $a (|| (! false) (&& true true)))")
       end
     end
 
     # Possibly change to check of literal expressions
     context "on values requiring boxing to Boolean" do
       it "'x'            == true" do
-        dump(parse("! 'x'")).should == "(! 'x')"
+        expect(dump(parse("! 'x'"))).to eq("(! 'x')")
       end
 
       it "''             == false" do
-        dump(parse("! ''")).should == "(! '')"
+        expect(dump(parse("! ''"))).to eq("(! '')")
       end
 
       it ":undef         == false" do
-        dump(parse("! undef")).should == "(! :undef)"
+        expect(dump(parse("! undef"))).to eq("(! :undef)")
       end
     end
   end
 
   context "When parsing comparisons" do
     context "of string values" do
-      it "$a = 'a' == 'a'"  do; dump(parse("$a = 'a' == 'a'")).should == "(= $a (== 'a' 'a'))"   ; end
-      it "$a = 'a' != 'a'"  do; dump(parse("$a = 'a' != 'a'")).should == "(= $a (!= 'a' 'a'))"   ; end
-      it "$a = 'a' < 'b'"   do; dump(parse("$a = 'a' < 'b'")).should == "(= $a (< 'a' 'b'))"     ; end
-      it "$a = 'a' > 'b'"   do; dump(parse("$a = 'a' > 'b'")).should == "(= $a (> 'a' 'b'))"     ; end
-      it "$a = 'a' <= 'b'"  do; dump(parse("$a = 'a' <= 'b'")).should == "(= $a (<= 'a' 'b'))"   ; end
-      it "$a = 'a' >= 'b'"  do; dump(parse("$a = 'a' >= 'b'")).should == "(= $a (>= 'a' 'b'))"   ; end
+      it "$a = 'a' == 'a'"  do; expect(dump(parse("$a = 'a' == 'a'"))).to eq("(= $a (== 'a' 'a'))")   ; end
+      it "$a = 'a' != 'a'"  do; expect(dump(parse("$a = 'a' != 'a'"))).to eq("(= $a (!= 'a' 'a'))")   ; end
+      it "$a = 'a' < 'b'"   do; expect(dump(parse("$a = 'a' < 'b'"))).to eq("(= $a (< 'a' 'b'))")     ; end
+      it "$a = 'a' > 'b'"   do; expect(dump(parse("$a = 'a' > 'b'"))).to eq("(= $a (> 'a' 'b'))")     ; end
+      it "$a = 'a' <= 'b'"  do; expect(dump(parse("$a = 'a' <= 'b'"))).to eq("(= $a (<= 'a' 'b'))")   ; end
+      it "$a = 'a' >= 'b'"  do; expect(dump(parse("$a = 'a' >= 'b'"))).to eq("(= $a (>= 'a' 'b'))")   ; end
     end
 
     context "of integer values" do
-      it "$a = 1 == 1"  do; dump(parse("$a = 1 == 1")).should == "(= $a (== 1 1))"   ; end
-      it "$a = 1 != 1"  do; dump(parse("$a = 1 != 1")).should == "(= $a (!= 1 1))"   ; end
-      it "$a = 1 < 2"   do; dump(parse("$a = 1 < 2")).should == "(= $a (< 1 2))"     ; end
-      it "$a = 1 > 2"   do; dump(parse("$a = 1 > 2")).should == "(= $a (> 1 2))"     ; end
-      it "$a = 1 <= 2"  do; dump(parse("$a = 1 <= 2")).should == "(= $a (<= 1 2))"   ; end
-      it "$a = 1 >= 2"  do; dump(parse("$a = 1 >= 2")).should == "(= $a (>= 1 2))"   ; end
+      it "$a = 1 == 1"  do; expect(dump(parse("$a = 1 == 1"))).to eq("(= $a (== 1 1))")   ; end
+      it "$a = 1 != 1"  do; expect(dump(parse("$a = 1 != 1"))).to eq("(= $a (!= 1 1))")   ; end
+      it "$a = 1 < 2"   do; expect(dump(parse("$a = 1 < 2"))).to eq("(= $a (< 1 2))")     ; end
+      it "$a = 1 > 2"   do; expect(dump(parse("$a = 1 > 2"))).to eq("(= $a (> 1 2))")     ; end
+      it "$a = 1 <= 2"  do; expect(dump(parse("$a = 1 <= 2"))).to eq("(= $a (<= 1 2))")   ; end
+      it "$a = 1 >= 2"  do; expect(dump(parse("$a = 1 >= 2"))).to eq("(= $a (>= 1 2))")   ; end
     end
 
     context "of regular expressions (parse errors)" do
       # Not supported in concrete syntax
       it "$a = /.*/ == /.*/" do
-        dump(parse("$a = /.*/ == /.*/")).should == "(= $a (== /.*/ /.*/))"
+        expect(dump(parse("$a = /.*/ == /.*/"))).to eq("(= $a (== /.*/ /.*/))")
       end
 
       it "$a = /.*/ != /a.*/" do
-        dump(parse("$a = /.*/ != /.*/")).should == "(= $a (!= /.*/ /.*/))"
+        expect(dump(parse("$a = /.*/ != /.*/"))).to eq("(= $a (!= /.*/ /.*/))")
       end
     end
   end
 
   context "When parsing Regular Expression matching" do
-    it "$a = 'a' =~ /.*/"    do; dump(parse("$a = 'a' =~ /.*/")).should == "(= $a (=~ 'a' /.*/))"      ; end
-    it "$a = 'a' =~ '.*'"    do; dump(parse("$a = 'a' =~ '.*'")).should == "(= $a (=~ 'a' '.*'))"      ; end
-    it "$a = 'a' !~ /b.*/"   do; dump(parse("$a = 'a' !~ /b.*/")).should == "(= $a (!~ 'a' /b.*/))"    ; end
-    it "$a = 'a' !~ 'b.*'"   do; dump(parse("$a = 'a' !~ 'b.*'")).should == "(= $a (!~ 'a' 'b.*'))"    ; end
+    it "$a = 'a' =~ /.*/"    do; expect(dump(parse("$a = 'a' =~ /.*/"))).to eq("(= $a (=~ 'a' /.*/))")      ; end
+    it "$a = 'a' =~ '.*'"    do; expect(dump(parse("$a = 'a' =~ '.*'"))).to eq("(= $a (=~ 'a' '.*'))")      ; end
+    it "$a = 'a' !~ /b.*/"   do; expect(dump(parse("$a = 'a' !~ /b.*/"))).to eq("(= $a (!~ 'a' /b.*/))")    ; end
+    it "$a = 'a' !~ 'b.*'"   do; expect(dump(parse("$a = 'a' !~ 'b.*'"))).to eq("(= $a (!~ 'a' 'b.*'))")    ; end
   end
 
   context "When parsing unfold" do
-    it "$a = *[1,2]" do; dump(parse("$a = *[1,2]")).should == "(= $a (unfold ([] 1 2)))" ; end
-    it "$a = *1"     do; dump(parse("$a = *1")).should == "(= $a (unfold 1))" ; end
+    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
   end
 
   context "When parsing Lists" do
     it "$a = []" do
-      dump(parse("$a = []")).should == "(= $a ([]))"
+      expect(dump(parse("$a = []"))).to eq("(= $a ([]))")
     end
 
     it "$a = [1]" do
-      dump(parse("$a = [1]")).should == "(= $a ([] 1))"
+      expect(dump(parse("$a = [1]"))).to eq("(= $a ([] 1))")
     end
 
     it "$a = [1,2,3]" do
-      dump(parse("$a = [1,2,3]")).should == "(= $a ([] 1 2 3))"
+      expect(dump(parse("$a = [1,2,3]"))).to eq("(= $a ([] 1 2 3))")
     end
 
     it "[...[...[]]] should create nested arrays without trouble" do
-      dump(parse("$a = [1,[2.0, 2.1, [2.2]],[3.0, 3.1]]")).should == "(= $a ([] 1 ([] 2.0 2.1 ([] 2.2)) ([] 3.0 3.1)))"
+      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
 
     it "$a = [2 + 2]" do
-      dump(parse("$a = [2+2]")).should == "(= $a ([] (+ 2 2)))"
+      expect(dump(parse("$a = [2+2]"))).to eq("(= $a ([] (+ 2 2)))")
     end
 
     it "$a [1,2,3] == [1,2,3]" do
-      dump(parse("$a = [1,2,3] == [1,2,3]")).should == "(= $a (== ([] 1 2 3) ([] 1 2 3)))"
+      expect(dump(parse("$a = [1,2,3] == [1,2,3]"))).to eq("(= $a (== ([] 1 2 3) ([] 1 2 3)))")
     end
 
     it "calculates the text length of an empty array" do
@@ -172,59 +172,59 @@ describe "egrammar parsing basic expressions" do
 
   context "When parsing indexed access" do
     it "$a = $b[2]" do
-      dump(parse("$a = $b[2]")).should == "(= $a (slice $b 2))"
+      expect(dump(parse("$a = $b[2]"))).to eq("(= $a (slice $b 2))")
     end
 
     it "$a = [1, 2, 3][2]" do
-      dump(parse("$a = [1,2,3][2]")).should == "(= $a (slice ([] 1 2 3) 2))"
+      expect(dump(parse("$a = [1,2,3][2]"))).to eq("(= $a (slice ([] 1 2 3) 2))")
     end
 
     it "$a = {'a' => 1, 'b' => 2}['b']" do
-      dump(parse("$a = {'a'=>1,'b' =>2}[b]")).should == "(= $a (slice ({} ('a' 1) ('b' 2)) b))"
+      expect(dump(parse("$a = {'a'=>1,'b' =>2}[b]"))).to eq("(= $a (slice ({} ('a' 1) ('b' 2)) b))")
     end
   end
 
   context "When parsing assignments" do
     it "Should allow simple assignment" do
-      dump(parse("$a = 10")).should == "(= $a 10)"
+      expect(dump(parse("$a = 10"))).to eq("(= $a 10)")
     end
 
     it "Should allow append assignment" do
-      dump(parse("$a += 10")).should == "(+= $a 10)"
+      expect(dump(parse("$a += 10"))).to eq("(+= $a 10)")
     end
 
     it "Should allow without assignment" do
-      dump(parse("$a -= 10")).should == "(-= $a 10)"
+      expect(dump(parse("$a -= 10"))).to eq("(-= $a 10)")
     end
 
     it "Should allow chained assignment" do
-      dump(parse("$a = $b = 10")).should == "(= $a (= $b 10))"
+      expect(dump(parse("$a = $b = 10"))).to eq("(= $a (= $b 10))")
     end
 
     it "Should allow chained assignment with expressions" do
-      dump(parse("$a = 1 + ($b = 10)")).should == "(= $a (+ 1 (= $b 10)))"
+      expect(dump(parse("$a = 1 + ($b = 10)"))).to eq("(= $a (+ 1 (= $b 10)))")
     end
   end
 
   context "When parsing Hashes" do
     it "should create a  Hash when evaluating a LiteralHash" do
-      dump(parse("$a = {'a'=>1,'b'=>2}")).should == "(= $a ({} ('a' 1) ('b' 2)))"
+      expect(dump(parse("$a = {'a'=>1,'b'=>2}"))).to eq("(= $a ({} ('a' 1) ('b' 2)))")
     end
 
     it "$a = {...{...{}}} should create nested hashes without trouble" do
-      dump(parse("$a = {'a'=>1,'b'=>{'x'=>2.1,'y'=>2.2}}")).should == "(= $a ({} ('a' 1) ('b' ({} ('x' 2.1) ('y' 2.2)))))"
+      expect(dump(parse("$a = {'a'=>1,'b'=>{'x'=>2.1,'y'=>2.2}}"))).to eq("(= $a ({} ('a' 1) ('b' ({} ('x' 2.1) ('y' 2.2)))))")
     end
 
     it "$a = {'a'=> 2 + 2} should evaluate values in entries" do
-      dump(parse("$a = {'a'=>2+2}")).should == "(= $a ({} ('a' (+ 2 2))))"
+      expect(dump(parse("$a = {'a'=>2+2}"))).to eq("(= $a ({} ('a' (+ 2 2))))")
     end
 
     it "$a = {'a'=> 1, 'b'=>2} == {'a'=> 1, 'b'=>2}" do
-      dump(parse("$a = {'a'=>1,'b'=>2} == {'a'=>1,'b'=>2}")).should == "(= $a (== ({} ('a' 1) ('b' 2)) ({} ('a' 1) ('b' 2))))"
+      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, 'b'=>2} != {'x'=> 1, 'y'=>3}" do
-      dump(parse("$a = {'a'=>1,'b'=>2} != {'a'=>1,'b'=>2}")).should == "(= $a (!= ({} ('a' 1) ('b' 2)) ({} ('a' 1) ('b' 2))))"
+      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 "calculates the text length of an empty hash" do
@@ -235,54 +235,54 @@ describe "egrammar parsing basic expressions" do
 
   context "When parsing the 'in' operator" do
     it "with integer in a list" do
-      dump(parse("$a = 1 in [1,2,3]")).should == "(= $a (in 1 ([] 1 2 3)))"
+      expect(dump(parse("$a = 1 in [1,2,3]"))).to eq("(= $a (in 1 ([] 1 2 3)))")
     end
 
     it "with string key in a hash" do
-      dump(parse("$a = 'a' in {'x'=>1, 'a'=>2, 'y'=> 3}")).should == "(= $a (in 'a' ({} ('x' 1) ('a' 2) ('y' 3))))"
+      expect(dump(parse("$a = 'a' in {'x'=>1, 'a'=>2, 'y'=> 3}"))).to eq("(= $a (in 'a' ({} ('x' 1) ('a' 2) ('y' 3))))")
     end
 
     it "with substrings of a string" do
-      dump(parse("$a = 'ana' in 'bananas'")).should == "(= $a (in 'ana' 'bananas'))"
+      expect(dump(parse("$a = 'ana' in 'bananas'"))).to eq("(= $a (in 'ana' 'bananas'))")
     end
 
     it "with sublist in a list" do
-      dump(parse("$a = [2,3] in [1,2,3]")).should == "(= $a (in ([] 2 3) ([] 1 2 3)))"
+      expect(dump(parse("$a = [2,3] in [1,2,3]"))).to eq("(= $a (in ([] 2 3) ([] 1 2 3)))")
     end
   end
 
   context "When parsing string interpolation" do
     it "should interpolate a bare word as a variable name, \"${var}\"" do
-      dump(parse("$a = \"$var\"")).should == "(= $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
-      dump(parse("$a = \"${$var}\"")).should == "(= $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
-      dump(parse("$a = \"yo${var}yo\"")).should == "(= $a (cat 'yo' (str $var) 'yo'))"
+      expect(dump(parse("$a = \"yo${var}yo\""))).to eq("(= $a (cat 'yo' (str $var) 'yo'))")
     end
 
     it "should interpolate any expression in a text expression, \"${$var*2}\"" do
-      dump(parse("$a = \"yo${$var+2}yo\"")).should == "(= $a (cat 'yo' (str (+ $var 2)) 'yo'))"
+      expect(dump(parse("$a = \"yo${$var+2}yo\""))).to eq("(= $a (cat 'yo' (str (+ $var 2)) 'yo'))")
     end
 
     it "should not interpolate names as variable in expression, \"${notvar*2}\"" do
-      dump(parse("$a = \"yo${notvar+2}yo\"")).should == "(= $a (cat 'yo' (str (+ notvar 2)) 'yo'))"
+      expect(dump(parse("$a = \"yo${notvar+2}yo\""))).to eq("(= $a (cat 'yo' (str (+ notvar 2)) 'yo'))")
     end
 
     it "should interpolate name as variable in access expression, \"${var[0]}\"" do
-      dump(parse("$a = \"yo${var[0]}yo\"")).should == "(= $a (cat 'yo' (str (slice $var 0)) 'yo'))"
+      expect(dump(parse("$a = \"yo${var[0]}yo\""))).to eq("(= $a (cat 'yo' (str (slice $var 0)) 'yo'))")
     end
 
     it "should interpolate name as variable in method call, \"${var.foo}\"" do
-      dump(parse("$a = \"yo${$var.foo}yo\"")).should == "(= $a (cat 'yo' (str (call-method (. $var foo))) 'yo'))"
+      expect(dump(parse("$a = \"yo${$var.foo}yo\""))).to eq("(= $a (cat 'yo' (str (call-method (. $var foo))) 'yo'))")
     end
 
     it "should interpolate name as variable in method call, \"${var.foo}\"" do
-      dump(parse("$a = \"yo${var.foo}yo\"")).should == "(= $a (cat 'yo' (str (call-method (. $var foo))) 'yo'))"
-      dump(parse("$a = \"yo${var.foo.bar}yo\"")).should == "(= $a (cat 'yo' (str (call-method (. (call-method (. $var foo)) bar))) 'yo'))"
+      expect(dump(parse("$a = \"yo${var.foo}yo\""))).to eq("(= $a (cat 'yo' (str (call-method (. $var foo))) 'yo'))")
+      expect(dump(parse("$a = \"yo${var.foo.bar}yo\""))).to eq("(= $a (cat 'yo' (str (call-method (. (call-method (. $var foo)) bar))) 'yo'))")
     end
   end
 end

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

@@ -11,89 +11,89 @@ describe "egrammar parsing function calls" do
   context "When parsing calls as statements" do
     context "in top level scope" do
       it "foo()" do
-        dump(parse("foo()")).should == "(invoke foo)"
+        expect(dump(parse("foo()"))).to eq("(invoke foo)")
       end
 
       it "notice bar" do
-        dump(parse("notice bar")).should == "(invoke notice bar)"
+        expect(dump(parse("notice bar"))).to eq("(invoke notice bar)")
       end
 
       it "notice(bar)" do
-        dump(parse("notice bar")).should == "(invoke notice bar)"
+        expect(dump(parse("notice bar"))).to eq("(invoke notice bar)")
       end
 
       it "foo(bar)" do
-        dump(parse("foo(bar)")).should == "(invoke foo bar)"
+        expect(dump(parse("foo(bar)"))).to eq("(invoke foo bar)")
       end
 
       it "foo(bar,)" do
-        dump(parse("foo(bar,)")).should == "(invoke foo bar)"
+        expect(dump(parse("foo(bar,)"))).to eq("(invoke foo bar)")
       end
 
       it "foo(bar, fum,)" do
-        dump(parse("foo(bar,fum,)")).should == "(invoke foo bar fum)"
+        expect(dump(parse("foo(bar,fum,)"))).to eq("(invoke foo bar fum)")
       end
 
       it "notice fqdn_rand(30)" do
-        dump(parse("notice fqdn_rand(30)")).should == '(invoke notice (call fqdn_rand 30))'
+        expect(dump(parse("notice fqdn_rand(30)"))).to eq('(invoke notice (call fqdn_rand 30))')
       end
     end
 
     context "in nested scopes" do
       it "if true { foo() }" do
-        dump(parse("if true {foo()}")).should == "(if true\n  (then (invoke foo)))"
+        expect(dump(parse("if true {foo()}"))).to eq("(if true\n  (then (invoke foo)))")
       end
 
       it "if true { notice bar}" do
-        dump(parse("if true {notice bar}")).should == "(if true\n  (then (invoke notice bar)))"
+        expect(dump(parse("if true {notice bar}"))).to eq("(if true\n  (then (invoke notice bar)))")
       end
     end
   end
 
   context "When parsing calls as expressions" do
     it "$a = foo()" do
-      dump(parse("$a = foo()")).should == "(= $a (call foo))"
+      expect(dump(parse("$a = foo()"))).to eq("(= $a (call foo))")
     end
 
     it "$a = foo(bar)" do
-      dump(parse("$a = foo()")).should == "(= $a (call foo))"
+      expect(dump(parse("$a = foo()"))).to eq("(= $a (call foo))")
     end
 
     # For egrammar where a bare word can be a "statement"
     it "$a = foo bar # illegal, must have parentheses" do
-      dump(parse("$a = foo bar")).should == "(block\n  (= $a foo)\n  bar\n)"
+      expect(dump(parse("$a = foo bar"))).to eq("(block\n  (= $a foo)\n  bar\n)")
     end
 
     context "in nested scopes" do
       it "if true { $a = foo() }" do
-        dump(parse("if true { $a = foo()}")).should == "(if true\n  (then (= $a (call foo))))"
+        expect(dump(parse("if true { $a = foo()}"))).to eq("(if true\n  (then (= $a (call foo))))")
       end
 
       it "if true { $a= foo(bar)}" do
-        dump(parse("if true {$a = foo(bar)}")).should == "(if true\n  (then (= $a (call foo bar))))"
+        expect(dump(parse("if true {$a = foo(bar)}"))).to eq("(if true\n  (then (= $a (call foo bar))))")
       end
     end
   end
 
   context "When parsing method calls" do
     it "$a.foo" do
-      dump(parse("$a.foo")).should == "(call-method (. $a foo))"
+      expect(dump(parse("$a.foo"))).to eq("(call-method (. $a foo))")
     end
 
     it "$a.foo || { }" do
-      dump(parse("$a.foo || { }")).should == "(call-method (. $a foo) (lambda ()))"
+      expect(dump(parse("$a.foo || { }"))).to eq("(call-method (. $a foo) (lambda ()))")
     end
 
     it "$a.foo |$x| { }" do
-      dump(parse("$a.foo |$x|{ }")).should == "(call-method (. $a foo) (lambda (parameters x) ()))"
+      expect(dump(parse("$a.foo |$x|{ }"))).to eq("(call-method (. $a foo) (lambda (parameters x) ()))")
     end
 
     it "$a.foo |$x|{ }" do
-      dump(parse("$a.foo |$x|{ $b = $x}")).should == [
+      expect(dump(parse("$a.foo |$x|{ $b = $x}"))).to eq([
         "(call-method (. $a foo) (lambda (parameters x) (block",
         "  (= $b $x)",
         ")))"
-        ].join("\n")
+        ].join("\n"))
     end
   end