summaryrefslogtreecommitdiff
path: root/spec/models/ci
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-09-21 15:35:29 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-09-21 15:35:29 -0400
commit2f88459297d9fe8a33f608bd924f0bd5ad40161b (patch)
tree9587f329baa0cc80e9f1db48e80fc6aebda117fd /spec/models/ci
parentd4a960161eecf5730b56d3f375573fa39aa67e95 (diff)
downloadgitlab-ce-2f88459297d9fe8a33f608bd924f0bd5ad40161b.tar.gz
Ensure raise_error expectations provide argumentsrs-fix-spec-warnings
Diffstat (limited to 'spec/models/ci')
-rw-r--r--spec/models/ci/variable_spec.rb3
-rw-r--r--spec/models/ci/web_hook_spec.rb3
2 files changed, 4 insertions, 2 deletions
diff --git a/spec/models/ci/variable_spec.rb b/spec/models/ci/variable_spec.rb
index 97a3d0081f4..d034a6c7b9f 100644
--- a/spec/models/ci/variable_spec.rb
+++ b/spec/models/ci/variable_spec.rb
@@ -38,7 +38,8 @@ describe Ci::Variable do
it 'fails to decrypt if iv is incorrect' do
subject.encrypted_value_iv = nil
subject.instance_variable_set(:@value, nil)
- expect { subject.value }.to raise_error
+ expect { subject.value }.
+ to raise_error(OpenSSL::Cipher::CipherError, 'bad decrypt')
end
end
end
diff --git a/spec/models/ci/web_hook_spec.rb b/spec/models/ci/web_hook_spec.rb
index c4c0b007c11..bf9481ab81d 100644
--- a/spec/models/ci/web_hook_spec.rb
+++ b/spec/models/ci/web_hook_spec.rb
@@ -56,7 +56,8 @@ describe Ci::WebHook do
it "catches exceptions" do
expect(Ci::WebHook).to receive(:post).and_raise("Some HTTP Post error")
- expect{ @web_hook.execute(@data) }.to raise_error
+ expect{ @web_hook.execute(@data) }.
+ to raise_error(RuntimeError, 'Some HTTP Post error')
end
end
end