Use Integer instead of Fixnum for Ruby 2.4+ compatibility.
This commit is contained in:
parent
7a24f87f75
commit
7187e6f909
|
@ -45,7 +45,7 @@ module Vagrant
|
|||
result = 1
|
||||
end
|
||||
|
||||
result = 0 if !result.is_a?(Fixnum)
|
||||
result = 0 if !result.is_a?(Integer)
|
||||
return result
|
||||
end
|
||||
|
||||
|
|
|
@ -50,7 +50,7 @@ module Vagrant
|
|||
# until then. It will wait up to the given duration or raise an
|
||||
# exception if something goes wrong.
|
||||
#
|
||||
# @param [Fixnum] duration Timeout in seconds.
|
||||
# @param [Integer] duration Timeout in seconds.
|
||||
# @return [Boolean] Will return true on successful connection
|
||||
# or false on timeout.
|
||||
def wait_for_ready(duration)
|
||||
|
|
|
@ -52,7 +52,7 @@ module Vagrant
|
|||
|
||||
# Return the number of elements in this registry.
|
||||
#
|
||||
# @return [Fixnum]
|
||||
# @return [Integer]
|
||||
def length
|
||||
@items.keys.length
|
||||
end
|
||||
|
|
|
@ -106,10 +106,10 @@ module VagrantPlugins
|
|||
def args_valid?
|
||||
return true if !args
|
||||
return true if args.is_a?(String)
|
||||
return true if args.is_a?(Fixnum)
|
||||
return true if args.is_a?(Integer)
|
||||
if args.is_a?(Array)
|
||||
args.each do |a|
|
||||
return false if !a.kind_of?(String) && !a.kind_of?(Fixnum)
|
||||
return false if !a.kind_of?(String) && !a.kind_of?(Integer)
|
||||
end
|
||||
|
||||
return true
|
||||
|
|
|
@ -63,10 +63,10 @@ module VagrantPlugins
|
|||
def args_valid?
|
||||
return true if !args
|
||||
return true if args.is_a?(String)
|
||||
return true if args.is_a?(Fixnum)
|
||||
return true if args.is_a?(Integer)
|
||||
if args.is_a?(Array)
|
||||
args.each do |a|
|
||||
return false if !a.kind_of?(String) && !a.kind_of?(Fixnum)
|
||||
return false if !a.kind_of?(String) && !a.kind_of?(Integer)
|
||||
end
|
||||
|
||||
return true
|
||||
|
|
|
@ -30,7 +30,7 @@ describe "VagrantPlugins::Shell::Config" do
|
|||
expect(result["shell provisioner"]).to eq([])
|
||||
end
|
||||
|
||||
it "passes with fixnum args" do
|
||||
it "passes with integer args" do
|
||||
subject.path = file_that_exists
|
||||
subject.args = 1
|
||||
subject.finalize!
|
||||
|
@ -112,7 +112,7 @@ describe "VagrantPlugins::Shell::Config" do
|
|||
end
|
||||
|
||||
describe 'finalize!' do
|
||||
it 'changes fixnum args into strings' do
|
||||
it 'changes integer args into strings' do
|
||||
subject.path = file_that_exists
|
||||
subject.args = 1
|
||||
subject.finalize!
|
||||
|
@ -120,7 +120,7 @@ describe "VagrantPlugins::Shell::Config" do
|
|||
expect(subject.args).to eq '1'
|
||||
end
|
||||
|
||||
it 'changes fixnum args in arrays into strings' do
|
||||
it 'changes integer args in arrays into strings' do
|
||||
subject.path = file_that_exists
|
||||
subject.args = ["string", 1, 2]
|
||||
subject.finalize!
|
||||
|
|
|
@ -70,7 +70,7 @@ describe VagrantPlugins::LocalExecPush::Config do
|
|||
expect(errors).to be_empty
|
||||
end
|
||||
|
||||
it "passes with fixnum args" do
|
||||
it "passes with integer args" do
|
||||
subject.args = 1
|
||||
expect(errors).to be_empty
|
||||
end
|
||||
|
@ -118,7 +118,7 @@ describe VagrantPlugins::LocalExecPush::Config do
|
|||
expect(errors).to be_empty
|
||||
end
|
||||
|
||||
it "passes with fixnum args" do
|
||||
it "passes with integer args" do
|
||||
subject.args = 1
|
||||
expect(errors).to be_empty
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue