summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrpereira2 <rpereira@gitlab.com>2019-02-05 22:42:35 +0530
committerrpereira2 <rpereira@gitlab.com>2019-02-07 10:37:08 +0530
commit78e9cdf7a6bbb81f9df042c678b7cde6ee863a04 (patch)
treeafb6381e0e0f24110198d4fd2d9b636c8d16c707
parent367babec773437f6ab167bb0c4c085661703eb8d (diff)
downloadgitlab-ce-55199-operations-settings-update.tar.gz
-rw-r--r--spec/controllers/projects/settings/operations_controller_spec.rb17
-rw-r--r--spec/services/projects/operations/update_service_spec.rb8
2 files changed, 18 insertions, 7 deletions
diff --git a/spec/controllers/projects/settings/operations_controller_spec.rb b/spec/controllers/projects/settings/operations_controller_spec.rb
index e77f2d08d1f..9265d41164e 100644
--- a/spec/controllers/projects/settings/operations_controller_spec.rb
+++ b/spec/controllers/projects/settings/operations_controller_spec.rb
@@ -97,7 +97,9 @@ describe Projects::Settings::OperationsController do
end
it 'returns success status' do
- patch :update, params: project_params(project, error_tracking_params), format: :json
+ patch :update,
+ params: project_params(project, error_tracking_params),
+ format: :json
expect(json_response).to eq(
'status' => 'success',
@@ -108,11 +110,16 @@ describe Projects::Settings::OperationsController do
context 'when update fails' do
before do
- stub_operations_update_service_returning(status: :error, message: 'error message')
+ stub_operations_update_service_returning(
+ status: :error,
+ message: 'error message'
+ )
end
it 'returns error' do
- patch :update, params: project_params(project, error_tracking_params), format: :json
+ patch :update,
+ params: project_params(project, error_tracking_params),
+ format: :json
expect(response).to have_gitlab_http_status(:bad_request)
expect(json_response['message']).not_to be_nil
@@ -158,11 +165,11 @@ describe Projects::Settings::OperationsController do
private
- def project_params(project, project_params = {})
+ def project_params(project, params = {})
{
namespace_id: project.namespace,
project_id: project,
- project: project_params
+ project: params
}
end
end
diff --git a/spec/services/projects/operations/update_service_spec.rb b/spec/services/projects/operations/update_service_spec.rb
index 037345a21e9..86b1ec83f50 100644
--- a/spec/services/projects/operations/update_service_spec.rb
+++ b/spec/services/projects/operations/update_service_spec.rb
@@ -38,7 +38,9 @@ describe Projects::Operations::UpdateService do
project.reload
expect(project.error_tracking_setting).not_to be_enabled
- expect(project.error_tracking_setting.api_url).to eq('http://gitlab.com/api/0/projects/org/project/')
+ expect(project.error_tracking_setting.api_url).to eq(
+ 'http://gitlab.com/api/0/projects/org/project/'
+ )
expect(project.error_tracking_setting.token).to eq('token')
expect(project.error_tracking_setting[:project_name]).to eq('Project')
expect(project.error_tracking_setting[:organization_name]).to eq('Org')
@@ -84,7 +86,9 @@ describe Projects::Operations::UpdateService do
expect(result[:status]).to eq(:success)
expect(project.error_tracking_setting).to be_enabled
- expect(project.error_tracking_setting.api_url).to eq('http://gitlab.com/api/0/projects/org/project/')
+ expect(project.error_tracking_setting.api_url).to eq(
+ 'http://gitlab.com/api/0/projects/org/project/'
+ )
expect(project.error_tracking_setting.token).to eq('token')
expect(project.error_tracking_setting[:project_name]).to eq('Project')
expect(project.error_tracking_setting[:organization_name]).to eq('Org')