summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-08-30 18:37:43 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-08-30 18:37:43 -0400
commit2463beb14be1c95758406882e6e10d8baaad611f (patch)
tree95555bfe2a2daaf49b2c0341e25b7ba2ba44d614
parent98329c93dc93cbe849578d425a31749942f8f8c1 (diff)
downloadgitlab-ci-2463beb14be1c95758406882e6e10d8baaad611f.tar.gz
Don't use `raise_error` without a parameter
-rw-r--r--spec/models/variable_spec.rb3
-rw-r--r--spec/models/web_hook_spec.rb5
-rw-r--r--spec/requests/api/projects_spec.rb2
-rw-r--r--spec/services/create_project_service_spec.rb3
4 files changed, 7 insertions, 6 deletions
diff --git a/spec/models/variable_spec.rb b/spec/models/variable_spec.rb
index 1ecb960..51ae2d2 100644
--- a/spec/models/variable_spec.rb
+++ b/spec/models/variable_spec.rb
@@ -38,7 +38,8 @@ describe 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/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index 0f0f175..e3fa31c 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -56,9 +56,8 @@ describe WebHook do
it "catches exceptions" do
WebHook.should_receive(:post).and_raise("Some HTTP Post error")
- lambda {
- @web_hook.execute(@data)
- }.should raise_error
+ expect { @web_hook.execute(@data) }.
+ to raise_error(RuntimeError, 'Some HTTP Post error')
end
end
end
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index c165aec..8a744c1 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -147,7 +147,7 @@ describe API::API do
delete api("/projects/#{project.id}"), options
response.status.should == 200
- expect { project.reload }.to raise_error
+ expect { project.reload }.to raise_error(ActiveRecord::RecordNotFound)
end
it "non-manager is not authorized" do
diff --git a/spec/services/create_project_service_spec.rb b/spec/services/create_project_service_spec.rb
index 7520e24..140f44e 100644
--- a/spec/services/create_project_service_spec.rb
+++ b/spec/services/create_project_service_spec.rb
@@ -17,7 +17,8 @@ describe CreateProjectService do
context 'without project dump' do
it 'should raise exception' do
- expect { service.execute(current_user, '', '') }.to raise_error
+ expect { service.execute(current_user, '', '') }.
+ to raise_error(NoMethodError)
end
end