summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-07-12 17:06:35 +0200
committerJacob Vosmaer <jacob@gitlab.com>2017-07-12 18:28:29 +0200
commit0b0e89ef7b5708cb2ac488d4641e071ce842ca23 (patch)
treef1789faaff4056b247e6a59ccd2c25ed791685ef /spec/lib
parent47c844bf34cff269c4c31c2327f1684f5265ebd4 (diff)
downloadgitlab-ce-0b0e89ef7b5708cb2ac488d4641e071ce842ca23.tar.gz
Try to eliminate unused diff options
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/git/diff_spec.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/lib/gitlab/git/diff_spec.rb b/spec/lib/gitlab/git/diff_spec.rb
index d97e85364c2..0d712f39aea 100644
--- a/spec/lib/gitlab/git/diff_spec.rb
+++ b/spec/lib/gitlab/git/diff_spec.rb
@@ -241,7 +241,7 @@ EOT
end
describe '.filter_diff_options' do
- let(:options) { { max_size: 100, invalid_opt: true } }
+ let(:options) { { max_files: 100, invalid_opt: true } }
context "without default options" do
let(:filtered_options) { described_class.filter_diff_options(options) }
@@ -253,7 +253,7 @@ EOT
context "with default options" do
let(:filtered_options) do
- default_options = { max_size: 5, bad_opt: 1, ignore_whitespace: true }
+ default_options = { max_files: 5, bad_opt: 1, ignore_whitespace_change: true }
described_class.filter_diff_options(options, default_options)
end
@@ -263,12 +263,12 @@ EOT
end
it "should merge with default options" do
- expect(filtered_options).to have_key(:ignore_whitespace)
+ expect(filtered_options).to have_key(:ignore_whitespace_change)
end
it "should override default options" do
- expect(filtered_options).to have_key(:max_size)
- expect(filtered_options[:max_size]).to eq(100)
+ expect(filtered_options).to have_key(:max_files)
+ expect(filtered_options[:max_files]).to eq(100)
end
end
end