summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-08-16 11:25:26 +0000
committerRémy Coutable <remy@rymai.me>2017-08-16 11:25:26 +0000
commitfcce6c3168dbd04404f318b4e983d7395d21538c (patch)
treed8155d729f0915f6117bbe1f4010fffec9d37e56 /spec
parent9ac2a517798af2f942b28138403690afc20a254c (diff)
parent260c8da060a6039cbd47cfe31c8ec6d6f9b43de0 (diff)
downloadgitlab-ce-fcce6c3168dbd04404f318b4e983d7395d21538c.tar.gz
Merge branch 'rs-more-public-send-whitelists' into 'master'
Whitelist or fix additional `Gitlab/PublicSend` cop violations See merge request !13467
Diffstat (limited to 'spec')
-rw-r--r--spec/lib/file_size_validator_spec.rb4
-rw-r--r--spec/models/protectable_dropdown_spec.rb7
2 files changed, 9 insertions, 2 deletions
diff --git a/spec/lib/file_size_validator_spec.rb b/spec/lib/file_size_validator_spec.rb
index 49501931dd2..c44bc1840df 100644
--- a/spec/lib/file_size_validator_spec.rb
+++ b/spec/lib/file_size_validator_spec.rb
@@ -24,13 +24,13 @@ describe FileSizeValidator do
describe 'options uses a symbol' do
let(:options) do
{
- maximum: :test,
+ maximum: :max_attachment_size,
attributes: { attachment: attachment }
}
end
before do
- allow(note).to receive(:test) { 10 }
+ expect(note).to receive(:max_attachment_size) { 10 }
end
it 'attachment exceeds maximum limit' do
diff --git a/spec/models/protectable_dropdown_spec.rb b/spec/models/protectable_dropdown_spec.rb
index 5c5dcd9f5c9..d4433a88a15 100644
--- a/spec/models/protectable_dropdown_spec.rb
+++ b/spec/models/protectable_dropdown_spec.rb
@@ -4,6 +4,13 @@ describe ProtectableDropdown do
let(:project) { create(:project, :repository) }
let(:subject) { described_class.new(project, :branches) }
+ describe 'initialize' do
+ it 'raises ArgumentError for invalid ref type' do
+ expect { described_class.new(double, :foo) }
+ .to raise_error(ArgumentError, "invalid ref type `foo`")
+ end
+ end
+
describe '#protectable_ref_names' do
before do
project.protected_branches.create(name: 'master')