fix: fix element order specs, #6

lutaml · Oct 21, 2024 · 530cf06 · 530cf06
1 parent aa7e4a3
commit 530cf06
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/lib/metaschema/assembly_model_type.rb b/lib/metaschema/assembly_model_type.rb
@@ -22,9 +22,9 @@ class AssemblyModelType < Lutaml::Model::Serializable
       root "AssemblyModelType"
       namespace "http://csrc.nist.gov/ns/oscal/metaschema/1.0"
 
-      map_element "assembly", to: :assembly
       map_element "field", to: :field
       map_element "define-assembly", to: :define_assembly
+      map_element "assembly", to: :assembly
       map_element "define-field", to: :define_field
       map_element "choice", to: :choice
       map_element "choice-group", to: :choice_group

diff --git a/lib/metaschema/choice_type.rb b/lib/metaschema/choice_type.rb
@@ -16,9 +16,9 @@ class ChoiceType < Lutaml::Model::Serializable
       root "ChoiceType"
       namespace "http://csrc.nist.gov/ns/oscal/metaschema/1.0"
 
-      map_element "assembly", to: :assembly
       map_element "field", to: :field
       map_element "define-assembly", to: :define_assembly
+      map_element "assembly", to: :assembly
       map_element "define-field", to: :define_field
     end
   end

diff --git a/lib/metaschema/grouped_choice_type.rb b/lib/metaschema/grouped_choice_type.rb
@@ -28,9 +28,9 @@ class GroupedChoiceType < Lutaml::Model::Serializable
       map_element "json-key", to: :json_key
       map_element "group-as", to: :group_as
       map_element "discriminator", to: :discriminator
-      map_element "assembly", to: :assembly
       map_element "field", to: :field
       map_element "define-assembly", to: :define_assembly
+      map_element "assembly", to: :assembly
       map_element "define-field", to: :define_field
     end
   end

diff --git a/lib/metaschema/scope.rb b/lib/metaschema/scope.rb
@@ -18,8 +18,8 @@ class Scope < Lutaml::Model::Serializable
 
       map_attribute "metaschema-namespace", to: :metaschema_namespace
       map_attribute "metaschema-short-name", to: :metaschema_short_name
-      map_element "assembly", to: :assembly
       map_element "field", to: :field
+      map_element "assembly", to: :assembly
       map_element "flag", to: :flag
     end
   end