From bf7a32d22079cc44eb19794e41d82b886d5d17b3 Mon Sep 17 00:00:00 2001
From: mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 15 Jun 2018 08:53:16 +0000
Subject: Remove warnings of flip-flop deprecation from tests and specs

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 spec/ruby/command_line/dash_e_spec.rb |  2 +-
 spec/ruby/language/if_spec.rb         | 17 ++++++++++-------
 spec/ruby/language/precedence_spec.rb | 10 ++++++++--
 3 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'spec')

diff --git a/spec/ruby/command_line/dash_e_spec.rb b/spec/ruby/command_line/dash_e_spec.rb
index 9f600eb414..70ecdd5dce 100644
--- a/spec/ruby/command_line/dash_e_spec.rb
+++ b/spec/ruby/command_line/dash_e_spec.rb
@@ -25,7 +25,7 @@ describe "The -e command line option" do
 
   describe "with -n and a Fixnum range" do
     before :each do
-      @script = "-ne 'print if %s' #{fixture(__FILE__, "conditional_range.txt")}"
+      @script = "-W0 -ne 'print if %s' #{fixture(__FILE__, "conditional_range.txt")}"
     end
 
     it "mimics an awk conditional by comparing an inclusive-end range with $." do
diff --git a/spec/ruby/language/if_spec.rb b/spec/ruby/language/if_spec.rb
index 7f1ce8056d..fe207e77d5 100644
--- a/spec/ruby/language/if_spec.rb
+++ b/spec/ruby/language/if_spec.rb
@@ -235,19 +235,22 @@ describe "The if expression" do
   describe "with a boolean range ('flip-flop' operator)" do
     before :each do
       ScratchPad.record []
+      @verbose = $VERBOSE
+      $VERBOSE = nil
     end
 
     after :each do
       ScratchPad.clear
+      $VERBOSE = @verbose
     end
 
     it "mimics an awk conditional with a single-element inclusive-end range" do
-      10.times { |i| ScratchPad << i if (i == 4)..(i == 4) }
+      eval "10.times { |i| ScratchPad << i if (i == 4)..(i == 4) }"
       ScratchPad.recorded.should == [4]
     end
 
     it "mimics an awk conditional with a many-element inclusive-end range" do
-      10.times { |i| ScratchPad << i if (i == 4)..(i == 7) }
+      eval "10.times { |i| ScratchPad << i if (i == 4)..(i == 7) }"
       ScratchPad.recorded.should == [4, 5, 6, 7]
     end
 
@@ -257,12 +260,12 @@ describe "The if expression" do
     end
 
     it "mimics a sed conditional with a many-element exclusive-end range" do
-      10.times { |i| ScratchPad << i if (i == 4)...(i == 5) }
+      eval "10.times { |i| ScratchPad << i if (i == 4)...(i == 5) }"
       ScratchPad.recorded.should == [4, 5]
     end
 
     it "allows combining two flip-flops" do
-      10.times { |i| ScratchPad << i if (i == 4)...(i == 5) or (i == 7)...(i == 8) }
+      eval "10.times { |i| ScratchPad << i if (i == 4)...(i == 5) or (i == 7)...(i == 8) }"
       ScratchPad.recorded.should == [4, 5, 7, 8]
     end
 
@@ -280,18 +283,18 @@ describe "The if expression" do
 
     it "evaluates the second conditions lazily with inclusive-end range" do
       collector = proc { |i| ScratchPad << i }
-      10.times { |i| i if (i == 4)...collector[i] }
+      eval "10.times { |i| i if (i == 4)...collector[i] }"
       ScratchPad.recorded.should == [5]
     end
 
     it "evaluates the second conditions lazily with exclusive-end range" do
       collector = proc { |i| ScratchPad << i }
-      10.times { |i| i if (i == 4)..collector[i] }
+      eval "10.times { |i| i if (i == 4)..collector[i] }"
       ScratchPad.recorded.should == [4]
     end
 
     it "scopes state by flip-flop" do
-      store_me = proc { |i| ScratchPad << i if (i == 4)..(i == 7) }
+      store_me = eval("proc { |i| ScratchPad << i if (i == 4)..(i == 7) }")
       store_me[1]
       store_me[4]
       proc { store_me[1] }.call
diff --git a/spec/ruby/language/precedence_spec.rb b/spec/ruby/language/precedence_spec.rb
index 2dcb9975bc..19edaf2efa 100644
--- a/spec/ruby/language/precedence_spec.rb
+++ b/spec/ruby/language/precedence_spec.rb
@@ -301,8 +301,14 @@ describe "Operators" do
    from = 1
    to = 2
    # These are Range instances, not flip-flop
-   (from..to ? 3 : 4).should == 3
-   (from...to ? 3 : 4).should == 3
+   @verbose = $VERBOSE
+   $VERBOSE = nil
+   begin
+     (eval("from..to") ? 3 : 4).should == 3
+     (eval("from...to") ? 3 : 4).should == 3
+   ensure
+     $VERBOSE = @verbose
+   end
  end
 
   it "? : is right-associative" do
-- 
cgit v1.2.3