square_root_arithmetic generator spec is now all green

[mint/mint-lib.git] / spec / generator / square_root_arithmetic_spec.rb

diff --git a/spec/generator/square_root_arithmetic_spec.rb b/spec/generator/square_root_arithmetic_spec.rb
index 05efc04..68e0811 100644 (file)
--- a/spec/generator/square_root_arithmetic_spec.rb
+++ b/spec/generator/square_root_arithmetic_spec.rb
@@ -7,7 +7,7 @@ module Mint::Generator
 
     subject { SquareRootArithmetic.new }
 
-    before(:all) { @opt_pattern = %r![+\-]! }
+    before(:all) { @opt_pattern = %r![\*]! }
 
     it_should_behave_like 'Arithmetic'
 
@@ -64,8 +64,8 @@ module Mint::Generator
     context 'create expression' do
 
       context 'single term' do
-        before do 
-          settings = { :min => 2, :single_term_max => 1, }
+        before do
+          settings = { :min => 2, :single_term_max => 1, :single_term_min => 1 }
           @problem = subject.generate(settings)
           @expected_pattern = /\Asqrt\(\d\d?\) #{@opt_pattern} sqrt\(\d\d?\)\z/
         end
@@ -80,15 +80,14 @@ module Mint::Generator
               :single_term_min => 2,
               :single_term_max => 2,
           }
-          @term_pattern = /\(sqrt\(\d\d?\) [\-\+] sqrt\(\d\d?\)\)/
         end
 
         term_pattern = /\(sqrt\(\d\d?\) [\-\+] sqrt\(\d\d?\)\)/
         [
-          [{}, /\A#{term_pattern} [\-\+] #{term_pattern}\z/],
-          [{:operators => ['*']}, /\A#{term_pattern} \* #{term_pattern}\z/],
-          [{:operators => ['/']}, /\A#{term_pattern} \/ #{term_pattern}\z/],
-          [{:use_power => true}, /\A#{term_pattern}(?:\^2)? [\-+] #{term_pattern}(?:\^2)?\z/],
+          [{}, /\A#{term_pattern} [\*] #{term_pattern}\z/],
+          [{:operators => ['+']}, /\A#{term_pattern} \+ #{term_pattern}\z/],
+          [{:operators => ['-']}, /\A#{term_pattern} \- #{term_pattern}\z/],
+          [{:use_power => true}, /\A#{term_pattern}(?:\^2)? [\*] #{term_pattern}(?:\^2)?\z/],
 
         ].each do |options, pattern|
           context options.inspect do