Add keyword arguments to truncated_diff method

* Added keyword arguments to truncated_diff_lines method to allow for using highlighting or not (html templates vs. text)
* Tweaked templates for consistency and format appropriateness

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/models/discussion_spec.rb b/spec/models/discussion_spec.rb
index d4b1f480c56..187d0bc0150 100644
--- a/spec/models/discussion_spec.rb
+++ b/spec/models/discussion_spec.rb
@@ -595,7 +595,7 @@ describe Discussion, model: true do
     let(:truncated_lines) { subject.truncated_diff_lines }
 
     context "when diff is greater than allowed number of truncated diff lines " do
-      let(:initial_line_count) { subject.diff_file.diff_lines.count }
+      let(:initial_line_count) { subject.diff_lines.count }
       let(:truncated_line_count) { truncated_lines.count }
 
       it "returns fewer lines"  do
@@ -606,7 +606,7 @@ describe Discussion, model: true do
     end
 
     context "when some diff lines are meta" do
-      let(:initial_meta_lines?) { subject.diff_file.diff_lines.any?(&:meta?) }
+      let(:initial_meta_lines?) { subject.diff_lines.any?(&:meta?) }
       let(:truncated_meta_lines?) { truncated_lines.any?(&:meta?) }
 
       it "returns no meta lines"  do