Skip to content

Commit 1f66e88

Browse files
committed
Group subschemas by their group order
This keeps the order consistent with how subschemas are shown in their tabs
1 parent 8d32bda commit 1f66e88

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

app/models/schema.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def subschemas
6262
end
6363

6464
def subschemas_for_group(group)
65-
subschemas.select { |s| s.group == group }
65+
subschemas.select { |s| s.group == group }.sort_by(&:group_order)
6666
end
6767

6868
def permitted_params

test/unit/app/models/schema_test.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,8 @@ class SchemaTest < ActiveSupport::TestCase
411411
describe "#subschemas_for_group" do
412412
let(:group_1_subschemas) do
413413
[
414-
stub(:subschema, group: "group_1"),
415-
stub(:subschema, group: "group_1"),
414+
stub(:subschema, group: "group_1", group_order: 2),
415+
stub(:subschema, group: "group_1", group_order: 1),
416416
]
417417
end
418418

@@ -428,8 +428,8 @@ class SchemaTest < ActiveSupport::TestCase
428428
schema.stubs(:subschemas).returns(subschemas)
429429
end
430430

431-
it "returns subschemas for a group" do
432-
assert_equal schema.subschemas_for_group("group_1"), group_1_subschemas
431+
it "returns subschemas for a group sorted by the group order" do
432+
assert_equal schema.subschemas_for_group("group_1"), [group_1_subschemas[1], group_1_subschemas[0]]
433433
end
434434

435435
it "returns an empty array when no subschemas can be found" do

0 commit comments

Comments
 (0)