Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Generate different values when generating a hash #2270

Merged
merged 1 commit into from
Feb 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/faker/default/types.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,16 @@ def rb_integer(legacy_from = NOT_GIVEN, legacy_to = NOT_GIVEN, from: 0, to: 100)
# Faker::Types.rb_hash(number: 2) #=> {name: "bob", last: "marley"}
#
# @faker.version 1.8.6
def rb_hash(legacy_number = NOT_GIVEN, legacy_type = NOT_GIVEN, number: 1, type: random_type)
def rb_hash(legacy_number = NOT_GIVEN, legacy_type = NOT_GIVEN, number: 1, type: -> { random_type })
warn_for_deprecated_arguments do |keywords|
keywords << :number if legacy_number != NOT_GIVEN
keywords << :type if legacy_type != NOT_GIVEN
end

{}.tap do |hsh|
Lorem.words(number: number * 2).uniq.first(number).each do |s|
hsh.merge!(s.to_sym => type)
value = type.is_a?(Proc) ? type.call : type
hsh.merge!(s.to_sym => value)
end
end
end
Expand All @@ -102,7 +103,7 @@ def complex_rb_hash(legacy_number = NOT_GIVEN, number: 1)
keywords << :number if legacy_number != NOT_GIVEN
end

rb_hash(number: number, type: random_complex_type)
rb_hash(number: number, type: -> { random_complex_type })
end

##
Expand Down
2 changes: 2 additions & 0 deletions test/faker/default/test_faker_types.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ def test_rb_hash_returns_a_hash

def test_hash_returns_the_correct_number_of_keys
assert @tester.rb_hash(number: 3).keys.length == 3
assert @tester.rb_hash(number: 3).values.uniq.length > 1
assert @tester.rb_hash(number: 0).keys.empty?
assert @tester.rb_hash.keys.length == 1
end
Expand All @@ -51,6 +52,7 @@ def test_complex_rb_hash_returns_a_hash

def test_complex_hash_returns_the_correct_number_of_keys
assert @tester.complex_rb_hash(number: 3).keys.length == 3
assert @tester.complex_rb_hash(number: 3).values.uniq.length > 1
assert @tester.complex_rb_hash(number: 0).keys.empty?
assert @tester.complex_rb_hash.keys.length == 1
end
Expand Down