From bbba62fa51419b14be4f39873afdd45b5b248764 Mon Sep 17 00:00:00 2001 From: Katarzyna Kobierska Date: Fri, 26 Aug 2016 12:49:59 +0200 Subject: Fix errors and grammar --- spec/requests/api/lint_spec.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'spec/requests/api/lint_spec.rb') diff --git a/spec/requests/api/lint_spec.rb b/spec/requests/api/lint_spec.rb index 78a9b415405..8bad57819c8 100644 --- a/spec/requests/api/lint_spec.rb +++ b/spec/requests/api/lint_spec.rb @@ -9,7 +9,7 @@ describe API::API do describe 'POST /lint' do context 'with valid .gitlab-ci.yaml content' do - it 'validates content' do + it 'validates the content' do post api('/lint'), { content: yaml_content } expect(response).to have_http_status(200) @@ -18,29 +18,30 @@ describe API::API do end end - context 'with invalid .gitlab_ci.yml' do - it 'validates content and shows correct errors' do + context 'with an invalid .gitlab_ci.yml' do + it 'validates the content and shows an error message' do post api('/lint'), { content: 'invalid content' } expect(response).to have_http_status(200) expect(json_response['status']).to eq('invalid') - expect(json_response['errors']).to eq(['Invalid configuration format']) + expect(json_response['error']).to eq(['Invalid configuration format']) end - it "validates content and shows configuration error" do + it "validates the content and shows a configuration error" do post api('/lint'), { content: '{ image: "ruby:2.1", services: ["postgres"] }' } expect(response).to have_http_status(200) expect(json_response['status']).to eq('invalid') - expect(json_response['errors']).to eq(['jobs config should contain at least one visible job']) + expect(json_response['error']).to eq(['jobs config should contain at least one visible job']) end end - context 'no content parameters' do - it 'shows error message' do + context 'without the content parameter' do + it 'shows an error message' do post api('/lint') expect(response).to have_http_status(400) + expect(json_response['error']).to eq('content is missing') end end end -- cgit v1.2.3