Skip to content

Commit

Permalink
Merge pull request #1172 from vbrazo/chores/removed-fixnum-reference
Browse files Browse the repository at this point in the history
Fix Fixnum reference warning
  • Loading branch information
vbrazo committed May 12, 2018
2 parents 4063853 + 16701fc commit 991339b
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 18 deletions.
7 changes: 6 additions & 1 deletion test/test_faker_color.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,13 @@ def test_hsl_color
assert @result.length == 3

assert @result[0].between?(0, 360)
assert @result[0].is_a?(Fixnum)

if RUBY_VERSION < '2.4.0'
assert @result[0].is_a?(Fixnum)
else
assert @result[0].is_a?(Integer)
end

assert @result[1].between?(0.0, 1.0)
assert @result[2].between?(0.0, 1.0)
end
Expand Down
6 changes: 5 additions & 1 deletion test/test_faker_markdown.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ def test_ordered_list
test_trigger = @tester.ordered_list.split("\n")

test_trigger.each do |line|
assert_instance_of(Fixnum, line[0].to_i)
if RUBY_VERSION < '2.4.0'
assert_instance_of(Fixnum, line[0].to_i)
else
assert_instance_of(Integer, line[0].to_i)
end
end
end

Expand Down
100 changes: 85 additions & 15 deletions test/test_faker_omniauth.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ def test_omniauth_google
assert_instance_of String, info[:image]
assert_instance_of String, credentials[:token]
assert_instance_of String, credentials[:refresh_token]
assert_instance_of Fixnum, credentials[:expires_at]

if RUBY_VERSION < '2.4.0'
assert_instance_of Fixnum, credentials[:expires_at]
else
assert_instance_of Integer, credentials[:expires_at]
end

assert_equal true, credentials[:expires]
assert_equal 9, extra_raw_info[:sub].length
assert_equal info[:email], extra_raw_info[:email]
Expand Down Expand Up @@ -114,7 +120,13 @@ def test_omniauth_facebook
assert_instance_of String, info[:image]
assert is_boolean?(info[:verified])
assert_instance_of String, credentials[:token]
assert_instance_of Fixnum, credentials[:expires_at]

if RUBY_VERSION < '2.4.0'
assert_instance_of Fixnum, credentials[:expires_at]
else
assert_instance_of Integer, credentials[:expires_at]
end

assert_equal true, credentials[:expires]
assert_equal uid, extra_raw_info[:id]
assert_equal info[:name], extra_raw_info[:name]
Expand All @@ -126,7 +138,13 @@ def test_omniauth_facebook
assert_instance_of String, location[:name]
assert is_gender?(extra_raw_info[:gender])
assert_equal info[:email], extra_raw_info[:email]
assert_instance_of Fixnum, extra_raw_info[:timezone]

if RUBY_VERSION < '2.4.0'
assert_instance_of Fixnum, extra_raw_info[:timezone]
else
assert_instance_of Integer, extra_raw_info[:timezone]
end

assert_instance_of String, extra_raw_info[:locale]
assert is_boolean?(extra_raw_info[:verified])
assert_instance_of String, extra_raw_info[:updated_time]
Expand Down Expand Up @@ -214,11 +232,23 @@ def test_omniauth_twitter
assert_instance_of String, credentials[:secret]
assert_instance_of String, access_token
assert_equal info[:name], raw_info[:name]
assert_instance_of Fixnum, raw_info[:listed_count]

if RUBY_VERSION < '2.4.0'
assert_instance_of Fixnum, raw_info[:listed_count]
else
assert_instance_of Integer, raw_info[:listed_count]
end

assert_instance_of String, raw_info[:profile_sidebar_border_color]
refute raw_info[:url]
assert_equal "en", raw_info[:lang]
assert_instance_of Fixnum, raw_info[:statuses_count]

if RUBY_VERSION < '2.4.0'
assert_instance_of Fixnum, raw_info[:statuses_count]
else
assert_instance_of Integer, raw_info[:statuses_count]
end

