From d3cf0c247bcd665742047828aa8198ada43705f1 Mon Sep 17 00:00:00 2001
From: Tim Zallmann <tzallmann@gitlab.com>
Date: Wed, 5 Sep 2018 13:23:42 +0200
Subject: Fix for Karma, Static Analysis and RSPec for MR Page

---
 spec/javascripts/diffs/components/diff_file_spec.js                | 3 ++-
 spec/javascripts/diffs/components/diff_line_gutter_content_spec.js | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'spec/javascripts/diffs/components')

diff --git a/spec/javascripts/diffs/components/diff_file_spec.js b/spec/javascripts/diffs/components/diff_file_spec.js
index 44a38f7ca82..0917af23e84 100644
--- a/spec/javascripts/diffs/components/diff_file_spec.js
+++ b/spec/javascripts/diffs/components/diff_file_spec.js
@@ -51,7 +51,8 @@ describe('DiffFile', () => {
       });
 
       it('should have collapsed text and link', done => {
-        vm.file.collapsed = true;
+        vm.file.collapsed = false;
+        vm.file.highlightedDiffLines = null;
 
         vm.$nextTick(() => {
           expect(vm.$el.innerText).toContain('This diff is collapsed');
diff --git a/spec/javascripts/diffs/components/diff_line_gutter_content_spec.js b/spec/javascripts/diffs/components/diff_line_gutter_content_spec.js
index 7c2495600c8..663c0680845 100644
--- a/spec/javascripts/diffs/components/diff_line_gutter_content_spec.js
+++ b/spec/javascripts/diffs/components/diff_line_gutter_content_spec.js
@@ -11,7 +11,7 @@ describe('DiffLineGutterContent', () => {
     const cmp = Vue.extend(DiffLineGutterContent);
     const props = Object.assign({}, options);
     props.line = {
-      code: 'LC_42',
+      lineCode: 'LC_42',
       type: 'new',
       oldLine: null,
       newLine: 1,
@@ -36,7 +36,7 @@ describe('DiffLineGutterContent', () => {
 
       it('should return # if there is no lineCode', () => {
         const component = createComponent();
-        component.line.code = '';
+        component.line.lineCode = '';
         expect(component.lineHref).toEqual('#');
       });
     });
-- 
cgit v1.2.1