summaryrefslogtreecommitdiff
path: root/spec/mspec/spec
diff options
context:
space:
mode:
authoreregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-09-25 10:40:39 +0000
committereregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-09-25 10:40:39 +0000
commite59bf54b3a88d0465cca021afae7dc05b6db57a7 (patch)
tree9299f6a6e384ebe2bbc50c19dbd2049d6d0a2cba /spec/mspec/spec
parentf00bf242724d40d59a242c6bf9e567d18c9e1872 (diff)
Update to ruby/mspec@3fb5112
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/mspec/spec')
-rw-r--r--spec/mspec/spec/commands/mkspec_spec.rb4
-rw-r--r--spec/mspec/spec/guards/conflict_spec.rb2
-rw-r--r--spec/mspec/spec/utils/name_map_spec.rb4
3 files changed, 6 insertions, 4 deletions
diff --git a/spec/mspec/spec/commands/mkspec_spec.rb b/spec/mspec/spec/commands/mkspec_spec.rb
index 14c363f286..1b959dcb78 100644
--- a/spec/mspec/spec/commands/mkspec_spec.rb
+++ b/spec/mspec/spec/commands/mkspec_spec.rb
@@ -167,13 +167,13 @@ describe MkSpec, "#write_requires" do
end
it "writes the spec_helper require line" do
- @file.should_receive(:puts).with("require File.expand_path('../../../../spec_helper', __FILE__)")
+ @file.should_receive(:puts).with("require_relative '../../../spec_helper'")
@script.write_requires("spec/core/tcejbo", "spec/core/tcejbo/inspect_spec.rb")
end
it "writes require lines for each library specified on the command line" do
@file.stub(:puts)
- @file.should_receive(:puts).with("require File.expand_path('../../../../spec_helper', __FILE__)")
+ @file.should_receive(:puts).with("require_relative '../../../spec_helper'")
@file.should_receive(:puts).with("require 'complex'")
@script.config[:requires] << 'complex'
@script.write_requires("spec/core/tcejbo", "spec/core/tcejbo/inspect_spec.rb")
diff --git a/spec/mspec/spec/guards/conflict_spec.rb b/spec/mspec/spec/guards/conflict_spec.rb
index e06a2809ee..deada96821 100644
--- a/spec/mspec/spec/guards/conflict_spec.rb
+++ b/spec/mspec/spec/guards/conflict_spec.rb
@@ -3,6 +3,7 @@ require 'mspec/guards'
describe Object, "#conflicts_with" do
before :each do
+ hide_deprecation_warnings
ScratchPad.clear
end
@@ -33,6 +34,7 @@ end
describe Object, "#conflicts_with" do
before :each do
+ hide_deprecation_warnings
@guard = ConflictsGuard.new
ConflictsGuard.stub(:new).and_return(@guard)
end
diff --git a/spec/mspec/spec/utils/name_map_spec.rb b/spec/mspec/spec/utils/name_map_spec.rb
index d38230ce06..d5d2cca84a 100644
--- a/spec/mspec/spec/utils/name_map_spec.rb
+++ b/spec/mspec/spec/utils/name_map_spec.rb
@@ -129,7 +129,7 @@ describe NameMap, "#file_name" do
it "returns the name of the spec file based on the special entry for the method" do
@map.file_name("~", "Regexp").should == "match_spec.rb"
- @map.file_name("~", "Fixnum").should == "complement_spec.rb"
+ @map.file_name("~", "Integer").should == "complement_spec.rb"
end
it "returns the name of the spec file based on the default entry for the method" do
@@ -137,7 +137,7 @@ describe NameMap, "#file_name" do
end
it "uses the last component of the constant to look up the method name" do
- @map.file_name("^", "NameMapSpecs::Fixnum").should == "bit_xor_spec.rb"
+ @map.file_name("^", "NameMapSpecs::Integer").should == "bit_xor_spec.rb"
end
end