From 5802a1956966755da7d5219c43dff2953a5a19fc Mon Sep 17 00:00:00 2001 From: Paul Cantrell Date: Fri, 24 Jun 2016 11:15:02 -0500 Subject: [PATCH] Consistent child ordering across Ruby versions --- lib/jazzy/doc_builder.rb | 4 ++-- spec/integration_specs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/jazzy/doc_builder.rb b/lib/jazzy/doc_builder.rb index e199336a5..e173c8c28 100644 --- 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 index 6bcdaa888..68feb68ec 160000 --- a/spec/integration_specs +++ b/spec/integration_specs @@ -1 +1 @@ -Subproject commit 6bcdaa88877a0667853377eb6786625232d22258 +Subproject commit 68feb68ec8e3b5e9c01a0de16ed586a98efc2f8a