From 3c16fb93fcfb7dc50a46a39cbdd545ddfdab0bc1 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 13 Nov 2015 09:45:21 +0100
Subject: Move spec to proper place and fix unused variable

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 lib/gitlab/inline_diff.rb                |  1 -
 spec/lib/gitlab/diff/inline_diff_spec.rb | 39 --------------------------------
 spec/lib/gitlab/inline_diff_spec.rb      | 39 ++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 40 deletions(-)
 delete mode 100644 spec/lib/gitlab/diff/inline_diff_spec.rb
 create mode 100644 spec/lib/gitlab/inline_diff_spec.rb

diff --git a/lib/gitlab/inline_diff.rb b/lib/gitlab/inline_diff.rb
index 72d0b493be0..44507bde25d 100644
--- a/lib/gitlab/inline_diff.rb
+++ b/lib/gitlab/inline_diff.rb
@@ -11,7 +11,6 @@ module Gitlab
         indexes.each do |index|
           first_line = diff_arr[index+1]
           second_line = diff_arr[index+2]
-          max_length = [first_line.size, second_line.size].max
 
           # Skip inline diff if empty line was replaced with content
           next if first_line == "-\n"
diff --git a/spec/lib/gitlab/diff/inline_diff_spec.rb b/spec/lib/gitlab/diff/inline_diff_spec.rb
deleted file mode 100644
index 2e0a05088cc..00000000000
--- a/spec/lib/gitlab/diff/inline_diff_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::InlineDiff do
-  describe '#processing' do
-    let(:diff) do
-      <<eos
---- a/test.rb
-+++ b/test.rb
-@@ -1,6 +1,6 @@
- class Test
-   def cleanup_string(input)
-     return nil if input.nil?
--    input.sub(/[\\r\\n].+/,'').sub(/\\\\[rn].+/, '').strip
-+    input.to_s.sub(/[\\r\\n].+/,'').sub(/\\\\[rn].+/, '').strip
-   end
- end
-eos
-    end
-
-    let(:expected) do
-      ["--- a/test.rb\n",
-       "+++ b/test.rb\n",
-       "@@ -1,6 +1,6 @@\n",
-       " class Test\n",
-       "   def cleanup_string(input)\n",
-       "     return nil if input.nil?\n",
-       "-    input.#!idiff-start!##!idiff-finish!#sub(/[\\r\\n].+/,'').sub(/\\\\[rn].+/, '').strip\n",
-       "+    input.#!idiff-start!#to_s.#!idiff-finish!#sub(/[\\r\\n].+/,'').sub(/\\\\[rn].+/, '').strip\n",
-       "   end\n",
-       " end\n"]
-    end
-
-    let(:subject) { Gitlab::InlineDiff.processing(diff.lines) }
-
-    it 'should retain backslashes' do
-      expect(subject).to eq(expected)
-    end
-  end
-end
diff --git a/spec/lib/gitlab/inline_diff_spec.rb b/spec/lib/gitlab/inline_diff_spec.rb
new file mode 100644
index 00000000000..2e0a05088cc
--- /dev/null
+++ b/spec/lib/gitlab/inline_diff_spec.rb
@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Gitlab::InlineDiff do
+  describe '#processing' do
+    let(:diff) do
+      <<eos
+--- a/test.rb
++++ b/test.rb
+@@ -1,6 +1,6 @@
+ class Test
+   def cleanup_string(input)
+     return nil if input.nil?
+-    input.sub(/[\\r\\n].+/,'').sub(/\\\\[rn].+/, '').strip
++    input.to_s.sub(/[\\r\\n].+/,'').sub(/\\\\[rn].+/, '').strip
+   end
+ end
+eos
+    end
+
+    let(:expected) do
+      ["--- a/test.rb\n",
+       "+++ b/test.rb\n",
+       "@@ -1,6 +1,6 @@\n",
+       " class Test\n",
+       "   def cleanup_string(input)\n",
+       "     return nil if input.nil?\n",
+       "-    input.#!idiff-start!##!idiff-finish!#sub(/[\\r\\n].+/,'').sub(/\\\\[rn].+/, '').strip\n",
+       "+    input.#!idiff-start!#to_s.#!idiff-finish!#sub(/[\\r\\n].+/,'').sub(/\\\\[rn].+/, '').strip\n",
+       "   end\n",
+       " end\n"]
+    end
+
+    let(:subject) { Gitlab::InlineDiff.processing(diff.lines) }
+
+    it 'should retain backslashes' do
+      expect(subject).to eq(expected)
+    end
+  end
+end
-- 
cgit v1.2.1