assert_instance_of String, raw_info[:profile_image_url]
assert_instance_of String, raw_info[:profile_background_image_url_https]
assert_equal info[:location], raw_info[:location]
Expand All @@ -227,16 +257,40 @@ def test_omniauth_twitter
assert_equal uid, raw_info[:id]
assert is_boolean?(raw_info[:profile_background_tile])
assert_instance_of String, raw_info[:profile_sidebar_fill_color]
assert_instance_of Fixnum, raw_info[:followers_count]

if RUBY_VERSION < '2.4.0'
assert_instance_of Fixnum, raw_info[:followers_count]
else
assert_instance_of Integer, raw_info[:followers_count]
end

assert is_boolean?(raw_info[:default_profile_image])
assert_equal "", raw_info[:screen_name]
assert is_boolean?(raw_info[:following])
assert_instance_of Fixnum, raw_info[:utc_offset]

if RUBY_VERSION < '2.4.0'
assert_instance_of Fixnum, raw_info[:utc_offset]
else
assert_instance_of Integer, raw_info[:utc_offset]
end

assert is_boolean?(raw_info[:verified])
assert_instance_of Fixnum, raw_info[:favourites_count]

if RUBY_VERSION < '2.4.0'
assert_instance_of Fixnum, raw_info[:favourites_count]
else
assert_instance_of Integer, raw_info[:favourites_count]
end

assert_instance_of String, raw_info[:profile_background_color]
assert is_boolean?(raw_info[:is_translator])
assert_instance_of Fixnum, raw_info[:friends_count]

if RUBY_VERSION < '2.4.0'
assert_instance_of Fixnum, raw_info[:friends_count]
else
assert_instance_of Integer, raw_info[:friends_count]
end

assert is_boolean?(raw_info[:notifications])
assert is_boolean?(raw_info[:geo_enabled])
assert_instance_of String, raw_info[:profile_background_image_url]
Expand Down Expand Up @@ -325,8 +379,15 @@ def test_omniauth_linkedin
refute access_token["consumer"]
assert_equal credentials["token"], params[:oauth_token]
assert_equal credentials["secret"], params[:oauth_token_secret]
assert_instance_of Fixnum, params[:oauth_expires_in]
assert_instance_of Fixnum, params[:oauth_authorization_expires_in]

if RUBY_VERSION < '2.4.0'
assert_instance_of Fixnum, params[:oauth_expires_in]
assert_instance_of Fixnum, params[:oauth_authorization_expires_in]
else
assert_instance_of Integer, params[:oauth_expires_in]
assert_instance_of Integer, params[:oauth_authorization_expires_in]
end

refute access_token["response"]
assert_equal info["first_name"], raw_info["firstName"]
assert_equal info["headline"], raw_info["headline"]
Expand Down Expand Up @@ -423,10 +484,19 @@ def test_omniauth_github
assert_instance_of String, extra_raw_info[:location]
assert_equal nil, extra_raw_info[:hireable]
assert_equal nil, extra_raw_info[:bio]
assert_instance_of Fixnum, extra_raw_info[:public_repos]
assert_instance_of Fixnum, extra_raw_info[:public_gists]
assert_instance_of Fixnum, extra_raw_info[:followers]
assert_instance_of Fixnum, extra_raw_info[:following]

if RUBY_VERSION < '2.4.0'
assert_instance_of Fixnum, extra_raw_info[:public_repos]
assert_instance_of Fixnum, extra_raw_info[:public_gists]
assert_instance_of Fixnum, extra_raw_info[:followers]
assert_instance_of Fixnum, extra_raw_info[:following]
else
assert_instance_of Integer, extra_raw_info[:public_repos]
assert_instance_of Integer, extra_raw_info[:public_gists]
assert_instance_of Integer, extra_raw_info[:followers]
assert_instance_of Integer, extra_raw_info[:following]
end

assert_instance_of String, extra_raw_info[:created_at]
assert_instance_of String, extra_raw_info[:updated_at]
end
Expand Down
6 changes: 5 additions & 1 deletion test/test_faker_types.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ def test_character
end

def test_integer
assert @tester.integer.class == Fixnum
if RUBY_VERSION < '2.4.0'
assert @tester.integer.class == Fixnum
else
assert @tester.integer.class == Integer
end
end

def test_integer_between
Expand Down

0 comments on commit 991339b

Please sign in to comment.