Update to ruby/spec@6f38a82

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 56 insertions, 20 deletions

diff --git a/spec/ruby/command_line/dash_upper_i_spec.rb b/spec/ruby/command_line/dash_upper_i_spec.rb
index f256a4351b..5d7109b6b6 100644
--- a/spec/ruby/command_line/dash_upper_i_spec.rb
+++ b/spec/ruby/command_line/dash_upper_i_spec.rb
@@ -8,4 +8,42 @@ describe "The -I command line option" do
   it "adds the path to the load path ($:)" do
     ruby_exe(@script, options: "-I fixtures").should include("fixtures")
   end
+
+  it "adds the path at the front of $LOAD_PATH" do
+    lines = ruby_exe(@script, options: "-I fixtures").lines
+    if File.basename(ruby_exe[0]) == "miniruby"
+      # In a MRI checkout, $PWD ends up as the first entry in $LOAD_PATH.
+      # So just assert that it's at the beginning.
+      idx = lines.index { |l| l.include?("fixtures") }
+      idx.should < 2
+      idx.should < lines.size-1
+    else
+      lines[0].should include("fixtures")
+    end
+  end
+
+  it "adds the path expanded from CWD to $LOAD_PATH" do
+    ruby_exe(@script, options: "-I fixtures").lines.should include "#{Dir.pwd}/fixtures\n"
+  end
+
+  it "expands a path from CWD even if it does not exist" do
+    ruby_exe(@script, options: "-I not_exist/not_exist").lines.should include "#{Dir.pwd}/not_exist/not_exist\n"
+  end
+end
+
+describe "The -I command line option" do
+  before :each do
+    @script = fixture __FILE__, "loadpath.rb"
+    @fixtures = File.dirname(@script)
+    @symlink = tmp("loadpath_symlink")
+    File.symlink(@fixtures, @symlink)
+  end
+
+  after :each do
+    rm_r @symlink
+  end
+
+  it "does not expand symlinks" do
+    ruby_exe(@script, options: "-I #{@symlink}").lines.should include "#{@symlink}\n"
+  end
 end
diff --git a/spec/ruby/command_line/frozen_strings_spec.rb b/spec/ruby/command_line/frozen_strings_spec.rb
index f0ceb53504..b2631a4c76 100644
--- a/spec/ruby/command_line/frozen_strings_spec.rb
+++ b/spec/ruby/command_line/frozen_strings_spec.rb
@@ -1,30 +1,28 @@
 require_relative '../spec_helper'
 
-ruby_version_is "2.3" do
-  describe "The --enable-frozen-string-literal flag causes string literals to" do
+describe "The --enable-frozen-string-literal flag causes string literals to" do
 
-    it "produce the same object each time" do
-      ruby_exe(fixture(__FILE__, "freeze_flag_one_literal.rb"), options: "--enable-frozen-string-literal").chomp.should == "true"
-    end
+  it "produce the same object each time" do
+    ruby_exe(fixture(__FILE__, "freeze_flag_one_literal.rb"), options: "--enable-frozen-string-literal").chomp.should == "true"
+  end
 
-    it "produce the same object for literals with the same content" do
-      ruby_exe(fixture(__FILE__, "freeze_flag_two_literals.rb"), options: "--enable-frozen-string-literal").chomp.should == "true"
-    end
+  it "produce the same object for literals with the same content" do
+    ruby_exe(fixture(__FILE__, "freeze_flag_two_literals.rb"), options: "--enable-frozen-string-literal").chomp.should == "true"
+  end
 
-    it "produce the same object for literals with the same content in different files" do
-      ruby_exe(fixture(__FILE__, "freeze_flag_across_files.rb"), options: "--enable-frozen-string-literal").chomp.should == "true"
-    end
+  it "produce the same object for literals with the same content in different files" do
+    ruby_exe(fixture(__FILE__, "freeze_flag_across_files.rb"), options: "--enable-frozen-string-literal").chomp.should == "true"
+  end
 
-    it "produce different objects for literals with the same content in different files if they have different encodings" do
-      ruby_exe(fixture(__FILE__, "freeze_flag_across_files_diff_enc.rb"), options: "--enable-frozen-string-literal").chomp.should == "true"
-    end
+  it "produce different objects for literals with the same content in different files if they have different encodings" do
+    ruby_exe(fixture(__FILE__, "freeze_flag_across_files_diff_enc.rb"), options: "--enable-frozen-string-literal").chomp.should == "true"
   end
+end
 
-  describe "The --debug flag produces" do
-    it "debugging info on attempted frozen string modification" do
-      error_str = ruby_exe(fixture(__FILE__, 'debug_info.rb'), options: '--debug',  args: "2>&1")
-      error_str.should include("can't modify frozen String, created at ")
-      error_str.should include("command_line/fixtures/debug_info.rb:2")
-    end
+describe "The --debug flag produces" do
+  it "debugging info on attempted frozen string modification" do
+    error_str = ruby_exe(fixture(__FILE__, 'debug_info.rb'), options: '--debug',  args: "2>&1")
+    error_str.should include("can't modify frozen String, created at ")
+    error_str.should include("command_line/fixtures/debug_info.rb:2")
   end
 end