Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Allow capital characters for enum names #39677

Merged
merged 2 commits into from
Jun 22, 2020
Merged

Allow capital characters for enum names #39677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26e4899
Revert "Merge pull request #39673 from cheshire137/master"
kamipo Jun 20, 2020
e81ef16
Add a regression test for #39673
kamipo Jun 20, 2020
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
2 changes: 1 addition & 1 deletion activerecord/lib/active_record/enum.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def enum(definitions)
suffix = "_#{enum_suffix}"
end

value_method_name = "#{prefix}#{label.to_s.parameterize.underscore}#{suffix}"
value_method_name = "#{prefix}#{label}#{suffix}"
enum_values[label] = value
label = label.to_s

Expand Down
11 changes: 6 additions & 5 deletions activerecord/test/cases/enum_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,14 +592,15 @@ def self.name; "Book"; end
assert_raises(NoMethodError) { klass.proposed }
end

test "scopes are named like methods" do
test "capital characters for enum names" do
klass = Class.new(ActiveRecord::Base) do
self.table_name = "cats"
enum breed: { "American Bobtail" => 0, "Balinese-Javanese" => 1 }
self.table_name = "computers"
enum extendedWarranty: [:extendedSilver, :extendedGold]
end

assert_respond_to klass, :american_bobtail
assert_respond_to klass, :balinese_javanese
computer = klass.extendedSilver.build
assert_predicate computer, :extendedSilver?
assert_not_predicate computer, :extendedGold?
end

test "enums with a negative condition log a warning" do
Expand Down