Consistent child ordering across Ruby versions

realm · Jun 24, 2016 · 5802a19 · 5802a19
1 parent 4c4be3f
commit 5802a19
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/jazzy/doc_builder.rb b/lib/jazzy/doc_builder.rb
@@ -32,7 +32,7 @@ def self.prepare_output_dir(output_dir, clean)
     def self.doc_structure_for_docs(docs)
       docs.map do |doc|
         children = doc.children
-                      .sort_by { |c| [c.nav_order, c.name] }
+                      .sort_by { |c| [c.nav_order, c.name, c.usr] }
                       .flat_map do |child|
           # FIXME: include arbitrarily nested extensible types
           [{ name: child.name, url: child.url }] +
@@ -180,7 +180,7 @@ def self.write_lint_report(undocumented, options)
 
         lint_report = {
           warnings: warnings.sort_by do |w|
-            [w[:file], w[:line] || 0, w[:symbol_qualified]]
+            [w[:file], w[:line] || 0, w[:symbol_qualified], w[:symbol_kind]]
           end,
           source_directory: options.source_directory,
         }

diff --git a/spec/integration_specs b/spec/integration_specs