diff options
Diffstat (limited to 'spec/ruby/core/kernel')
| -rw-r--r-- | spec/ruby/core/kernel/Float_spec.rb | 4 | ||||
| -rw-r--r-- | spec/ruby/core/kernel/Integer_spec.rb | 14 | ||||
| -rw-r--r-- | spec/ruby/core/kernel/class_spec.rb | 2 | ||||
| -rw-r--r-- | spec/ruby/core/kernel/instance_variable_get_spec.rb | 2 | ||||
| -rw-r--r-- | spec/ruby/core/kernel/instance_variable_set_spec.rb | 2 | ||||
| -rw-r--r-- | spec/ruby/core/kernel/shared/require.rb | 2 | ||||
| -rw-r--r-- | spec/ruby/core/kernel/singleton_class_spec.rb | 2 | ||||
| -rw-r--r-- | spec/ruby/core/kernel/sleep_spec.rb | 2 | ||||
| -rw-r--r-- | spec/ruby/core/kernel/srand_spec.rb | 2 | ||||
| -rw-r--r-- | spec/ruby/core/kernel/taint_spec.rb | 2 |
10 files changed, 17 insertions, 17 deletions
diff --git a/spec/ruby/core/kernel/Float_spec.rb b/spec/ruby/core/kernel/Float_spec.rb index af64fcbe86..ce224cada9 100644 --- a/spec/ruby/core/kernel/Float_spec.rb +++ b/spec/ruby/core/kernel/Float_spec.rb @@ -9,7 +9,7 @@ describe :kernel_float, shared: true do float2.should equal float end - it "returns a Float for Fixnums" do + it "returns a Float for Integers" do @object.send(:Float, 1).should == 1.0 end @@ -17,7 +17,7 @@ describe :kernel_float, shared: true do @object.send(:Float, Complex(1)).should == 1.0 end - it "returns a Float for Bignums" do + it "returns a Float for Integers" do @object.send(:Float, 1000000000000).should == 1000000000000.0 end diff --git a/spec/ruby/core/kernel/Integer_spec.rb b/spec/ruby/core/kernel/Integer_spec.rb index 59b41d37e6..674c7dd185 100644 --- a/spec/ruby/core/kernel/Integer_spec.rb +++ b/spec/ruby/core/kernel/Integer_spec.rb @@ -2,11 +2,11 @@ require_relative '../../spec_helper' require_relative 'fixtures/classes' describe :kernel_integer, shared: true do - it "returns a Bignum for a Bignum" do + it "returns an Integer for an Integer" do Integer(2e100).should == 2e100 end - it "returns a Fixnum for a Fixnum" do + it "returns an Integer for an Integer" do Integer(100).should == 100 end @@ -39,9 +39,9 @@ describe :kernel_integer, shared: true do -> { Integer(nil) }.should raise_error(TypeError) end - it "returns a Fixnum or Bignum object" do - Integer(2).should be_an_instance_of(Fixnum) - Integer(9**99).should be_an_instance_of(Bignum) + it "returns an Integer or Integer object" do + Integer(2).should be_an_instance_of(Integer) + Integer(9**99).should be_an_instance_of(Integer) end it "truncates Floats" do @@ -54,14 +54,14 @@ describe :kernel_integer, shared: true do Integer(3.quo(2)).should == 1 end - it "returns the value of to_int if the result is a Fixnum" do + it "returns the value of to_int if the result is an Integer" do obj = mock("object") obj.should_receive(:to_int).and_return(1) obj.should_not_receive(:to_i) Integer(obj).should == 1 end - it "returns the value of to_int if the result is a Bignum" do + it "returns the value of to_int if the result is an Integer" do obj = mock("object") obj.should_receive(:to_int).and_return(2 * 10**100) obj.should_not_receive(:to_i) diff --git a/spec/ruby/core/kernel/class_spec.rb b/spec/ruby/core/kernel/class_spec.rb index 4d3b4e549b..2725bde19b 100644 --- a/spec/ruby/core/kernel/class_spec.rb +++ b/spec/ruby/core/kernel/class_spec.rb @@ -5,7 +5,7 @@ describe "Kernel#class" do it "returns the class of the object" do Object.new.class.should equal(Object) - 1.class.should equal(Fixnum) + 1.class.should equal(Integer) 3.14.class.should equal(Float) :hello.class.should equal(Symbol) "hello".class.should equal(String) diff --git a/spec/ruby/core/kernel/instance_variable_get_spec.rb b/spec/ruby/core/kernel/instance_variable_get_spec.rb index 84d3188f07..bb6f03d3bf 100644 --- a/spec/ruby/core/kernel/instance_variable_get_spec.rb +++ b/spec/ruby/core/kernel/instance_variable_get_spec.rb @@ -92,7 +92,7 @@ describe "Kernel#instance_variable_get when passed String" do end end -describe "Kernel#instance_variable_get when passed Fixnum" do +describe "Kernel#instance_variable_get when passed Integer" do before :each do @obj = Object.new @obj.instance_variable_set("@test", :test) diff --git a/spec/ruby/core/kernel/instance_variable_set_spec.rb b/spec/ruby/core/kernel/instance_variable_set_spec.rb index 12b2185878..7fda30f72c 100644 --- a/spec/ruby/core/kernel/instance_variable_set_spec.rb +++ b/spec/ruby/core/kernel/instance_variable_set_spec.rb @@ -31,7 +31,7 @@ describe "Kernel#instance_variable_set" do -> { dog_at.new.instance_variable_set(:"@", "cat") }.should raise_error(NameError) end - it "raises a TypeError if the instance variable name is a Fixnum" do + it "raises a TypeError if the instance variable name is an Integer" do -> { "".instance_variable_set(1, 2) }.should raise_error(TypeError) end diff --git a/spec/ruby/core/kernel/shared/require.rb b/spec/ruby/core/kernel/shared/require.rb index 4e0322025c..d656b3b2f2 100644 --- a/spec/ruby/core/kernel/shared/require.rb +++ b/spec/ruby/core/kernel/shared/require.rb @@ -60,7 +60,7 @@ describe :kernel_require_basic, shared: true do -> { @object.send(@method, nil) }.should raise_error(TypeError) end - it "raises a TypeError if passed a Fixnum" do + it "raises a TypeError if passed an Integer" do -> { @object.send(@method, 42) }.should raise_error(TypeError) end diff --git a/spec/ruby/core/kernel/singleton_class_spec.rb b/spec/ruby/core/kernel/singleton_class_spec.rb index 5dbb4f8c05..a8bcd916d1 100644 --- a/spec/ruby/core/kernel/singleton_class_spec.rb +++ b/spec/ruby/core/kernel/singleton_class_spec.rb @@ -17,7 +17,7 @@ describe "Kernel#singleton_class" do false.singleton_class.should == FalseClass end - it "raises TypeError for Fixnum" do + it "raises TypeError for Integer" do -> { 123.singleton_class }.should raise_error(TypeError) end diff --git a/spec/ruby/core/kernel/sleep_spec.rb b/spec/ruby/core/kernel/sleep_spec.rb index 387dc4787b..71a3f24f13 100644 --- a/spec/ruby/core/kernel/sleep_spec.rb +++ b/spec/ruby/core/kernel/sleep_spec.rb @@ -14,7 +14,7 @@ describe "Kernel#sleep" do sleep(0.001).should >= 0 end - it "accepts a Fixnum" do + it "accepts an Integer" do sleep(0).should >= 0 end diff --git a/spec/ruby/core/kernel/srand_spec.rb b/spec/ruby/core/kernel/srand_spec.rb index 0985c76cb0..6774d19284 100644 --- a/spec/ruby/core/kernel/srand_spec.rb +++ b/spec/ruby/core/kernel/srand_spec.rb @@ -37,7 +37,7 @@ describe "Kernel.srand" do srand.should == -17 end - it "accepts a Bignum as a seed" do + it "accepts an Integer as a seed" do srand(0x12345678901234567890) srand.should == 0x12345678901234567890 end diff --git a/spec/ruby/core/kernel/taint_spec.rb b/spec/ruby/core/kernel/taint_spec.rb index 22b2c4d0a4..8ba9869af2 100644 --- a/spec/ruby/core/kernel/taint_spec.rb +++ b/spec/ruby/core/kernel/taint_spec.rb @@ -37,7 +37,7 @@ describe "Kernel#taint" do v.should_not.tainted? end - it "no raises error on fixnum values" do + it "no raises error on integer values" do [1].each do |v| -> { v.taint }.should_not raise_error(RuntimeError) v.should_not.tainted? |
