summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-08-01 13:16:04 +0200
committerRémy Coutable <remy@rymai.me>2016-08-01 13:24:06 +0200
commitfe25d1d5cfdd8c52854b459b49bbead1a608822c (patch)
tree3c5bc3b51feb6f406306e319c2a1b89be84e7aef
parent3fe18525ddca414017d330e992999bad05002fa8 (diff)
downloadgitlab-ce-fix-extra-new-line-crlf.tar.gz
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--spec/finders/branches_finder_spec.rb2
-rw-r--r--spec/lib/gitlab/highlight_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/finders/branches_finder_spec.rb b/spec/finders/branches_finder_spec.rb
index 6ea9a3a3ec5..482caeee64a 100644
--- a/spec/finders/branches_finder_spec.rb
+++ b/spec/finders/branches_finder_spec.rb
@@ -20,7 +20,7 @@ describe BranchesFinder do
result = branches_finder.execute
- expect(result.first.name).to eq('video')
+ expect(result.first.name).to eq('crlf-diff')
end
it 'sorts by last_updated' do
diff --git a/spec/lib/gitlab/highlight_spec.rb b/spec/lib/gitlab/highlight_spec.rb
index 80a9473d6aa..fc021416d92 100644
--- a/spec/lib/gitlab/highlight_spec.rb
+++ b/spec/lib/gitlab/highlight_spec.rb
@@ -22,7 +22,7 @@ describe Gitlab::Highlight, lib: true do
let(:branch) { 'crlf-diff' }
let(:blob) { repository.blob_at_branch(branch, path) }
let(:lines) do
- Gitlab::Highlight.highlight_lines(project.repository, 'crlf-diff-test', 'files/whitespace')
+ Gitlab::Highlight.highlight_lines(project.repository, 'crlf-diff', 'files/whitespace')
end
it 'strips extra LFs' do