From 5af8b84770971e654e7d33c27e8270164ee54810 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Sat, 21 Dec 2019 20:31:16 +0100
Subject: [PATCH] Upgrade tests to minispec 6 syntax

---
 spec/namarara/lexer_spec.rb              |  2 ++
 spec/namarara/parser_spec.rb             | 18 ++++++++++--------
 spec/namarara/priority_parser_spec.rb    |  2 ++
 spec/namarara/simple_expr_parser_spec.rb | 12 ++++++++++++
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/spec/namarara/lexer_spec.rb b/spec/namarara/lexer_spec.rb
index ee0917f..a92a391 100644
--- a/spec/namarara/lexer_spec.rb
+++ b/spec/namarara/lexer_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'namarara'
 
diff --git a/spec/namarara/parser_spec.rb b/spec/namarara/parser_spec.rb
index 5f73fb7..8795f1a 100644
--- a/spec/namarara/parser_spec.rb
+++ b/spec/namarara/parser_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'namarara'
 
@@ -13,8 +15,8 @@ describe Namarara::Parser do
     errors = token.errors.select do |el|
       el.is_a? Namarara::Errors::VarNotDefined
     end
-    errors.size.must_equal 1
-    errors[0].var.must_equal 'character'
+    _(errors.size).must_equal 1
+    _(errors[0].var).must_equal 'character'
   end
 
   it 'has to report vars which are not defined' do
@@ -24,9 +26,9 @@ describe Namarara::Parser do
     errors = token.errors.select do |el|
       el.is_a? Namarara::Errors::VarNotDefined
     end
-    errors.size.must_equal 2
-    errors[0].var.must_equal 'a_girl_has_no_name'
-    errors[1].var.must_equal 'character'
+    _(errors.size).must_equal 2
+    _(errors[0].var).must_equal 'a_girl_has_no_name'
+    _(errors[1].var).must_equal 'character'
   end
 
   it 'has to report invalid_grammar' do
@@ -35,13 +37,13 @@ describe Namarara::Parser do
     parser.names = { 'a_girl_has_no_name' => true, 'character' => 'Arya Stark' }
     token = parser.parse(line)
     parser.check_grammar line, token
-    token.errors.select do |elem|
+    _(token.errors.select do |elem|
       elem.is_a? Namarara::Errors::InvalidGrammar
-    end.size.must_equal 1
+    end.size).must_equal 1
   end
 
   it 'has to be nil when grammar is completely invalid' do
-    line = 'false = "Arya"'
+    line = 'false / "Arya"'
     parser.names = {}
     token = parser.parse(line)
     parser.check_grammar line, token
diff --git a/spec/namarara/priority_parser_spec.rb b/spec/namarara/priority_parser_spec.rb
index bf8b8ab..9fa5c1b 100644
--- a/spec/namarara/priority_parser_spec.rb
+++ b/spec/namarara/priority_parser_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'namarara'
 
diff --git a/spec/namarara/simple_expr_parser_spec.rb b/spec/namarara/simple_expr_parser_spec.rb
index a5e012d..f7a9eda 100644
--- a/spec/namarara/simple_expr_parser_spec.rb
+++ b/spec/namarara/simple_expr_parser_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'namarara'
 
@@ -158,4 +160,14 @@ describe Namarara::Parser do
     token = parser.parse(line)
     assert_equal(false, token.compute)
   end
+
+  it 'has to convert to true AND true and return true' do
+    line = 'a_girl_has_no_name AND character'
+    parser.names = {
+      'a_girl_has_no_name' => 3,
+      'character' => 1
+    }
+    token = parser.parse(line)
+    assert_equal(true, token.compute)
+  end
 end